diff --git a/.agents/skills/add-ai-integration/SKILL.md b/.agents/skills/add-ai-integration/SKILL.md
index a32d2ef766c9..c3b823fdfa17 100644
--- a/.agents/skills/add-ai-integration/SKILL.md
+++ b/.agents/skills/add-ai-integration/SKILL.md
@@ -58,6 +58,7 @@ What the reference files won't tell you:
 - [ ] Instrumentation in `src/ai/`, integration in `src/integrations/`, registered in `getTracingIntegrations()` (LangChain first)
 - [ ] Exported from `packages/server-utils/src/index.ts`, re-exported from the supported runtime packages
 - [ ] E2E tests in `dev-packages/node-integration-tests/suites/tracing/{provider}/` (and `cloudflare-integration-tests/` if supported)
+- [ ] The new suite passes on the other runtimes that run the Node suites, or is excluded there (see "Other Runtimes" in `dev-packages/node-integration-tests/README.md`)
 - [ ] Ops and attributes from `@sentry/conventions`, op derived via `getGenAiSpanOp()`
 - [ ] Recording gated on `resolveAIRecordingOptions()`; no truncation, no token rollup
 - [ ] JSDoc names the channels subscribed to, the supported SDK versions, and — for Pattern 2 — that it requires the Sentry runtime hook or bundler plugin
diff --git a/.agents/skills/vendor-otel/SKILL.md b/.agents/skills/vendor-otel/SKILL.md
index 309b7701d757..8ef36fa5769d 100644
--- a/.agents/skills/vendor-otel/SKILL.md
+++ b/.agents/skills/vendor-otel/SKILL.md
@@ -43,7 +43,8 @@ grep "import.*from '" <file> | grep -v "@opentelemetry\|'\./\|@sentry\|'util'\|'
 
 Check test coverage and report gaps:
 
-- Integration tests: `dev-packages/node-integration-tests/suites/tracing/<name>/`
+- Integration tests: `dev-packages/node-integration-tests/suites/tracing/<name>/`. Other runtimes run these
+  suites too; see "Other Runtimes" in `dev-packages/node-integration-tests/README.md`.
 - E2E tests: `dev-packages/e2e-tests/test-applications/node-<name>/`
 - Unit tests: `packages/node/test/integrations/tracing/<name>.test.ts`
 
diff --git a/.agents/skills/write-tests/SKILL.md b/.agents/skills/write-tests/SKILL.md
index b9a898f3e347..af8f0408e8b9 100644
--- a/.agents/skills/write-tests/SKILL.md
+++ b/.agents/skills/write-tests/SKILL.md
@@ -337,6 +337,9 @@ describe('patchRoute', () => {
 Node integration tests (`dev-packages/node-integration-tests/`) use `createEsmAndCjsTests` to
 run a real Node scenario file and assert on captured Sentry envelopes.
 
+Other runtimes run these suites too. A new suite must pass there or be excluded; see "Other
+Runtimes" in `dev-packages/node-integration-tests/README.md`.
+
 ### Minimize `test()` calls — each one spawns a separate Node process
 
 **This is the opposite of the Playwright rule.** In Playwright, each `test()` is cheap — use
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4eb40336293b..a6dc12f405db 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,10 +8,9 @@
 /dev-packages/browser-integration-tests/ @getsentry/team-javascript-sdks-browser
 
 # Node/server runtimes and related packages
-# TEMP: whole JS SDK team reviews orchestrion work; revert to team-javascript-sdks-server after
-/packages/node/                     @getsentry/team-javascript-sdks
-/packages/server-runtime-injection/ @getsentry/team-javascript-sdks
-/packages/server-utils/             @getsentry/team-javascript-sdks
+/packages/node/                     @getsentry/team-javascript-sdks-server
+/packages/server-runtime-injection/ @getsentry/team-javascript-sdks-server
+/packages/server-utils/             @getsentry/team-javascript-sdks-server
 /packages/node-native/              @getsentry/team-javascript-sdks-server
 /packages/profiling-node/           @getsentry/team-javascript-sdks-server
 /packages/opentelemetry/            @getsentry/team-javascript-sdks-server
diff --git a/.github/FLAKY_CI_FAILURE_TEMPLATE.md b/.github/FLAKY_CI_FAILURE_TEMPLATE.md
deleted file mode 100644
index 23843c2c507f..000000000000
--- a/.github/FLAKY_CI_FAILURE_TEMPLATE.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: '[Flaky CI]: {{ env.JOB_NAME }} - {{ env.TEST_NAME }}'
-labels: Tests, "Flaky Test"
----
-
-### Flakiness Type
-
-Other / Unknown
-
-### Name of Job
-
-{{ env.JOB_NAME }}
-
-### Name of Test
-
-{{ env.TEST_NAME }}
-
-### Link to Test Run
-
-{{ env.RUN_LINK }}
-
----
-
-_This issue was automatically created._
diff --git a/.github/ISSUE_TEMPLATE/flaky.yml b/.github/ISSUE_TEMPLATE/flaky.yml
index 22b035ec1145..91b467a8b4dd 100644
--- a/.github/ISSUE_TEMPLATE/flaky.yml
+++ b/.github/ISSUE_TEMPLATE/flaky.yml
@@ -12,6 +12,7 @@ body:
         - Timeout
         - Assertion failure
         - Other / Unknown
+      default: 1
     validations:
       required: true
   - type: input
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 45e298794f10..908dfc211966 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -783,7 +783,7 @@ jobs:
   job_node_integration_tests:
     name:
       Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Integration
-      Tests
+      Tests (${{ matrix.shard }}/3)
     needs: [job_get_metadata, job_build]
     if: needs.job_build.outputs.changed_node_integration == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
@@ -792,12 +792,20 @@ jobs:
       fail-fast: false
       matrix:
         node: [20.19, 22, 24, 26]
+        shard: [1, 2, 3]
         typescript:
           - false
         include:
           # Only check typescript for latest version (to streamline CI)
           - node: 24
             typescript: '5.0'
+            shard: 1
+          - node: 24
+            typescript: '5.0'
+            shard: 2
+          - node: 24
+            typescript: '5.0'
+            shard: 3
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v7
@@ -832,14 +840,18 @@ jobs:
 
       - name: Run integration tests
         working-directory: dev-packages/node-integration-tests
-        run: yarn test
+        run: yarn test --shard=${{ matrix.shard }}/3
 
   job_cloudflare_integration_tests:
-    name: Cloudflare Integration Tests
+    name: Cloudflare Integration Tests (${{ matrix.shard }}/2)
     needs: [job_get_metadata, job_build]
     if: needs.job_build.outputs.changed_cloudflare_integration == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
     timeout-minutes: 15
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v7
@@ -856,7 +868,7 @@ jobs:
 
       - name: Run integration tests
         working-directory: dev-packages/cloudflare-integration-tests
-        run: yarn test
+        run: yarn test --shard=${{ matrix.shard }}/2
 
   job_bundler_plugin_integration_tests:
     name: Bundler Plugin Integration Tests (Node ${{ matrix.node }})
@@ -1261,28 +1273,8 @@ jobs:
     # Always run this, even if a dependent job failed
     if: always()
     runs-on: ubuntu-24.04
-    permissions:
-      issues: write
-      checks: read
+    permissions: {}
     steps:
-      - name: Check out current commit
-        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
-        uses: actions/checkout@v7
-        with:
-          sparse-checkout: |
-            .github
-            scripts
-
-      - name: Create issues for failed jobs
-        if: github.ref == 'refs/heads/develop' && contains(needs.*.result, 'failure')
-        uses: actions/github-script@v9
-        with:
-          script: |
-            const { default: run } = await import(
-              `${process.env.GITHUB_WORKSPACE}/scripts/report-ci-failures.mjs`
-            );
-            await run({ github, context, core });
-
       - name: Check for failures
         if: cancelled() || contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
         run: |
diff --git a/.github/workflows/cleanup-e2e-workers.yml b/.github/workflows/cleanup-e2e-workers.yml
index 02fb540f71a3..ebb003de3c26 100644
--- a/.github/workflows/cleanup-e2e-workers.yml
+++ b/.github/workflows/cleanup-e2e-workers.yml
@@ -31,6 +31,6 @@ jobs:
 
           if ! output=$(npx --yes wrangler@4 delete --name "$WORKER" --force 2>&1); then
             echo "$output"
-            # 10007 means the worker does not exist, i.e. the PR never ran the optional E2E job.
-            echo "$output" | grep -q 'code: 10007' || exit 1
+            # 10007 and 10090 mean the worker does not exist, e.g. the PR never ran the optional E2E job.
+            echo "$output" | grep -Eq 'code: (10007|10090)\]' || exit 1
           fi
diff --git a/.github/workflows/weekly-flaky-tests.yml b/.github/workflows/weekly-flaky-tests.yml
new file mode 100644
index 000000000000..5c99a4b5f93f
--- /dev/null
+++ b/.github/workflows/weekly-flaky-tests.yml
@@ -0,0 +1,35 @@
+name: 'CI: Weekly flaky tests'
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 7 * * 1'
+      timezone: 'Europe/Vienna'
+
+permissions:
+  contents: read
+  actions: read
+  checks: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  report:
+    name: Weekly flaky test report
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+      - name: Analyze the last seven days of develop CI
+        uses: actions/github-script@v9
+        with:
+          retries: 3
+          script: |
+            const { default: run } = await import(
+              `${process.env.GITHUB_WORKSPACE}/scripts/weekly-flaky-tests.mjs`
+            );
+            await run({ github, context, core });
diff --git a/.size-limit.js b/.size-limit.js
index 3b96129de159..3991fe66e743 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -8,7 +8,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init'),
     gzip: true,
-    limit: '34 KB',
+    limit: '35 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -65,7 +65,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '56 KB',
+    limit: '57 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -73,7 +73,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'spanStreamingIntegration'),
     gzip: true,
-    limit: '56 KB',
+    limit: '57 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -81,7 +81,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'browserProfilingIntegration'),
     gzip: true,
-    limit: '59 KB',
+    limit: '60 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -89,7 +89,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '95 KB',
+    limit: '96 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -121,7 +121,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
     gzip: true,
-    limit: '100 KB',
+    limit: '101 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -129,7 +129,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration'),
     gzip: true,
-    limit: '113 KB',
+    limit: '114 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -145,7 +145,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'sendFeedback'),
     gzip: true,
-    limit: '39 KB',
+    limit: '40 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -161,7 +161,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'metrics'),
     gzip: true,
-    limit: '35 KB',
+    limit: '36 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -177,7 +177,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'metrics', 'logger'),
     gzip: true,
-    limit: '36 KB',
+    limit: '37 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // React SDK (ESM)
@@ -196,7 +196,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '58 KB',
+    limit: '59 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // Vue SDK (ESM)
@@ -213,7 +213,7 @@ module.exports = [
     path: 'packages/vue/build/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '58 KB',
+    limit: '59 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // Svelte SDK (ESM)
@@ -222,7 +222,7 @@ module.exports = [
     path: 'packages/svelte/build/esm/index.js',
     import: createImport('init'),
     gzip: true,
-    limit: '34 KB',
+    limit: '35 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // Browser CDN bundles
@@ -237,21 +237,21 @@ module.exports = [
     name: 'CDN Bundle (incl. Tracing)',
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: true,
-    limit: '56 KB',
+    limit: '57 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
     name: 'CDN Bundle (incl. Logs, Metrics)',
     path: createCDNPath('bundle.logs.metrics.min.js'),
     gzip: true,
-    limit: '38 KB',
+    limit: '39 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
     name: 'CDN Bundle (incl. Tracing, Logs, Metrics)',
     path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
     gzip: true,
-    limit: '58 KB',
+    limit: '59 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -265,28 +265,28 @@ module.exports = [
     name: 'CDN Bundle (incl. Tracing, Replay)',
     path: createCDNPath('bundle.tracing.replay.min.js'),
     gzip: true,
-    limit: '94 KB',
+    limit: '95 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics)',
     path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
     gzip: true,
-    limit: '96 KB',
+    limit: '97 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
     path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
     gzip: true,
-    limit: '100 KB',
+    limit: '101 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)',
     path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
     gzip: true,
-    limit: '102 KB',
+    limit: '103 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // browser CDN bundles (non-gzipped)
@@ -295,7 +295,7 @@ module.exports = [
     path: createCDNPath('bundle.min.js'),
     gzip: false,
     brotli: false,
-    limit: '96 KB',
+    limit: '97 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -303,7 +303,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '158 KB',
+    limit: '159 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -319,7 +319,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
     gzip: false,
     brotli: false,
-    limit: '164 KB',
+    limit: '165 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -327,7 +327,7 @@ module.exports = [
     path: createCDNPath('bundle.replay.logs.metrics.min.js'),
     gzip: false,
     brotli: false,
-    limit: '232 KB',
+    limit: '233 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -335,7 +335,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.replay.min.js'),
     gzip: false,
     brotli: false,
-    limit: '277 KB',
+    limit: '279 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -343,7 +343,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
     gzip: false,
     brotli: false,
-    limit: '283 KB',
+    limit: '285 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -351,7 +351,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
     gzip: false,
     brotli: false,
-    limit: '291 KB',
+    limit: '293 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -359,7 +359,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
     gzip: false,
     brotli: false,
-    limit: '297 KB',
+    limit: '299 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // Next.js SDK (ESM)
@@ -379,7 +379,7 @@ module.exports = [
     import: createImport('init'),
     ignore: ['$app/stores'],
     gzip: true,
-    limit: '56 KB',
+    limit: '57 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // Core SDK subpath entry points (ESM)
@@ -388,7 +388,7 @@ module.exports = [
     path: 'packages/core/build/esm/server.js',
     import: '*',
     gzip: true,
-    limit: '43 KB',
+    limit: '45 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -406,7 +406,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '135 KB',
+    limit: '142 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {
@@ -414,7 +414,7 @@ module.exports = [
     path: ['packages/server-runtime-injection/build/esm/hook.js', 'packages/node/build/import-hook.mjs'],
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '87 KB',
+    limit: '88 KB',
     disablePlugins: ['@size-limit/esbuild'],
     modifyWebpackConfig: function (config) {
       // Both packages declare `sideEffects: false`, which lets webpack
@@ -430,7 +430,7 @@ module.exports = [
     path: 'packages/node/build/esm/index.js',
     import: createImport('initWithoutDefaultIntegrations', 'getDefaultIntegrationsWithoutPerformance'),
     gzip: true,
-    limit: '95 KB',
+    limit: '96 KB',
     disablePlugins: ['@size-limit/esbuild'],
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     modifyWebpackConfig: function (config) {
@@ -452,7 +452,7 @@ module.exports = [
     path: 'packages/node/build/esm/index.js',
     import: createImport('init'),
     gzip: true,
-    limit: '114 KB',
+    limit: '121 KB',
     disablePlugins: ['@size-limit/esbuild'],
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     modifyWebpackConfig: function (config) {
@@ -473,7 +473,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '103 KB',
+    limit: '104 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   // Cloudflare SDK (ESM) - compressed, minified to match `wrangler deploy --dry-run --minify` output
@@ -484,7 +484,7 @@ module.exports = [
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: false,
     brotli: false,
-    limit: '205 KiB',
+    limit: '208 KiB',
     disablePlugins: ['@size-limit/webpack'],
     webpack: false,
     modifyEsbuildConfig: function (config) {
@@ -504,7 +504,7 @@ module.exports = [
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: false,
     brotli: false,
-    limit: '502 KiB',
+    limit: '507 KiB',
     disablePlugins: ['@size-limit/webpack'],
     webpack: false,
     modifyEsbuildConfig: function (config) {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e1f1fea7198..6b52a3163c26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,116 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 11.1.0
+
+### Important Changes
+
+- **feat(server-utils): Auto-instrument MCP servers via orchestrion ([#24529](https://github.com/getsentry/sentry-javascript/pull/24529))**
+
+  A new default `mcpServerIntegration` wraps every `McpServer` instance (from `@modelcontextprotocol/server` and `@modelcontextprotocol/sdk`) when it is created. You no longer need to call `wrapMcpServerWithSentry` manually. You can still call `wrapMcpServerWithSentry` to override options, for example `recordInputs: false`.
+
+- **feat(node): Support Prisma 8 in `prismaIntegration` ([#24682](https://github.com/getsentry/sentry-javascript/pull/24682))**
+
+  `prismaIntegration` now creates a `prisma:client:operation` span for each Prisma 8 ORM call, with the database query spans nested below it. No code changes are necessary.
+
+- **feat(server-utils): Add TypeSafe integration ([#24703](https://github.com/getsentry/sentry-javascript/pull/24703))**
+
+  A new default `typesafeIntegration` creates a `gen_ai.evaluate` span for each TypeSafe Jev call through `@typesafe-ai/sdk` (`TypeSafeClient.systemOne`). For runtimes without auto-instrumentation, use `instrumentTypeSafeClient()`.
+
+- **feat(server-utils): Instrument Vercel AI `experimental_evaluate` ([#24694](https://github.com/getsentry/sentry-javascript/pull/24694))**
+
+  Vercel AI `experimental_evaluate` calls now create a `gen_ai.evaluate` span, with the state and questions as input messages and the answers as output messages.
+
+### Other Changes
+
+- feat(browser): Add `onError` callback to `showReportDialog` ([#24780](https://github.com/getsentry/sentry-javascript/pull/24780))
+- feat(bun): Add client address, port and protocol to Bun.serve spans ([#24523](https://github.com/getsentry/sentry-javascript/pull/24523))
+- feat(cloudflare): Re-export httpServerIntegration from /request ([#24614](https://github.com/getsentry/sentry-javascript/pull/24614))
+- feat(remix): Add Remix 3 export subpaths and optional peer deps ([#24697](https://github.com/getsentry/sentry-javascript/pull/24697))
+- feat(server-utils): Support amqplib v2 ([#24652](https://github.com/getsentry/sentry-javascript/pull/24652))
+- feat(server-utils): Support tedious v20 ([#24644](https://github.com/getsentry/sentry-javascript/pull/24644))
+- fix: Injection silently no-ops on Windows (`registerHooks` path) ([#24705](https://github.com/getsentry/sentry-javascript/pull/24705))
+- fix(bun): Keep diagnostics channel subscriptions alive ([#24632](https://github.com/getsentry/sentry-javascript/pull/24632))
+- fix(cloudflare): Call connect() on the binding for service bindings and DO stubs ([#24593](https://github.com/getsentry/sentry-javascript/pull/24593))
+- fix(cloudflare): Keep the user's class name when auto-wrapping an export ([#24700](https://github.com/getsentry/sentry-javascript/pull/24700))
+- fix(core): Support joined set-cookie headers (split them) ([#24659](https://github.com/getsentry/sentry-javascript/pull/24659))
+- fix(nextjs): Don't prepend basePath to absolute router navigation URLs ([#24680](https://github.com/getsentry/sentry-javascript/pull/24680))
+- fix(nextjs): Limit Turbopack orchestrion loader to instrumented packages ([#24792](https://github.com/getsentry/sentry-javascript/pull/24792))
+- fix(nextjs): Stop Turbopack loaders from loading the Sentry CLI ([#24651](https://github.com/getsentry/sentry-javascript/pull/24651))
+- fix(server-runtime-injection): Keep ES modules working on Deno ([#24669](https://github.com/getsentry/sentry-javascript/pull/24669))
+- fix(server-utils): Deduplicate Google GenAI streaming tool calls ([#23432](https://github.com/getsentry/sentry-javascript/pull/23432))
+- fix(sveltekit,remix): Export Mistral manual wrapper ([#24566](https://github.com/getsentry/sentry-javascript/pull/24566))
+- fix(sveltekit): Resolve `@opentelemetry/api` via the SDK on SvelteKit 3 ([#24736](https://github.com/getsentry/sentry-javascript/pull/24736))
+- fix(wasm): map wasm:// stack frames to registered debug images ([#23999](https://github.com/getsentry/sentry-javascript/pull/23999))
+- perf(bundler-plugins): Use fast component annotation for HTML injection mode ([#24440](https://github.com/getsentry/sentry-javascript/pull/24440))
+- perf(bundler-plugins): Use fast component annotation for Webpack and Turbopack ([#24448](https://github.com/getsentry/sentry-javascript/pull/24448))
+- ref(bundler-plugins): Remove Babel fallback from component annotation ([#24449](https://github.com/getsentry/sentry-javascript/pull/24449))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore: Add external contributor to CHANGELOG.md ([#24674](https://github.com/getsentry/sentry-javascript/pull/24674))
+- chore: Add external contributor to CHANGELOG.md ([#24675](https://github.com/getsentry/sentry-javascript/pull/24675))
+- chore: Add external contributor to CHANGELOG.md ([#24745](https://github.com/getsentry/sentry-javascript/pull/24745))
+- chore: Add external contributor to CHANGELOG.md ([#24766](https://github.com/getsentry/sentry-javascript/pull/24766))
+- chore: Add external contributor to CHANGELOG.md ([#24782](https://github.com/getsentry/sentry-javascript/pull/24782))
+- chore: Update base node version to 24.21.0 ([#24343](https://github.com/getsentry/sentry-javascript/pull/24343))
+- chore: upgrade oxfmt to 0.70.0 ([#24637](https://github.com/getsentry/sentry-javascript/pull/24637))
+- chore(ci): Assign server package reviews back to server team ([#24743](https://github.com/getsentry/sentry-javascript/pull/24743))
+- chore(deps-dev): bump elysia from 1.4.27 to 1.4.29 ([#24673](https://github.com/getsentry/sentry-javascript/pull/24673))
+- chore(deps): Bump `@sentry/conventions` to 0.24.0 ([#24645](https://github.com/getsentry/sentry-javascript/pull/24645))
+- chore(size-limit): weekly auto-bump ([#24729](https://github.com/getsentry/sentry-javascript/pull/24729))
+- ci: Replace per-run flaky issues with a weekly report ([#24707](https://github.com/getsentry/sentry-javascript/pull/24707))
+- ci: shard Cloudflare integration tests ([#24726](https://github.com/getsentry/sentry-javascript/pull/24726))
+- ci: shard Node integration tests and increase browser Playwright workers ([#24676](https://github.com/getsentry/sentry-javascript/pull/24676))
+- docs: Point browser SDK READMEs to documentation ([#24634](https://github.com/getsentry/sentry-javascript/pull/24634))
+- docs: Point Effect, Elysia, and Wasm READMEs to documentation ([#24636](https://github.com/getsentry/sentry-javascript/pull/24636))
+- docs: Point framework SDK READMEs to documentation ([#24631](https://github.com/getsentry/sentry-javascript/pull/24631))
+- docs: Point profiling and native READMEs to documentation ([#24640](https://github.com/getsentry/sentry-javascript/pull/24640))
+- docs: Point Replay and Feedback READMEs to documentation ([#24639](https://github.com/getsentry/sentry-javascript/pull/24639))
+- docs: Point server SDK READMEs to documentation ([#24635](https://github.com/getsentry/sentry-javascript/pull/24635))
+- docs: Point tooling READMEs to documentation ([#24641](https://github.com/getsentry/sentry-javascript/pull/24641))
+- docs: Standardize internal package READMEs ([#24638](https://github.com/getsentry/sentry-javascript/pull/24638))
+- docs(angular): Point README to SDK documentation ([#24623](https://github.com/getsentry/sentry-javascript/pull/24623))
+- docs(astro): Point README to SDK documentation ([#24626](https://github.com/getsentry/sentry-javascript/pull/24626))
+- docs(aws-serverless): Point README to SDK documentation ([#24627](https://github.com/getsentry/sentry-javascript/pull/24627))
+- docs(cloudflare): Point README to SDK documentation ([#24624](https://github.com/getsentry/sentry-javascript/pull/24624))
+- docs(ember): Point README to SDK documentation ([#24628](https://github.com/getsentry/sentry-javascript/pull/24628))
+- docs(hono): Point README to SDK documentation ([#24621](https://github.com/getsentry/sentry-javascript/pull/24621))
+- docs(nestjs): Point README to SDK documentation ([#24618](https://github.com/getsentry/sentry-javascript/pull/24618))
+- docs(nitro): Point README to SDK documentation ([#24629](https://github.com/getsentry/sentry-javascript/pull/24629))
+- docs(opentelemetry): Point README to documentation ([#24642](https://github.com/getsentry/sentry-javascript/pull/24642))
+- docs(react-router): Point README to SDK documentation ([#24625](https://github.com/getsentry/sentry-javascript/pull/24625))
+- docs(remix): Point README to SDK documentation ([#24630](https://github.com/getsentry/sentry-javascript/pull/24630))
+- docs(solidstart): Point README to SDK documentation ([#24622](https://github.com/getsentry/sentry-javascript/pull/24622))
+- fix(ci): Handle missing workers in E2E cleanup ([#24779](https://github.com/getsentry/sentry-javascript/pull/24779))
+- fix(server-utils): Use Bun-safe diagnostics channel wrappers in MCP integration ([#24797](https://github.com/getsentry/sentry-javascript/pull/24797))
+- test(bun, deno): Run shared Node integration suites on Bun and Deno ([#24609](https://github.com/getsentry/sentry-javascript/pull/24609))
+- test(bun): Exclude Typesafe tests in bun ([#24785](https://github.com/getsentry/sentry-javascript/pull/24785))
+- test(bun): Run all Node integration suites on Bun ([#24610](https://github.com/getsentry/sentry-javascript/pull/24610))
+- test(bun): Run the Bun-only suites with the shared Node runner ([#24668](https://github.com/getsentry/sentry-javascript/pull/24668))
+- test(cloudflare): Add e2e test app for `@cloudflare/think` ([#24660](https://github.com/getsentry/sentry-javascript/pull/24660))
+- test(cloudflare): Resend requests until the deployed Cloudflare Worker answers ([#24560](https://github.com/getsentry/sentry-javascript/pull/24560))
+- test(deno): Run all Node integration suites on Deno ([#24611](https://github.com/getsentry/sentry-javascript/pull/24611))
+- test(e2e): Add cache origin link tests for cached components in pages ([#24739](https://github.com/getsentry/sentry-javascript/pull/24739))
+- test(e2e): Add cache origin link tests for use cache route handlers ([#24734](https://github.com/getsentry/sentry-javascript/pull/24734))
+- test(e2e): Add Next.js cache component nesting scenarios ([#24704](https://github.com/getsentry/sentry-javascript/pull/24704))
+- test(e2e): Add node-prisma-8 test app ([#24683](https://github.com/getsentry/sentry-javascript/pull/24683))
+- test(e2e): Add pageload connection test for cache component apps ([#24741](https://github.com/getsentry/sentry-javascript/pull/24741))
+- test(e2e): fix flaky hydrogen send-to-sentry tests ([#24708](https://github.com/getsentry/sentry-javascript/pull/24708))
+- test(effect): Make effect/http stable ([#24781](https://github.com/getsentry/sentry-javascript/pull/24781))
+- test(node): Add Prisma 8 integration test suite ([#24681](https://github.com/getsentry/sentry-javascript/pull/24681))
+- test(node): Assert absence of PII attributes in OpenAI integration tests ([#24031](https://github.com/getsentry/sentry-javascript/pull/24031))
+- test(node): Port envelope-header tests to span streaming ([#24528](https://github.com/getsentry/sentry-javascript/pull/24528))
+- test(node): Use a separate instrument file for the Vercel AI evaluate privacy test ([#24742](https://github.com/getsentry/sentry-javascript/pull/24742))
+- test(nuxt): Fix Nuxt 5 E2E by pinning @nuxt/cli ([#24788](https://github.com/getsentry/sentry-javascript/pull/24788))
+- test(remix): Add Remix 3 e2e test application ([#24698](https://github.com/getsentry/sentry-javascript/pull/24698))
+- test(vue): verify vue-router 5 support ([#24595](https://github.com/getsentry/sentry-javascript/pull/24595))
+
+</details>
+
+Work in this release was contributed by @camc314, @ihsraham, @zkasuran, @Shubham-Padkonde, and @itz-puneet. Thank you for your contributions!
+
 ## 11.0.0
 
 Version `11.0.0` marks a major release of the Sentry JavaScript SDKs containing breaking changes.
diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index e88d92787a7e..cfc10ae5460e 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -63,7 +63,7 @@
     "@sentry/browser": "11.0.0",
     "@sentry/replay": "11.0.0",
     "@sentry/opentelemetry": "11.0.0",
-    "@sentry/conventions": "0.23.0",
+    "@sentry/conventions": "0.24.0",
     "@supabase/supabase-js": "2.109.0",
     "axios": "1.18.0",
     "babel-loader": "^10.1.1",
diff --git a/dev-packages/browser-integration-tests/playwright.browser.config.ts b/dev-packages/browser-integration-tests/playwright.browser.config.ts
index dd48c8f54746..9fbee13a25dd 100644
--- a/dev-packages/browser-integration-tests/playwright.browser.config.ts
+++ b/dev-packages/browser-integration-tests/playwright.browser.config.ts
@@ -3,6 +3,7 @@ import CorePlaywrightConfig from './playwright.config';
 
 const config: PlaywrightTestConfig = {
   ...CorePlaywrightConfig,
+  workers: process.env.CI ? 6 : undefined,
   testDir: './suites',
 };
 
diff --git a/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/on-error/subject.js b/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/on-error/subject.js
new file mode 100644
index 000000000000..d547113b8f5e
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/on-error/subject.js
@@ -0,0 +1,6 @@
+Sentry.showReportDialog({
+  eventId: 'test_id',
+  onError: error => {
+    window._reportDialogError = error.message;
+  },
+});
diff --git a/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/on-error/test.ts b/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/on-error/test.ts
new file mode 100644
index 000000000000..d0d94225c375
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/on-error/test.ts
@@ -0,0 +1,15 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+
+sentryTest('calls `onError` when the dialog script is blocked', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  // Registered after `getLocalTestUrl` so it takes precedence over the fixture's ingest route
+  await page.route(/\/api\/embed\/error-page\//, route => route.abort('blockedbyclient'));
+
+  await page.goto(url);
+
+  const errorMessage = await page.waitForFunction(() => (window as any)._reportDialogError);
+
+  expect(await errorMessage.jsonValue()).toBe('Failed to load the report dialog script');
+});
diff --git a/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/init.js b/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/init.js
index d5c0d011b788..602bdd6b9a16 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/init.js
+++ b/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/init.js
@@ -1,20 +1,15 @@
 import * as Sentry from '@sentry/browser';
-import { registerWebWorkerWasm } from '@sentry/wasm';
+import { wasmIntegration } from '@sentry/wasm';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-});
-
-// `registerWebWorkerWasm` installs the same patches a worker would, and reports
-// every registered module to the scope it is given. Collecting them here is the
-// only way to observe registration from the page, since main-thread images stay
-// module-internal until a frame matches one.
-window.registeredImages = [];
-registerWebWorkerWasm({
-  self: {
-    postMessage: message => window.registeredImages.push(...(message._sentryWasmImages || [])),
+  integrations: [wasmIntegration()],
+  beforeSend: event => {
+    window.events.push(event);
+    return null;
   },
 });
+window.events = [];
diff --git a/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/subject.js b/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/subject.js
index d58714c72fca..e182f6c3295f 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/subject.js
+++ b/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/subject.js
@@ -1,12 +1,20 @@
-window.loadWasmFromBuffer = async () => {
-  const response = await fetch('https://localhost:5887/simple.wasm');
-  const buffer = await response.arrayBuffer();
+window.getEvent = async () => {
+  function crash() {
+    throw new Error('whoops');
+  }
 
-  await WebAssembly.instantiate(new Uint8Array(buffer), {
+  const response = await fetch('https://localhost:5887/named.wasm');
+  const buffer = await response.arrayBuffer();
+  const { instance } = await WebAssembly.instantiate(new Uint8Array(buffer), {
     env: {
-      external_func: () => {},
+      external_func: crash,
     },
   });
 
-  return window.registeredImages;
+  try {
+    instance.exports.internal_func();
+  } catch (err) {
+    Sentry.captureException(err);
+    return window.events.pop();
+  }
 };
diff --git a/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/test.ts b/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/test.ts
index 151285f9ee51..22a5d623b872 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/wasm/instantiateBufferRegistration/test.ts
@@ -1,49 +1,68 @@
-import type { Page, Route } from '@playwright/test';
 import { expect } from '@playwright/test';
 import fs from 'fs';
 import path from 'path';
 import { sentryTest } from '../../../utils/fixtures';
 import { shouldSkipWASMTests } from '../../../utils/wasmHelpers';
 
-async function serveWasmFixture(page: Page): Promise<void> {
-  // `page.route` resolves with a `Disposable` as of Playwright 1.63, so it can't be returned directly.
-  await page.route('**/simple.wasm', (route: Route) => {
-    const wasmModule = fs.readFileSync(path.resolve(__dirname, '..', 'simple.wasm'));
-
-    return route.fulfill({
-      status: 200,
-      body: wasmModule,
-      headers: {
-        'Content-Type': 'application/wasm',
-      },
-    });
-  });
-}
-
+// `named.wasm` is `../simple.wasm` plus a module-name subsection (`namedmodule`)
+// in its `name` section. Chrome labels bytes-compiled modules with that name
+// as `wasm://wasm/namedmodule-<hash>`, not with the fetch URL.
 sentryTest(
-  'registers a module loaded via fetch, arrayBuffer and instantiate under its response url',
+  'maps frames of a module compiled from fetched bytes to its debug image',
   async ({ getLocalTestUrl, page, browserName }) => {
     if (shouldSkipWASMTests(browserName)) {
       sentryTest.skip();
     }
 
     const url = await getLocalTestUrl({ testDir: __dirname });
-    await serveWasmFixture(page);
+
+    await page.route('**/named.wasm', route => {
+      const wasmModule = fs.readFileSync(path.resolve(__dirname, '..', 'named.wasm'));
+
+      return route.fulfill({
+        status: 200,
+        body: wasmModule,
+        headers: {
+          'Content-Type': 'application/wasm',
+        },
+      });
+    });
+
     await page.goto(url);
 
-    const images = await page.evaluate(async () => {
+    const event = await page.evaluate(async () => {
       // @ts-expect-error this function exists
-      return window.loadWasmFromBuffer();
+      return window.getEvent();
     });
 
-    expect(images).toEqual([
-      {
-        type: 'wasm',
-        code_file: 'https://localhost:5887/simple.wasm',
-        code_id: '0ba020cdd2444f7eafdd25999a8e9010',
-        debug_file: null,
-        debug_id: '0ba020cdd2444f7eafdd25999a8e90100',
-      },
-    ]);
+    expect(event.exception.values[0].stacktrace.frames).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          filename: 'https://localhost:5887/named.wasm',
+          function: 'namedmodule.internal_func',
+          in_app: true,
+          instruction_addr: '0x8c',
+          addr_mode: 'rel:0',
+          platform: 'native',
+        }),
+        expect.objectContaining({
+          filename: expect.stringMatching(/subject\.bundle\.js$/),
+          function: 'crash',
+          in_app: true,
+        }),
+      ]),
+    );
+
+    expect(event.debug_meta).toMatchObject({
+      images: [
+        {
+          code_file: 'https://localhost:5887/named.wasm',
+          code_id: '0ba020cdd2444f7eafdd25999a8e9010',
+          debug_file: null,
+          debug_id: '0ba020cdd2444f7eafdd25999a8e90100',
+          type: 'wasm',
+        },
+      ],
+    });
   },
 );
diff --git a/dev-packages/browser-integration-tests/suites/wasm/named.wasm b/dev-packages/browser-integration-tests/suites/wasm/named.wasm
new file mode 100644
index 000000000000..15f49406f293
Binary files /dev/null and b/dev-packages/browser-integration-tests/suites/wasm/named.wasm differ
diff --git a/dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js b/dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js
index 81f9462f1aab..ba3a85d04715 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js
+++ b/dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js
@@ -3,6 +3,30 @@
 //  between worker and main thread independent of SDK implementation details
 // in production code you would do: registerWebWorkerWasm({ self });
 
+// Bytes-compiled modules carry no URL, so remember the fetch URL per buffer
+// like the SDK's Response patch does.
+const bufferUrls = new WeakMap();
+const origArrayBuffer = Response.prototype.arrayBuffer;
+Response.prototype.arrayBuffer = function arrayBuffer() {
+  return origArrayBuffer.call(this).then(buffer => {
+    if (this.url) {
+      bufferUrls.set(buffer, this.url);
+    }
+    return buffer;
+  });
+};
+
+const origInstantiate = WebAssembly.instantiate;
+WebAssembly.instantiate = function instantiate(source, importObject) {
+  return origInstantiate(source, importObject).then(result => {
+    const url = bufferUrls.get(source instanceof ArrayBuffer ? source : source.buffer);
+    if (url && result.module) {
+      registerModuleAndForward(result.module, url);
+    }
+    return result;
+  });
+};
+
 const origInstantiateStreaming = WebAssembly.instantiateStreaming;
 WebAssembly.instantiateStreaming = function instantiateStreaming(response, importObject) {
   return Promise.resolve(response).then(res => {
@@ -26,6 +50,10 @@ function registerModuleAndForward(module, url) {
       debug_file: null,
       debug_id: `${`${buildId}00000000000000000000000000000000`.slice(0, 32)}0`,
     };
+    const moduleName = getModuleName(module);
+    if (moduleName) {
+      image.moduleName = moduleName;
+    }
 
     self.postMessage({
       _sentryMessage: true,
@@ -46,6 +74,24 @@ function getBuildId(module) {
   return null;
 }
 
+// Read the module name from the `name` custom section. Chrome labels
+// bytes-compiled modules `wasm://wasm/<name>-<hash>`, and the main thread
+// links such frames to this image by that name.
+function getModuleName(module) {
+  const sections = WebAssembly.Module.customSections(module, 'name');
+  if (sections.length === 0) {
+    return null;
+  }
+  const bytes = new Uint8Array(sections[0]);
+  // Subsection id 0 is the module name: id, payload size, name length, name.
+  // Sizes are LEB128, but the fixture's fit in one byte each.
+  if (bytes[0] !== 0) {
+    return null;
+  }
+  const length = bytes[2];
+  return new TextDecoder().decode(bytes.subarray(3, 3 + length));
+}
+
 // Handle messages from the main thread
 self.addEventListener('message', async event => {
   if (event.origin !== '' && event.origin !== self.location.origin) {
@@ -56,15 +102,23 @@ self.addEventListener('message', async event => {
     throw new Error('WASM error from worker');
   }
 
-  if (event.data.type === 'load-wasm-and-crash') {
+  if (event.data.type === 'load-wasm-and-crash' || event.data.type === 'load-wasm-bytes-and-crash') {
     const wasmUrl = event.data.wasmUrl;
+    const imports = {
+      env: {
+        external_func: crash,
+      },
+    };
 
     try {
-      const { instance } = await WebAssembly.instantiateStreaming(fetch(wasmUrl), {
-        env: {
-          external_func: crash,
-        },
-      });
+      let instance;
+      if (event.data.type === 'load-wasm-bytes-and-crash') {
+        const response = await fetch(wasmUrl);
+        const buffer = await response.arrayBuffer();
+        ({ instance } = await WebAssembly.instantiate(new Uint8Array(buffer), imports));
+      } else {
+        ({ instance } = await WebAssembly.instantiateStreaming(fetch(wasmUrl), imports));
+      }
 
       instance.exports.internal_func();
     } catch (err) {
diff --git a/dev-packages/browser-integration-tests/suites/wasm/webWorker/subject.js b/dev-packages/browser-integration-tests/suites/wasm/webWorker/subject.js
index 22d1f7c57f03..d944ae1fd100 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/webWorker/subject.js
+++ b/dev-packages/browser-integration-tests/suites/wasm/webWorker/subject.js
@@ -6,3 +6,10 @@ window.triggerWasmError = () => {
     wasmUrl: 'https://localhost:5887/simple.wasm',
   });
 };
+
+window.triggerWasmBufferError = () => {
+  window.wasmWorker.postMessage({
+    type: 'load-wasm-bytes-and-crash',
+    wasmUrl: 'https://localhost:5887/named.wasm',
+  });
+};
diff --git a/dev-packages/browser-integration-tests/suites/wasm/webWorker/test.ts b/dev-packages/browser-integration-tests/suites/wasm/webWorker/test.ts
index 5faec2160229..45dbae8f5329 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/webWorker/test.ts
+++ b/dev-packages/browser-integration-tests/suites/wasm/webWorker/test.ts
@@ -9,6 +9,7 @@ declare global {
   interface Window {
     wasmWorker: Worker;
     triggerWasmError: () => void;
+    triggerWasmBufferError: () => void;
   }
 }
 
@@ -137,3 +138,70 @@ sentryTest(
     );
   },
 );
+
+// `named.wasm` is `simple.wasm` plus a module-name subsection (`namedmodule`).
+// Chrome labels bytes-compiled modules with a name as `wasm://wasm/namedmodule-<hash>`,
+// not with the fetch URL, so the frame has to be linked to the image by that name.
+sentryTest(
+  'WASM frames from a module compiled from fetched bytes in a worker should map to its debug image',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    if (shouldSkipWASMTests(browserName)) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.route('**/named.wasm', route => {
+      const wasmModule = fs.readFileSync(path.resolve(__dirname, '../named.wasm'));
+      return route.fulfill({
+        status: 200,
+        body: wasmModule,
+        headers: {
+          'Content-Type': 'application/wasm',
+        },
+      });
+    });
+
+    await page.route('**/worker.js', route => {
+      return route.fulfill({
+        path: `${__dirname}/assets/worker.js`,
+      });
+    });
+
+    const errorEventPromise = waitForErrorRequest(page, e => {
+      return e.exception?.values?.[0]?.value === 'WASM error from worker';
+    });
+
+    await page.goto(url);
+
+    await page.waitForFunction(() => window.wasmWorker !== undefined);
+
+    await page.evaluate(() => {
+      window.triggerWasmBufferError();
+    });
+
+    const errorEvent = envelopeRequestParser(await errorEventPromise);
+
+    expect(errorEvent.debug_meta?.images).toEqual([
+      {
+        type: 'wasm',
+        code_file: 'https://localhost:5887/named.wasm',
+        code_id: '0ba020cdd2444f7eafdd25999a8e9010',
+        debug_file: null,
+        debug_id: '0ba020cdd2444f7eafdd25999a8e90100',
+      },
+    ]);
+
+    expect(errorEvent.exception?.values?.[0]?.stacktrace?.frames).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          filename: 'https://localhost:5887/named.wasm',
+          function: 'namedmodule.internal_func',
+          platform: 'native',
+          instruction_addr: '0x8c',
+          addr_mode: 'rel:0',
+        }),
+      ]),
+    );
+  },
+);
diff --git a/dev-packages/bun-integration-tests/expect.ts b/dev-packages/bun-integration-tests/expect.ts
deleted file mode 100644
index 6f1add5ffeae..000000000000
--- a/dev-packages/bun-integration-tests/expect.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import type { Contexts, Envelope, Event, SdkInfo } from '@sentry/core';
-import { SDK_VERSION } from '@sentry/core';
-import { expect } from 'vitest';
-
-export const UUID_MATCHER = expect.stringMatching(/^[\da-f]{32}$/);
-export const UUID_V4_MATCHER = expect.stringMatching(
-  /^[\da-f]{8}-[\da-f]{4}-4[\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/,
-);
-export const SHORT_UUID_MATCHER = expect.stringMatching(/^[\da-f]{16}$/);
-export const ISO_DATE_MATCHER = expect.stringMatching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/);
-
-function dropUndefinedKeys<T extends Record<string, unknown>>(obj: T): T {
-  for (const [key, value] of Object.entries(obj)) {
-    if (value === undefined) {
-      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-      delete obj[key];
-    }
-  }
-  return obj;
-}
-
-function getSdk(sdk: 'bun' | 'hono'): SdkInfo {
-  return {
-    integrations: expect.any(Array),
-    name: `sentry.javascript.${sdk}`,
-    packages: [
-      {
-        name: `npm:@sentry/${sdk}`,
-        version: SDK_VERSION,
-      },
-      ...(sdk === 'hono' ? [{ name: 'npm:@sentry/bun', version: SDK_VERSION }] : []),
-    ],
-    version: SDK_VERSION,
-  };
-}
-
-function defaultContexts(eventContexts: Contexts = {}): Contexts {
-  return dropUndefinedKeys({
-    app: { app_memory: expect.any(Number), app_start_time: expect.any(String), free_memory: expect.any(Number) },
-    cloud_resource: expect.any(Object),
-    trace: {
-      trace_id: UUID_MATCHER,
-      span_id: SHORT_UUID_MATCHER,
-    },
-    culture: { locale: expect.any(String), timezone: expect.any(String) },
-    device: expect.any(Object),
-    os: expect.any(Object),
-    runtime: { name: 'bun', version: expect.any(String) },
-    ...eventContexts,
-  });
-}
-
-export function expectedEvent(event: Event, { sdk }: { sdk: 'bun' | 'hono' }): Event {
-  return dropUndefinedKeys({
-    event_id: UUID_MATCHER,
-    timestamp: expect.any(Number),
-    environment: 'production',
-    platform: 'node',
-    modules: expect.any(Object),
-    sdk: getSdk(sdk),
-    server_name: expect.any(String),
-    // release is auto-detected from GitHub CI env vars, so only expect it if we know it will be there
-    ...(process.env.GITHUB_SHA ? { release: expect.any(String) } : {}),
-    ...event,
-    contexts: defaultContexts(event.contexts),
-  });
-}
-
-export function eventEnvelope(
-  event: Event,
-  {
-    includeSampleRand = false,
-    includeTransaction = true,
-    sdk = 'bun',
-  }: { includeSampleRand?: boolean; includeTransaction?: boolean; sdk?: 'bun' | 'hono' } = {},
-): Envelope {
-  return [
-    {
-      event_id: UUID_MATCHER,
-      sent_at: ISO_DATE_MATCHER,
-      sdk: { name: `sentry.javascript.${sdk}`, version: SDK_VERSION },
-      trace: {
-        environment: event.environment || 'production',
-        public_key: 'public',
-        trace_id: UUID_MATCHER,
-
-        sample_rate: expect.any(String),
-        sampled: expect.any(String),
-        // release is auto-detected from GitHub CI env vars, so only expect it if we know it will be there
-        ...(process.env.GITHUB_SHA ? { release: expect.any(String) } : {}),
-        ...(includeSampleRand && { sample_rand: expect.stringMatching(/^[01](\.\d+)?$/) }),
-        ...(includeTransaction && { transaction: expect.any(String) }),
-      },
-    },
-    [[{ type: 'event' }, expectedEvent(event, { sdk })]],
-  ];
-}
diff --git a/dev-packages/bun-integration-tests/node-suites/alias-sentry-bun.ts b/dev-packages/bun-integration-tests/node-suites/alias-sentry-bun.ts
new file mode 100644
index 000000000000..a0a452b295cf
--- /dev/null
+++ b/dev-packages/bun-integration-tests/node-suites/alias-sentry-bun.ts
@@ -0,0 +1,35 @@
+import { plugin } from 'bun';
+import Module from 'node:module';
+
+// Maps `@sentry/node` to `@sentry/bun` in the Node suite files. `@sentry/bun` imports
+// `@sentry/node` itself, so imports from outside the Node suite files are not touched.
+const NODE_SUITE_FILE = /[\\/]node-integration-tests[\\/](suites|utils)[\\/]/;
+
+// Bun's runtime `onResolve` does not see bare package specifiers, so ES modules are rewritten on
+// load. `onLoad` output for a CommonJS file does not run, so those files keep their source.
+// Dependencies in `node_modules` are skipped: Bun treats a module returned from `onLoad` as async,
+// and a CommonJS `require()` of it then fails.
+const NODE_SUITE_ESM_FILE =
+  /[\\/]node-integration-tests[\\/](suites|utils)[\\/](?!(?:.*[\\/])?node_modules[\\/]).*\.(mjs|ts)$/;
+const SENTRY_NODE_SPECIFIER = /(['"])@sentry\/node\1/g;
+
+plugin({
+  name: 'alias-sentry-node-to-sentry-bun',
+  setup(build) {
+    build.onLoad({ filter: NODE_SUITE_ESM_FILE }, async args => {
+      const source = await Bun.file(args.path).text();
+      return {
+        contents: source.replace(SENTRY_NODE_SPECIFIER, '$1@sentry/bun$1'),
+        loader: args.path.endsWith('.ts') ? 'ts' : 'js',
+      };
+    });
+  },
+});
+
+type ResolveFilename = (request: string, parent: { filename?: string } | undefined, ...rest: unknown[]) => string;
+const moduleWithResolve = Module as unknown as { _resolveFilename: ResolveFilename };
+const originalResolveFilename = moduleWithResolve._resolveFilename;
+moduleWithResolve._resolveFilename = function (request, parent, ...rest) {
+  const aliased = request === '@sentry/node' && NODE_SUITE_FILE.test(parent?.filename ?? '') ? '@sentry/bun' : request;
+  return originalResolveFilename.call(this, aliased, parent, ...rest);
+};
diff --git a/dev-packages/bun-integration-tests/node-suites/excludes.ts b/dev-packages/bun-integration-tests/node-suites/excludes.ts
new file mode 100644
index 000000000000..c06bd54b0c4c
--- /dev/null
+++ b/dev-packages/bun-integration-tests/node-suites/excludes.ts
@@ -0,0 +1,218 @@
+// Node suites that do not run on Bun, relative to `node-integration-tests`. A single test that
+// fails on Bun is skipped with `test.skipIf` on `RUNTIME` in the Node suite, not listed here.
+
+// Node-only features: ANR and native thread watchdogs, child processes, the AWS Lambda Node runtime,
+// and `node:sqlite`, which `flue` needs.
+const NODE_ONLY = [
+  'suites/anr/test.ts',
+  'suites/aws-serverless/**',
+  'suites/breadcrumbs/**',
+  'suites/child-process/test.ts',
+  'suites/thread-blocked-native/test.ts',
+  'suites/tracing/flue/test.ts',
+];
+
+// Bun does not publish `http.server.request.start`, so `@sentry/node` creates no `http.server`
+// span and does not isolate incoming requests. `@sentry/bun` has `bunHttpServerIntegration` for this,
+// so the `@sentry/bun` project runs these suites, except the ones in `SENTRY_BUN_EXCLUDE`.
+const NO_HTTP_SERVER_SPANS = [
+  'suites/sessions/**',
+  'suites/tracing/envelope-header/sampleRate-propagation/test.ts',
+  'suites/tracing/httpIntegration-streamed/test.ts',
+  'suites/tracing/httpIntegration/test.ts',
+  'suites/tracing/httpServerSpans-streamed-unrouted/test.ts',
+  'suites/tracing/ignoreSpans-streamed/**',
+  'suites/tracing/meta-tags-twp-errors/test.ts',
+  'suites/tracing/meta-tags/test.ts',
+  'suites/tracing/requestData-streamed/test.ts',
+  'suites/tracing/sample-rand-propagation/test.ts',
+  'suites/tracing/sample-rate-propagation/**',
+  'suites/tracing/sampling-static/test.ts',
+  'suites/tracing/sampling-streamed/test.ts',
+  'suites/tracing/traceid-recycling-with-spans/test.ts',
+  'suites/tracing/traceid-recycling/test.ts',
+];
+
+// `@sentry/node` instruments `fetch` through undici's diagnostics channels, which Bun's `fetch`
+// does not publish. `@sentry/bun` has its own `fetchIntegration` for this, so the `@sentry/bun`
+// project runs these suites, except the ones in `SENTRY_BUN_EXCLUDE`.
+const NO_FETCH_INSTRUMENTATION = [
+  'suites/tracing/double-baggage/**',
+  'suites/tracing/http-client-span-streamed/test.ts',
+  'suites/tracing/http-client-spans/fetch-basic-streamed/test.ts',
+  'suites/tracing/http-client-spans/fetch-basic/test.ts',
+  'suites/tracing/http-client-spans/fetch-error/test.ts',
+  'suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts',
+  'suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts',
+  'suites/tracing/http-client-spans/fetch-strip-query/test.ts',
+  'suites/tracing/no-parent-span-client-report/test.ts',
+  'suites/tracing/requests/fetch-breadcrumbs/test.ts',
+  'suites/tracing/requests/fetch-no-trace-propagation/test.ts',
+  'suites/tracing/requests/fetch-no-tracing-no-spans/test.ts',
+  'suites/tracing/requests/fetch-no-tracing/test.ts',
+  'suites/tracing/requests/fetch-sampled-no-active-span/test.ts',
+  'suites/tracing/requests/fetch-unsampled/test.ts',
+  'suites/tracing/requests/traceparent/test.ts',
+];
+
+// Bun 1.3.14 (the CI version) does not instrument outgoing `node:http` requests. These suites pass
+// on Bun 1.4.2. See https://github.com/getsentry/sentry-javascript/issues/23881
+const NO_OUTGOING_HTTP_INSTRUMENTATION = [
+  'suites/tracing/dsc-txn-name-update/test.ts',
+  'suites/tracing/http-client-spans/http-basic/test.ts',
+  'suites/tracing/http-client-spans/http-strip-query/test.ts',
+  'suites/tracing/requests/http-breadcrumbs/test.ts',
+  'suites/tracing/requests/http-maxed-out-sockets/test.ts',
+  'suites/tracing/requests/http-no-trace-propagation/test.ts',
+  'suites/tracing/requests/http-no-tracing-no-spans/test.ts',
+  'suites/tracing/requests/http-no-tracing/test.ts',
+  'suites/tracing/requests/http-sampled-no-active-span/test.ts',
+  'suites/tracing/requests/http-sampled/test.ts',
+  'suites/tracing/requests/http-unsampled/test.ts',
+  'suites/tracing/tracePropagationTargets/**',
+];
+
+// `bun run` cannot inject the diagnostics channels into libraries, so framework, database and AI
+// instrumentation creates no spans. Apps must be built with `@sentry/bun/plugin`.
+// See https://github.com/getsentry/sentry-javascript/issues/23882
+const NO_AUTO_INSTRUMENTATION = [
+  'suites/express/**',
+  'suites/fs-instrumentation/test.ts',
+  'suites/hono-sdk/test.ts',
+  'suites/pino/test.ts',
+  'suites/tracing/amqplib/test.ts',
+  'suites/tracing/anthropic/test.ts',
+  'suites/tracing/apollo-graphql/**',
+  'suites/tracing/dataloader/test.ts',
+  'suites/tracing/fastify/test.ts',
+  'suites/tracing/genericPool-v2/test.ts',
+  'suites/tracing/genericPool/test.ts',
+  'suites/tracing/is-localhost/test.ts',
+  'suites/tracing/google-genai-v2/test.ts',
+  'suites/tracing/google-genai/test.ts',
+  'suites/tracing/groq/test.ts',
+  'suites/tracing/hapi/test.ts',
+  'suites/tracing/ioredis-dc/test.ts',
+  'suites/tracing/kafkajs/test.ts',
+  'suites/tracing/knex/**',
+  'suites/tracing/koa/test.ts',
+  'suites/tracing/langchain/**',
+  'suites/tracing/langgraph/test.ts',
+  'suites/tracing/lru-memoizer/test.ts',
+  'suites/tracing/mastra/test.ts',
+  'suites/tracing/mcp-handler-exact-once/test.ts',
+  'suites/tracing/mcp-server/**',
+  'suites/tracing/mistral/test.ts',
+  'suites/tracing/mongodb-v4/test.ts',
+  'suites/tracing/mongodb-v5/test.ts',
+  'suites/tracing/mongodb-v6/test.ts',
+  'suites/tracing/mongodb-v7/test.ts',
+  'suites/tracing/mongodb/test.ts',
+  'suites/tracing/mongoose-tracing-channel/test.ts',
+  'suites/tracing/mongoose-v5/test.ts',
+  'suites/tracing/mongoose-v7/test.ts',
+  'suites/tracing/mongoose-v8/test.ts',
+  'suites/tracing/mongoose-v9/test.ts',
+  'suites/tracing/mongoose/test.ts',
+  'suites/tracing/mysql/test.ts',
+  'suites/tracing/mysql2-tracing-channel/test.ts',
+  'suites/tracing/mysql2/test.ts',
+  'suites/tracing/openai/test.ts',
+  'suites/tracing/openai/v6/test.ts',
+  'suites/tracing/openai/v7/test.ts',
+  'suites/tracing/orchestrion-lazy-registration/test.ts',
+  'suites/tracing/postgres-streamed/test.ts',
+  'suites/tracing/postgres/test.ts',
+  'suites/tracing/postgresjs-streamed/test.ts',
+  'suites/tracing/postgresjs/test.ts',
+  'suites/tracing/prisma-orm-v5/test.ts',
+  'suites/tracing/prisma-orm-v6/test.ts',
+  'suites/tracing/prisma-orm-v7/test.ts',
+  'suites/tracing/prisma-orm-v8/test.ts',
+  'suites/tracing/redis-cache/test.ts',
+  'suites/tracing/redis-dc/test.ts',
+  'suites/tracing/redis/test.ts',
+  'suites/tracing/tedious/test.ts',
+  'suites/tracing/together-ai/test.ts',
+  'suites/tracing/typesafe/test.ts',
+  'suites/tracing/vercelai/**',
+];
+
+// Fail on Bun, cause not investigated yet. `system-error` and `tracer-start-active-span-error`
+// fail on Bun 1.3.14 and pass on Bun 1.4.2. With the `@sentry/bun` alias, `system-error` also
+// fails because `@sentry/bun` does not include `nodeSystemErrorIntegration`.
+const NOT_TRIAGED = [
+  'suites/contextLines/filename-with-spaces/test.ts',
+  'suites/modules/test.ts',
+  'suites/proxy/test.ts',
+  'suites/system-error/test.ts',
+  'suites/tracing/tracer-start-active-span-error/test.ts',
+];
+
+// The scenario configures `nativeNodeFetchIntegration`, which `@sentry/bun` does not export.
+const NO_NATIVE_NODE_FETCH_INTEGRATION = [
+  'suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts',
+  'suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts',
+  'suites/tracing/requests/fetch-no-trace-propagation/test.ts',
+  'suites/tracing/requests/fetch-no-tracing-no-spans/test.ts',
+];
+
+// The `fetchIntegration` of `@sentry/bun` comes from `@sentry/core`. Its spans, breadcrumbs and
+// `sentry-trace` headers differ from the ones `@sentry/node` creates, for example the span origin
+// is `auto.http.fetch`, not `auto.http.node_fetch`, and the spans have no `url.path`, so
+// `ignoreSpans` cannot match them on it.
+const FETCH_INTEGRATION_DIFFERS = [
+  'suites/tracing/double-baggage/spans-parent/test.ts',
+  'suites/tracing/http-client-spans/fetch-basic/test.ts',
+  'suites/tracing/http-client-spans/fetch-error/test.ts',
+  'suites/tracing/http-client-spans/fetch-strip-query/test.ts',
+  'suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts',
+  'suites/tracing/requests/fetch-breadcrumbs/test.ts',
+  'suites/tracing/requests/fetch-sampled-no-active-span/test.ts',
+];
+
+// `@sentry/bun` creates `http.server` spans with `bunHttpServerIntegration`, not `httpIntegration`,
+// so the incoming-request options that the scenario passes to `httpIntegration` (for example
+// `sessionFlushingDelayMS`, `onSpanCreated`, `ignoreIncomingRequests`, `ignoreStaticAssets`) have
+// no effect. Its spans also differ: the origin is `auto.http.server`, not `auto.http.http_server`,
+// response headers become attributes, and there is no `http.response.status_text`. And a server
+// that sets `emit` back to the `emit` it had before its first request gets no spans after that.
+const HTTP_SERVER_OPTIONS_IGNORED = [
+  'suites/sessions/exited-session-aggregate/test.ts',
+  'suites/tracing/httpIntegration/test.ts',
+];
+
+// With `@sentry/bun`, these suites fail only because they need Express spans or route names,
+// which `bun run` does not create. The crashed and errored session suites also need
+// `sessionFlushingDelayMS` (see above).
+// See https://github.com/getsentry/sentry-javascript/issues/23882
+const NO_EXPRESS_INSTRUMENTATION = [
+  'suites/sessions/crashed-session-aggregate/test.ts',
+  'suites/sessions/errored-session-aggregate/test.ts',
+  'suites/tracing/httpIntegration-streamed/test.ts',
+  'suites/tracing/ignoreSpans-streamed/attributes/test.ts',
+  'suites/tracing/ignoreSpans-streamed/children/test.ts',
+  'suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts',
+  'suites/tracing/ignoreSpans-streamed/segments/test.ts',
+  'suites/tracing/sampling-streamed/test.ts',
+  'suites/tracing/traceid-recycling-with-spans/test.ts',
+];
+
+export const NODE_SUITES_EXCLUDE = [
+  '**/node_modules/**',
+  ...NODE_ONLY,
+  ...NO_OUTGOING_HTTP_INSTRUMENTATION,
+  ...NO_AUTO_INSTRUMENTATION,
+  ...NOT_TRIAGED,
+];
+
+// Excluded only in the `node-suites` project, which runs the suites with `@sentry/node`.
+export const SENTRY_NODE_EXCLUDE = [...NO_HTTP_SERVER_SPANS, ...NO_FETCH_INSTRUMENTATION];
+
+// Excluded only in the `node-suites-sentry-bun` project, which maps `@sentry/node` to `@sentry/bun`.
+export const SENTRY_BUN_EXCLUDE = [
+  ...HTTP_SERVER_OPTIONS_IGNORED,
+  ...NO_EXPRESS_INSTRUMENTATION,
+  ...NO_NATIVE_NODE_FETCH_INTEGRATION,
+  ...FETCH_INTEGRATION_DIFFERS,
+];
diff --git a/dev-packages/bun-integration-tests/package.json b/dev-packages/bun-integration-tests/package.json
index 1844f06177cb..6c6895e774bd 100644
--- a/dev-packages/bun-integration-tests/package.json
+++ b/dev-packages/bun-integration-tests/package.json
@@ -21,6 +21,7 @@
     "pg": "8.16.0"
   },
   "devDependencies": {
+    "@sentry-internal/node-integration-tests": "11.0.0",
     "@sentry-internal/test-utils": "11.0.0",
     "bun-types": "^1.2.9",
     "vitest": "^3.2.7"
diff --git a/dev-packages/bun-integration-tests/runner.ts b/dev-packages/bun-integration-tests/runner.ts
deleted file mode 100644
index 51f9e4e7fa60..000000000000
--- a/dev-packages/bun-integration-tests/runner.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-import type { Envelope, EnvelopeItemType } from '@sentry/core';
-import { normalize } from '@sentry/core';
-import { createBasicSentryServer } from '@sentry-internal/test-utils';
-import { spawn } from 'child_process';
-import { existsSync, statSync } from 'fs';
-import { join } from 'path';
-import { inspect } from 'util';
-import { expect } from 'vitest';
-
-const CLEANUP_STEPS = new Set<() => void>();
-
-export function cleanupChildProcesses(): void {
-  for (const step of CLEANUP_STEPS) {
-    step();
-  }
-  CLEANUP_STEPS.clear();
-}
-
-process.on('exit', cleanupChildProcesses);
-
-function deferredPromise<T = void>(
-  done?: () => void,
-): { resolve: (val: T) => void; reject: (reason?: unknown) => void; promise: Promise<T> } {
-  let resolve;
-  let reject;
-  const promise = new Promise<T>((res, rej) => {
-    resolve = (val: T) => {
-      res(val);
-    };
-    reject = (reason: Error) => {
-      rej(reason);
-    };
-  });
-  if (!resolve || !reject) {
-    throw new Error('Failed to create deferred promise');
-  }
-  return {
-    resolve,
-    reject,
-    promise: promise.finally(() => done?.()),
-  };
-}
-
-type Expected = Envelope | ((envelope: Envelope) => void);
-
-type StartResult = {
-  completed(): Promise<void>;
-  makeRequest<T>(
-    method: 'get' | 'post',
-    path: string,
-    options?: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean },
-  ): Promise<T | undefined>;
-};
-
-/** Creates a test runner that spawns a Bun child process */
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export function createRunner(...paths: string[]) {
-  const testPath = join(...paths);
-
-  let unordered = false;
-
-  if (!existsSync(testPath)) {
-    throw new Error(`Test scenario not found: ${testPath}`);
-  }
-
-  const entryFile = statSync(testPath).isDirectory() ? join(testPath, 'index.ts') : testPath;
-
-  const expectedEnvelopes: Expected[] = [];
-  const ignored: Set<EnvelopeItemType> = new Set(['session', 'sessions', 'client_report']);
-  const envVars: Record<string, string> = {};
-
-  return {
-    withEnv: function (env: Record<string, string>) {
-      Object.assign(envVars, env);
-      return this;
-    },
-    expect: function (expected: Expected) {
-      expectedEnvelopes.push(expected);
-      return this;
-    },
-    expectN: function (n: number, expected: Expected) {
-      for (let i = 0; i < n; i++) {
-        expectedEnvelopes.push(expected);
-      }
-      return this;
-    },
-    unordered: function () {
-      unordered = true;
-      return this;
-    },
-    ignore: function (...types: EnvelopeItemType[]) {
-      types.forEach(t => ignored.add(t));
-      return this;
-    },
-    unignore: function (...types: EnvelopeItemType[]) {
-      for (const t of types) {
-        ignored.delete(t);
-      }
-      return this;
-    },
-    start: function (signal?: AbortSignal): StartResult {
-      const { resolve, reject, promise: isComplete } = deferredPromise(cleanupChildProcesses);
-      const expectedEnvelopeCount = expectedEnvelopes.length;
-
-      let envelopeCount = 0;
-      const { resolve: setServerPort, promise: serverPortPromise } = deferredPromise<number>();
-      let child: ReturnType<typeof spawn> | undefined;
-
-      function expectCallbackCalled(): void {
-        envelopeCount++;
-        if (envelopeCount === expectedEnvelopeCount) {
-          resolve();
-        }
-      }
-
-      function assertEnvelopeMatches(expected: Expected, envelope: Envelope): void {
-        if (typeof expected === 'function') {
-          expected(envelope);
-        } else {
-          expect(envelope).toEqual(expected);
-        }
-      }
-
-      function newEnvelope(envelope: Envelope): void {
-        if (process.env.DEBUG) log('newEnvelope', inspect(envelope, false, null, true));
-
-        const envelopeItemType = envelope[1][0][0].type;
-
-        if (ignored.has(envelopeItemType)) {
-          return;
-        }
-
-        try {
-          if (unordered) {
-            const matchIndex = expectedEnvelopes.findIndex(candidate => {
-              try {
-                assertEnvelopeMatches(candidate, envelope);
-                return true;
-              } catch {
-                return false;
-              }
-            });
-
-            if (matchIndex < 0) {
-              return;
-            }
-
-            expectedEnvelopes.splice(matchIndex, 1);
-          } else {
-            const expected = expectedEnvelopes.shift();
-
-            if (!expected) {
-              return;
-            }
-
-            assertEnvelopeMatches(expected, envelope);
-          }
-
-          expectCallbackCalled();
-        } catch (e) {
-          reject(e);
-        }
-      }
-
-      createBasicSentryServer(newEnvelope)
-        .then(([mockServerPort, mockServerClose]) => {
-          if (mockServerClose) {
-            CLEANUP_STEPS.add(() => {
-              mockServerClose();
-            });
-          }
-
-          if (process.env.DEBUG) log('Starting scenario', testPath);
-
-          if (!existsSync(entryFile)) {
-            reject(new Error(`Entry file not found: ${entryFile}`));
-            return;
-          }
-
-          const stdio: ('inherit' | 'ipc' | 'ignore' | 'pipe')[] = process.env.DEBUG
-            ? ['inherit', 'inherit', 'inherit', 'ipc']
-            : ['ignore', 'pipe', 'pipe', 'ipc'];
-
-          child = spawn('bun', ['run', entryFile], {
-            stdio,
-            signal,
-            env: {
-              ...process.env,
-              SENTRY_DSN: `http://public@localhost:${mockServerPort}/1337`,
-              ...envVars,
-            },
-          });
-
-          CLEANUP_STEPS.add(() => {
-            child?.kill();
-          });
-
-          child.on('error', e => {
-            // eslint-disable-next-line no-console
-            console.error('Error starting Bun child process:', e);
-            reject(e);
-          });
-
-          if (!process.env.DEBUG && child.stderr) {
-            let stderrData = '';
-            child.stderr.on('data', (chunk: Buffer) => {
-              stderrData += chunk.toString();
-            });
-            child.on('exit', code => {
-              if (code !== 0 && code !== null && stderrData) {
-                // eslint-disable-next-line no-console
-                console.error('Bun process stderr:', stderrData);
-              }
-            });
-          }
-
-          child.on('message', (message: string) => {
-            const msg = JSON.parse(message) as { event: string; port?: number };
-            if (msg.event === 'READY' && typeof msg.port === 'number') {
-              if (process.env.DEBUG) log('Bun server ready on port', msg.port);
-              setServerPort(msg.port);
-            }
-          });
-        })
-        .catch(e => reject(e));
-
-      return {
-        completed: async function (): Promise<void> {
-          return isComplete;
-        },
-        makeRequest: async function <T>(
-          method: 'get' | 'post',
-          path: string,
-          options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
-        ): Promise<T | undefined> {
-          const url = `http://localhost:${await serverPortPromise}${path}`;
-          const body = options.data;
-          const headers = options.headers || {};
-          const expectError = options.expectError || false;
-
-          if (process.env.DEBUG) log('making request', method, url, headers, body);
-
-          try {
-            const init: RequestInit = { headers, method, body };
-            const res = await fetch(url, init);
-
-            if (!res.ok) {
-              if (!expectError) {
-                reject(new Error(`Expected request to "${path}" to succeed, but got a ${res.status} response`));
-              }
-
-              return;
-            }
-
-            if (expectError) {
-              reject(new Error(`Expected request to "${path}" to fail, but got a ${res.status} response`));
-              return;
-            }
-
-            if (res.headers.get('content-type')?.includes('application/json')) {
-              return await res.json();
-            }
-
-            return (await res.text()) as T;
-          } catch (e) {
-            if (expectError) {
-              return;
-            }
-
-            reject(e);
-            return;
-          }
-        },
-      };
-    },
-  };
-}
-
-function log(...args: unknown[]): void {
-  // eslint-disable-next-line no-console
-  console.log(...args.map(arg => normalize(arg)));
-}
diff --git a/dev-packages/bun-integration-tests/suites/basic/index.ts b/dev-packages/bun-integration-tests/suites/basic/index.ts
index c760e61d6ba5..4d0e7a6cb9b3 100644
--- a/dev-packages/bun-integration-tests/suites/basic/index.ts
+++ b/dev-packages/bun-integration-tests/suites/basic/index.ts
@@ -1,3 +1,4 @@
+import { sendPortToRunner } from '@sentry-internal/node-integration-tests';
 import * as Sentry from '@sentry/bun';
 
 Sentry.init({
@@ -14,11 +15,6 @@ const server = Bun.serve({
       throw new Error('This is a test error from the Bun integration tests');
     }
 
-    if (url.pathname === '/message') {
-      Sentry.captureMessage('Hello from Bun');
-      return new Response('OK');
-    }
-
     return new Response('Hello from Bun!');
   },
   error(_err) {
@@ -26,4 +22,4 @@ const server = Bun.serve({
   },
 });
 
-process.send?.(JSON.stringify({ event: 'READY', port: server.port }));
+sendPortToRunner(server.port!);
diff --git a/dev-packages/bun-integration-tests/suites/basic/test.ts b/dev-packages/bun-integration-tests/suites/basic/test.ts
index 9a9da240e373..68a30794ce70 100644
--- a/dev-packages/bun-integration-tests/suites/basic/test.ts
+++ b/dev-packages/bun-integration-tests/suites/basic/test.ts
@@ -1,54 +1,69 @@
-import { expect, it } from 'vitest';
-import { eventEnvelope } from '../../expect';
-import { createRunner } from '../../runner';
+import { SDK_VERSION } from '@sentry/core';
+import { afterAll, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
-it('captures an error thrown in Bun.serve fetch handler', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(
-      eventEnvelope(
-        {
-          level: 'error',
-          exception: {
-            values: [
-              {
-                type: 'Error',
-                value: 'This is a test error from the Bun integration tests',
-                stacktrace: {
-                  frames: expect.any(Array),
-                },
-                mechanism: { type: 'auto.http.bun.serve', handled: false },
+afterAll(() => {
+  cleanupChildProcesses();
+});
+
+test('captures an error thrown in Bun.serve fetch handler', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .ignore('span')
+    .expect({
+      event: {
+        level: 'error',
+        platform: 'node',
+        exception: {
+          values: [
+            {
+              type: 'Error',
+              value: 'This is a test error from the Bun integration tests',
+              stacktrace: {
+                frames: expect.any(Array),
               },
-            ],
-          },
-          request: expect.objectContaining({
-            method: 'GET',
-            url: expect.stringContaining('/error'),
-          }),
+              mechanism: { type: 'auto.http.bun.serve', handled: false },
+            },
+          ],
         },
-        { includeSampleRand: true, includeTransaction: false },
-      ),
-    )
-    .ignore('span')
-    .start(signal);
+        request: expect.objectContaining({
+          method: 'GET',
+          url: expect.stringContaining('/error'),
+        }),
+        sdk: expect.objectContaining({
+          name: 'sentry.javascript.bun',
+          packages: [{ name: 'npm:@sentry/bun', version: SDK_VERSION }],
+        }),
+        contexts: expect.objectContaining({
+          runtime: { name: 'bun', version: expect.any(String) },
+        }),
+      },
+    })
+    .start();
+
   await runner.makeRequest('get', '/error', { expectError: true });
   await runner.completed();
 });
 
-it('captures a manually sent message', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const [, envelopeItems] = envelope;
-      const [itemHeader, itemPayload] = envelopeItems[0];
-
-      expect(itemHeader.type).toBe('event');
-
-      expect(itemPayload).toMatchObject({
-        level: 'info',
-        message: 'Hello from Bun',
-      });
-    })
+test('sends the error with a sampled trace envelope header', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
     .ignore('span')
-    .start(signal);
-  await runner.makeRequest('get', '/message');
+    .expectHeader({
+      event: {
+        sdk: { name: 'sentry.javascript.bun', version: SDK_VERSION },
+        trace: expect.objectContaining({
+          environment: 'production',
+          public_key: 'public',
+          trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+          sample_rate: '1',
+          sampled: 'true',
+          sample_rand: expect.stringMatching(/^[01](\.\d+)?$/),
+        }),
+      },
+    })
+    .start();
+
+  await runner.makeRequest('get', '/error', { expectError: true });
   await runner.completed();
 });
diff --git a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario-all.ts b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario-all.ts
similarity index 81%
rename from dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario-all.ts
rename to dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario-all.ts
index b7883f63e146..6fcc7d11fac5 100644
--- a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario-all.ts
+++ b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario-all.ts
@@ -1,5 +1,4 @@
-import * as Sentry from '@sentry/node';
-import { bunRuntimeMetricsIntegration } from '@sentry/bun';
+import * as Sentry from '@sentry/bun';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
@@ -9,7 +8,7 @@ Sentry.init({
   environment: 'test',
   transport: loggingTransport,
   integrations: [
-    bunRuntimeMetricsIntegration({
+    Sentry.bunRuntimeMetricsIntegration({
       collectionIntervalMs: 1000,
       collect: {
         cpuTime: true,
diff --git a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario-opt-out.ts b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario-opt-out.ts
similarity index 83%
rename from dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario-opt-out.ts
rename to dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario-opt-out.ts
index 8e862bfd5db3..47b9e22fafcd 100644
--- a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario-opt-out.ts
+++ b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario-opt-out.ts
@@ -1,5 +1,4 @@
-import * as Sentry from '@sentry/node';
-import { bunRuntimeMetricsIntegration } from '@sentry/bun';
+import * as Sentry from '@sentry/bun';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
@@ -9,7 +8,7 @@ Sentry.init({
   environment: 'test',
   transport: loggingTransport,
   integrations: [
-    bunRuntimeMetricsIntegration({
+    Sentry.bunRuntimeMetricsIntegration({
       collectionIntervalMs: 1000,
       collect: {
         cpuUtilization: false,
diff --git a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario.ts b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario.ts
similarity index 79%
rename from dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario.ts
rename to dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario.ts
index d8dd283bde49..7f4ee4d4dcf1 100644
--- a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/scenario.ts
+++ b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/scenario.ts
@@ -1,5 +1,4 @@
-import * as Sentry from '@sentry/node';
-import { bunRuntimeMetricsIntegration } from '@sentry/bun';
+import * as Sentry from '@sentry/bun';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
@@ -9,7 +8,7 @@ Sentry.init({
   environment: 'test',
   transport: loggingTransport,
   integrations: [
-    bunRuntimeMetricsIntegration({
+    Sentry.bunRuntimeMetricsIntegration({
       collectionIntervalMs: 1000,
     }),
   ],
diff --git a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/test.ts b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/test.ts
similarity index 95%
rename from dev-packages/node-integration-tests/suites/bun-runtime-metrics/test.ts
rename to dev-packages/bun-integration-tests/suites/bun-runtime-metrics/test.ts
index 78638b8b02cb..8ff4c916244c 100644
--- a/dev-packages/node-integration-tests/suites/bun-runtime-metrics/test.ts
+++ b/dev-packages/bun-integration-tests/suites/bun-runtime-metrics/test.ts
@@ -1,10 +1,10 @@
 import { afterAll, describe, expect, test } from 'vitest';
-import { cleanupChildProcesses, createRunner } from '../../utils/runner';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
 const SENTRY_ATTRIBUTES = {
   'sentry.release': { value: '1.0.0', type: 'string' },
   'sentry.environment': { value: 'test', type: 'string' },
-  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+  'sentry.sdk.name': { value: 'sentry.javascript.bun', type: 'string' },
   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
   'sentry.origin': { value: 'auto.bun.runtime_metrics', type: 'string' },
 };
diff --git a/dev-packages/bun-integration-tests/suites/cjs/index.cjs b/dev-packages/bun-integration-tests/suites/cjs/index.cjs
index d21203678e20..6efe24b8b7ad 100644
--- a/dev-packages/bun-integration-tests/suites/cjs/index.cjs
+++ b/dev-packages/bun-integration-tests/suites/cjs/index.cjs
@@ -1,4 +1,5 @@
 const Sentry = require('@sentry/bun');
+const { sendPortToRunner } = require('@sentry-internal/node-integration-tests');
 
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
@@ -15,4 +16,4 @@ const server = Bun.serve({
   },
 });
 
-process.send?.(JSON.stringify({ event: 'READY', port: server.port }));
+sendPortToRunner(server.port);
diff --git a/dev-packages/bun-integration-tests/suites/cjs/test.ts b/dev-packages/bun-integration-tests/suites/cjs/test.ts
index e70f0ddb8971..1523c4fd104c 100644
--- a/dev-packages/bun-integration-tests/suites/cjs/test.ts
+++ b/dev-packages/bun-integration-tests/suites/cjs/test.ts
@@ -1,35 +1,38 @@
-import { expect, it } from 'vitest';
-import { eventEnvelope } from '../../expect';
-import { createRunner } from '../../runner';
+import { afterAll, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
-it('initializes when @sentry/bun is loaded with require()', async ({ signal }) => {
+afterAll(() => {
+  cleanupChildProcesses();
+});
+
+test('initializes when @sentry/bun is loaded with require()', async () => {
   const runner = createRunner(__dirname, 'index.cjs')
-    .expect(
-      eventEnvelope(
-        {
-          level: 'error',
-          exception: {
-            values: [
-              {
-                type: 'Error',
-                value: 'This is a test error from a CommonJS Bun app',
-                stacktrace: {
-                  frames: expect.any(Array),
-                },
-                mechanism: { type: 'auto.http.bun.serve', handled: false },
+    .withMockSentryServer()
+    .ignore('span')
+    .expect({
+      event: {
+        level: 'error',
+        exception: {
+          values: [
+            {
+              type: 'Error',
+              value: 'This is a test error from a CommonJS Bun app',
+              stacktrace: {
+                frames: expect.any(Array),
               },
-            ],
-          },
-          request: expect.objectContaining({
-            method: 'GET',
-            url: expect.stringContaining('/error'),
-          }),
+              mechanism: { type: 'auto.http.bun.serve', handled: false },
+            },
+          ],
         },
-        { includeSampleRand: true, includeTransaction: false },
-      ),
-    )
-    .ignore('span')
-    .start(signal);
+        request: expect.objectContaining({
+          method: 'GET',
+          url: expect.stringContaining('/error'),
+        }),
+        sdk: expect.objectContaining({ name: 'sentry.javascript.bun' }),
+      },
+    })
+    .start();
+
   await runner.makeRequest('get', '/error', { expectError: true });
   await runner.completed();
 });
diff --git a/dev-packages/bun-integration-tests/suites/fetch/index.ts b/dev-packages/bun-integration-tests/suites/fetch/index.ts
index f378ee6c786d..ede289da0818 100644
--- a/dev-packages/bun-integration-tests/suites/fetch/index.ts
+++ b/dev-packages/bun-integration-tests/suites/fetch/index.ts
@@ -1,3 +1,4 @@
+import { sendPortToRunner } from '@sentry-internal/node-integration-tests';
 import * as Sentry from '@sentry/bun';
 
 // The target server the instrumented app makes outgoing fetch requests to. It
@@ -48,4 +49,4 @@ const server = Bun.serve({
   },
 });
 
-process.send?.(JSON.stringify({ event: 'READY', port: server.port }));
+sendPortToRunner(server.port!);
diff --git a/dev-packages/bun-integration-tests/suites/fetch/test.ts b/dev-packages/bun-integration-tests/suites/fetch/test.ts
index e503f78519a5..53bc4ac9e841 100644
--- a/dev-packages/bun-integration-tests/suites/fetch/test.ts
+++ b/dev-packages/bun-integration-tests/suites/fetch/test.ts
@@ -1,49 +1,48 @@
-import type { Envelope, Event, SerializedStreamedSpan, SerializedStreamedSpanContainer } from '@sentry/core';
-import { expect, it } from 'vitest';
-import { createRunner } from '../../runner';
+import { afterAll, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
-function getSpans(envelope: Envelope): SerializedStreamedSpan[] {
-  return (envelope[1][0][1] as SerializedStreamedSpanContainer).items;
-}
-
-it('creates an http.client span for outgoing fetch requests', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const spans = getSpans(envelope);
-
-      const segmentSpan = spans.find(span => span.is_segment);
-      expect(segmentSpan).toMatchObject({
-        // `Bun.serve` without `routes` has no parameterized route, so the streamed segment is
-        // named after the method only; the path lives in `url.path`.
-        name: 'GET',
-        attributes: expect.objectContaining({
-          'sentry.op': { value: 'http.server', type: 'string' },
-          'url.path': { value: '/outgoing-fetch', type: 'string' },
-        }),
-      });
-
-      const httpClientSpan = spans.find(span => span.attributes['sentry.op']?.value === 'http.client');
+afterAll(() => {
+  cleanupChildProcesses();
+});
 
-      expect(httpClientSpan).toBeDefined();
-      expect(httpClientSpan).toMatchObject({
-        name: 'GET localhost',
-        parent_span_id: segmentSpan!.span_id,
-        attributes: expect.objectContaining({
-          'sentry.op': { value: 'http.client', type: 'string' },
-          'sentry.origin': { value: 'auto.http.fetch', type: 'string' },
-          'http.request.method': { value: 'GET', type: 'string' },
-          type: { value: 'fetch', type: 'string' },
-        }),
-      });
+test('creates an http.client span for outgoing fetch requests', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .expect({
+      span: container => {
+        const segmentSpan = container.items.find(span => span.is_segment);
+        expect(segmentSpan).toMatchObject({
+          // `Bun.serve` without `routes` has no parameterized route, so the streamed segment is
+          // named after the method only; the path lives in `url.path`.
+          name: 'GET',
+          attributes: expect.objectContaining({
+            'sentry.op': { value: 'http.server', type: 'string' },
+            'url.path': { value: '/outgoing-fetch', type: 'string' },
+          }),
+        });
+
+        const httpClientSpan = container.items.find(span => span.attributes['sentry.op']?.value === 'http.client');
+
+        expect(httpClientSpan).toMatchObject({
+          name: 'GET localhost',
+          parent_span_id: segmentSpan!.span_id,
+          attributes: expect.objectContaining({
+            'sentry.op': { value: 'http.client', type: 'string' },
+            'sentry.origin': { value: 'auto.http.fetch', type: 'string' },
+            'http.request.method': { value: 'GET', type: 'string' },
+            type: { value: 'fetch', type: 'string' },
+          }),
+        });
+      },
     })
-    .start(signal);
+    .start();
 
   await runner.makeRequest('get', '/outgoing-fetch');
   await runner.completed();
 });
 
-it('propagates sentry-trace and baggage headers to allowed outgoing fetch requests', async ({ signal }) => {
-  const runner = createRunner(__dirname).start(signal);
+test('propagates sentry-trace and baggage headers to allowed outgoing fetch requests', async () => {
+  const runner = createRunner(__dirname, 'index.ts').withMockSentryServer().start();
 
   const response = await runner.makeRequest<{ headers: Record<string, string> }>('get', '/outgoing-fetch');
 
@@ -54,40 +53,40 @@ it('propagates sentry-trace and baggage headers to allowed outgoing fetch reques
   expect(response?.headers.baggage).toContain(`sentry-trace_id=${traceId}`);
 });
 
-it('does not propagate headers to outgoing fetch requests outside tracePropagationTargets', async ({ signal }) => {
-  const runner = createRunner(__dirname).start(signal);
+test('does not propagate headers to outgoing fetch requests outside tracePropagationTargets', async () => {
+  const runner = createRunner(__dirname, 'index.ts').withMockSentryServer().start();
 
   const response = await runner.makeRequest<{ headers: Record<string, string> }>('get', '/outgoing-fetch-disallowed');
 
+  expect(response?.headers).toBeDefined();
   expect(response?.headers['sentry-trace']).toBeUndefined();
   expect(response?.headers.baggage).toBeUndefined();
 });
 
-it('records a breadcrumb for outgoing fetch requests', async ({ signal }) => {
+test('records a breadcrumb for outgoing fetch requests', async () => {
   // Streamed spans carry no breadcrumbs, so the breadcrumb is asserted on an error
   // captured right after the fetch instead.
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const [, envelopeItems] = envelope;
-      const [itemHeader, event] = envelopeItems[0] as [{ type: string }, Event];
-
-      expect(itemHeader.type).toBe('event');
-      expect(event.exception?.values?.[0]?.value).toBe('fetch done');
-
-      expect(event.breadcrumbs).toContainEqual(
-        expect.objectContaining({
-          category: 'fetch',
-          type: 'http',
-          data: expect.objectContaining({
-            method: 'GET',
-            status_code: 200,
-            url: expect.stringMatching(/\/allowed$/),
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .ignore('span')
+    .expect({
+      event: event => {
+        expect(event.exception?.values?.[0]?.value).toBe('fetch done');
+
+        expect(event.breadcrumbs).toContainEqual(
+          expect.objectContaining({
+            category: 'fetch',
+            type: 'http',
+            data: expect.objectContaining({
+              method: 'GET',
+              status_code: 200,
+              url: expect.stringMatching(/\/allowed$/),
+            }),
           }),
-        }),
-      );
+        );
+      },
     })
-    .ignore('span')
-    .start(signal);
+    .start();
 
   await runner.makeRequest('get', '/outgoing-fetch-error');
   await runner.completed();
diff --git a/dev-packages/bun-integration-tests/suites/hono-sdk/index.ts b/dev-packages/bun-integration-tests/suites/hono-sdk/index.ts
index 075fc896618b..d45505e479cf 100644
--- a/dev-packages/bun-integration-tests/suites/hono-sdk/index.ts
+++ b/dev-packages/bun-integration-tests/suites/hono-sdk/index.ts
@@ -1,5 +1,6 @@
 import { sentry } from '@sentry/hono/bun';
 import { Hono } from 'hono';
+import { sendPortToRunner } from '@sentry-internal/node-integration-tests';
 
 const app = new Hono();
 
@@ -28,4 +29,4 @@ const server = Bun.serve({
   fetch: app.fetch,
 });
 
-process.send?.(JSON.stringify({ event: 'READY', port: server.port }));
+sendPortToRunner(server.port!);
diff --git a/dev-packages/bun-integration-tests/suites/hono-sdk/test.ts b/dev-packages/bun-integration-tests/suites/hono-sdk/test.ts
index 785cffb85589..7b9dbb0a1d6a 100644
--- a/dev-packages/bun-integration-tests/suites/hono-sdk/test.ts
+++ b/dev-packages/bun-integration-tests/suites/hono-sdk/test.ts
@@ -1,110 +1,139 @@
-import type { SerializedStreamedSpanContainer } from '@sentry/core';
-import { expect, it } from 'vitest';
-import { eventEnvelope, SHORT_UUID_MATCHER, UUID_MATCHER } from '../../expect';
-import { createRunner } from '../../runner';
+import { SDK_VERSION } from '@sentry/core';
+import { afterAll, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
-it('Hono app captures parametrized errors (Hono SDK on Bun)', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const [, envelopeItems] = envelope;
-      const [itemHeader, itemPayload] = envelopeItems[0];
-
-      expect(itemHeader.type).toBe('span');
+afterAll(() => {
+  cleanupChildProcesses();
+});
 
-      const segmentSpan = (itemPayload as SerializedStreamedSpanContainer).items.find(span => span.is_segment);
+test('Hono app captures parametrized errors (Hono SDK on Bun)', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .unordered()
+    .expect({
+      span: container => {
+        const segmentSpan = container.items.find(span => span.is_segment);
 
-      expect(segmentSpan).toMatchObject({
-        name: 'GET /error/:param',
-        is_segment: true,
-        span_id: expect.any(String),
-        trace_id: expect.any(String),
-        status: 'error',
-        attributes: expect.objectContaining({
-          'sentry.op': { value: 'http.server', type: 'string' },
-          'sentry.origin': { value: 'auto.http.bun.serve', type: 'string' },
-          'sentry.segment.name.source': { value: 'route', type: 'string' },
-          'http.route': { value: '/error/:param', type: 'string' },
-          'http.request.method': { value: 'GET', type: 'string' },
-          'http.response.status_code': { value: 500, type: 'integer' },
-          'url.path': { value: '/error/param-123', type: 'string' },
-        }),
-      });
+        expect(segmentSpan).toMatchObject({
+          name: 'GET /error/:param',
+          is_segment: true,
+          span_id: expect.any(String),
+          trace_id: expect.any(String),
+          status: 'error',
+          attributes: expect.objectContaining({
+            'sentry.op': { value: 'http.server', type: 'string' },
+            'sentry.origin': { value: 'auto.http.bun.serve', type: 'string' },
+            'sentry.segment.name.source': { value: 'route', type: 'string' },
+            'http.route': { value: '/error/:param', type: 'string' },
+            'http.request.method': { value: 'GET', type: 'string' },
+            'http.response.status_code': { value: 500, type: 'integer' },
+            'url.path': { value: '/error/param-123', type: 'string' },
+          }),
+        });
+      },
     })
-
-    .expect(
-      eventEnvelope(
-        {
-          level: 'error',
-          transaction: 'GET /error/:param',
-          exception: {
-            values: [
-              {
-                type: 'Error',
-                value: 'Test error from Hono app',
-                stacktrace: {
-                  frames: expect.any(Array),
-                },
-                mechanism: { type: 'auto.http.hono.context_error', handled: false },
-              },
-            ],
-          },
-          request: {
-            cookies: {},
-            headers: expect.any(Object),
-            method: 'GET',
-            url: expect.stringContaining('/error/param-123'),
-          },
-          user: { ip_address: expect.any(String) },
-          breadcrumbs: [
+    .expect({
+      event: {
+        level: 'error',
+        transaction: 'GET /error/:param',
+        exception: {
+          values: [
             {
-              timestamp: expect.any(Number),
-              category: 'console',
-              level: 'error',
-              message: 'Error: Test error from Hono app',
-              data: expect.objectContaining({
-                logger: 'console',
-                arguments: [{ message: 'Test error from Hono app', name: 'Error', stack: expect.any(String) }],
-              }),
+              type: 'Error',
+              value: 'Test error from Hono app',
+              stacktrace: {
+                frames: expect.any(Array),
+              },
+              mechanism: { type: 'auto.http.hono.context_error', handled: false },
             },
           ],
         },
-        { sdk: 'hono', includeSampleRand: true, includeTransaction: true },
-      ),
-    )
-    .unordered()
-    .start(signal);
+        request: {
+          cookies: {},
+          headers: expect.any(Object),
+          method: 'GET',
+          url: expect.stringContaining('/error/param-123'),
+        },
+        user: { ip_address: expect.any(String) },
+        // The runner reads the server port from a `console.log`, which adds a console breadcrumb too.
+        breadcrumbs: expect.arrayContaining([
+          {
+            timestamp: expect.any(Number),
+            category: 'console',
+            level: 'error',
+            message: 'Error: Test error from Hono app',
+            data: expect.objectContaining({
+              logger: 'console',
+              arguments: [{ message: 'Test error from Hono app', name: 'Error', stack: expect.any(String) }],
+            }),
+          },
+        ]),
+        sdk: expect.objectContaining({
+          name: 'sentry.javascript.hono',
+          packages: [
+            { name: 'npm:@sentry/hono', version: SDK_VERSION },
+            { name: 'npm:@sentry/bun', version: SDK_VERSION },
+          ],
+        }),
+        contexts: expect.objectContaining({
+          runtime: { name: 'bun', version: expect.any(String) },
+        }),
+      },
+    })
+    .start();
 
   await runner.makeRequest('get', '/error/param-123', { expectError: true });
   await runner.completed();
 });
 
-it('Hono app captures parametrized route names on Bun', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const [, envelopeItems] = envelope;
-      const [itemHeader, itemPayload] = envelopeItems[0];
+test('sends the Hono error with the transaction name in the trace envelope header', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .ignore('span')
+    .expectHeader({
+      event: {
+        sdk: { name: 'sentry.javascript.hono', version: SDK_VERSION },
+        trace: expect.objectContaining({
+          environment: 'production',
+          public_key: 'public',
+          trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+          sampled: 'true',
+          sample_rand: expect.stringMatching(/^[01](\.\d+)?$/),
+          transaction: 'GET /error/:param',
+        }),
+      },
+    })
+    .start();
 
-      expect(itemHeader.type).toBe('span');
+  await runner.makeRequest('get', '/error/param-123', { expectError: true });
+  await runner.completed();
+});
 
-      const segmentSpan = (itemPayload as SerializedStreamedSpanContainer).items.find(span => span.is_segment);
+test('Hono app captures parametrized route names on Bun', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .expect({
+      span: container => {
+        const segmentSpan = container.items.find(span => span.is_segment);
 
-      expect(segmentSpan).toMatchObject({
-        name: 'GET /hello/:name',
-        is_segment: true,
-        span_id: SHORT_UUID_MATCHER,
-        trace_id: UUID_MATCHER,
-        status: 'ok',
-        attributes: expect.objectContaining({
-          'sentry.op': { value: 'http.server', type: 'string' },
-          'sentry.origin': { value: 'auto.http.bun.serve', type: 'string' },
-          'sentry.segment.name.source': { value: 'route', type: 'string' },
-          'http.route': { value: '/hello/:name', type: 'string' },
-          'http.request.method': { value: 'GET', type: 'string' },
-          'url.path': { value: '/hello/world', type: 'string' },
-        }),
-      });
+        expect(segmentSpan).toMatchObject({
+          name: 'GET /hello/:name',
+          is_segment: true,
+          span_id: expect.stringMatching(/^[\da-f]{16}$/),
+          trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+          status: 'ok',
+          attributes: expect.objectContaining({
+            'sentry.op': { value: 'http.server', type: 'string' },
+            'sentry.origin': { value: 'auto.http.bun.serve', type: 'string' },
+            'sentry.segment.name.source': { value: 'route', type: 'string' },
+            'http.route': { value: '/hello/:name', type: 'string' },
+            'http.request.method': { value: 'GET', type: 'string' },
+            'url.path': { value: '/hello/world', type: 'string' },
+          }),
+        });
+      },
     })
-    .start(signal);
+    .start();
 
   await runner.makeRequest('get', '/hello/world');
   await runner.completed();
diff --git a/dev-packages/bun-integration-tests/suites/is-localhost/index.ts b/dev-packages/bun-integration-tests/suites/is-localhost/index.ts
index 0f02bee605ee..5c323f972ffb 100644
--- a/dev-packages/bun-integration-tests/suites/is-localhost/index.ts
+++ b/dev-packages/bun-integration-tests/suites/is-localhost/index.ts
@@ -1,3 +1,4 @@
+import { sendPortToRunner } from '@sentry-internal/node-integration-tests';
 import * as Sentry from '@sentry/bun';
 
 Sentry.init({
@@ -15,4 +16,4 @@ const server = Bun.serve({
   },
 });
 
-process.send?.(JSON.stringify({ event: 'READY', port: server.port }));
+sendPortToRunner(server.port!);
diff --git a/dev-packages/bun-integration-tests/suites/is-localhost/test.ts b/dev-packages/bun-integration-tests/suites/is-localhost/test.ts
index 8250220b6891..2dfa918630ea 100644
--- a/dev-packages/bun-integration-tests/suites/is-localhost/test.ts
+++ b/dev-packages/bun-integration-tests/suites/is-localhost/test.ts
@@ -1,26 +1,26 @@
-import type { Envelope, SerializedStreamedSpan, SerializedStreamedSpanContainer } from '@sentry/core';
-import { expect, it } from 'vitest';
-import { createRunner } from '../../runner';
+import { afterAll, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
-function getSpans(envelope: Envelope): SerializedStreamedSpan[] {
-  return (envelope[1][0][1] as SerializedStreamedSpanContainer).items;
-}
+afterAll(() => {
+  cleanupChildProcesses();
+});
 
 // The runner always requests `http://localhost:<port>`, so only the `true` case is reachable here.
 // The `false` case is covered by the unit tests for `isLocalhostRequest`.
-it('sets sentry.is_localhost on every streamed span', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const spans = getSpans(envelope);
-
-      expect(spans.some(span => span.is_segment)).toBe(true);
-      expect(spans.some(span => span.name === 'child-span')).toBe(true);
+test('sets sentry.is_localhost on every streamed span', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .expect({
+      span: container => {
+        expect(container.items.some(span => span.is_segment)).toBe(true);
+        expect(container.items.some(span => span.name === 'child-span')).toBe(true);
 
-      for (const span of spans) {
-        expect(span.attributes['sentry.is_localhost']).toEqual({ value: true, type: 'boolean' });
-      }
+        for (const span of container.items) {
+          expect(span.attributes['sentry.is_localhost']).toEqual({ value: true, type: 'boolean' });
+        }
+      },
     })
-    .start(signal);
+    .start();
 
   await runner.makeRequest('get', '/');
   await runner.completed();
diff --git a/dev-packages/bun-integration-tests/suites/request-bodies/index.ts b/dev-packages/bun-integration-tests/suites/request-bodies/index.ts
index d3bf4d5417a5..dbd9ecfd5dd2 100644
--- a/dev-packages/bun-integration-tests/suites/request-bodies/index.ts
+++ b/dev-packages/bun-integration-tests/suites/request-bodies/index.ts
@@ -1,3 +1,4 @@
+import { sendPortToRunner } from '@sentry-internal/node-integration-tests';
 import * as Sentry from '@sentry/bun';
 
 // One scenario per process; the test picks the SDK setup through this variable.
@@ -32,4 +33,4 @@ const server = Bun.serve({
   },
 });
 
-process.send?.(JSON.stringify({ event: 'READY', port: server.port }));
+sendPortToRunner(server.port!);
diff --git a/dev-packages/bun-integration-tests/suites/request-bodies/test.ts b/dev-packages/bun-integration-tests/suites/request-bodies/test.ts
index da08cbc248c7..0134022d2b29 100644
--- a/dev-packages/bun-integration-tests/suites/request-bodies/test.ts
+++ b/dev-packages/bun-integration-tests/suites/request-bodies/test.ts
@@ -1,26 +1,25 @@
-import type { Envelope, TransactionEvent } from '@sentry/core';
-import { expect, it } from 'vitest';
-import { createRunner } from '../../runner';
+import { afterAll, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../node-integration-tests/utils/runner';
 
-function getTransaction(envelope: Envelope): TransactionEvent {
-  const [itemHeader, itemPayload] = envelope[1][0];
-  expect(itemHeader.type).toBe('transaction');
-  return itemPayload as TransactionEvent;
-}
+afterAll(() => {
+  cleanupChildProcesses();
+});
 
-it('captures incoming request bodies by default', async ({ signal }) => {
-  const runner = createRunner(__dirname)
-    .expect(envelope => {
-      const transaction = getTransaction(envelope);
-      expect(transaction.request).toMatchObject({
-        method: 'POST',
-        url: expect.stringContaining('/default'),
-        query_string: 'source=test',
-        headers: expect.objectContaining({ 'content-type': 'text/plain' }),
-        data: 'captured-by-default',
-      });
+test('captures incoming request bodies by default', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
+    .expect({
+      transaction: transaction => {
+        expect(transaction.request).toMatchObject({
+          method: 'POST',
+          url: expect.stringContaining('/default'),
+          query_string: 'source=test',
+          headers: expect.objectContaining({ 'content-type': 'text/plain' }),
+          data: 'captured-by-default',
+        });
+      },
     })
-    .start(signal);
+    .start();
 
   const response = await runner.makeRequest<string>('post', '/default?source=test', {
     headers: { 'content-type': 'text/plain' },
@@ -30,14 +29,16 @@ it('captures incoming request bodies by default', async ({ signal }) => {
   await runner.completed();
 });
 
-it('an explicit small size overrides disabled body collection', async ({ signal }) => {
-  const runner = createRunner(__dirname)
+test('an explicit small size overrides disabled body collection', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
     .withEnv({ BODY_MODE: 'explicit-small' })
-    .expect(envelope => {
-      const transaction = getTransaction(envelope);
-      expect(transaction.request?.data).toBe(`${'a'.repeat(997)}...`);
+    .expect({
+      transaction: transaction => {
+        expect(transaction.request?.data).toBe(`${'a'.repeat(997)}...`);
+      },
     })
-    .start(signal);
+    .start();
 
   const body = 'a'.repeat(1_001);
   const response = await runner.makeRequest<string>('post', '/explicit-small', {
@@ -48,15 +49,17 @@ it('an explicit small size overrides disabled body collection', async ({ signal
   await runner.completed();
 });
 
-it('an explicit none overrides enabled body collection', async ({ signal }) => {
-  const runner = createRunner(__dirname)
+test('an explicit none overrides enabled body collection', async () => {
+  const runner = createRunner(__dirname, 'index.ts')
+    .withMockSentryServer()
     .withEnv({ BODY_MODE: 'explicit-none' })
-    .expect(envelope => {
-      const transaction = getTransaction(envelope);
-      expect(transaction.request?.method).toBe('POST');
-      expect(transaction.request?.data).toBeUndefined();
+    .expect({
+      transaction: transaction => {
+        expect(transaction.request?.method).toBe('POST');
+        expect(transaction.request?.data).toBeUndefined();
+      },
     })
-    .start(signal);
+    .start();
 
   const response = await runner.makeRequest<string>('post', '/explicit-none', {
     headers: { 'content-type': 'text/plain' },
diff --git a/dev-packages/bun-integration-tests/tsconfig.json b/dev-packages/bun-integration-tests/tsconfig.json
index 8fe804d8c50d..ba0be38e72df 100644
--- a/dev-packages/bun-integration-tests/tsconfig.json
+++ b/dev-packages/bun-integration-tests/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.json",
 
-  "include": ["suites/**/*.ts", "*.ts"],
+  "include": ["suites/**/*.ts", "node-suites/**/*.ts", "*.ts"],
 
   "compilerOptions": {
     "lib": ["ES2020"],
diff --git a/dev-packages/bun-integration-tests/vite.config.mts b/dev-packages/bun-integration-tests/vite.config.mts
index 23ea00e8c30a..e2ed86d0affb 100644
--- a/dev-packages/bun-integration-tests/vite.config.mts
+++ b/dev-packages/bun-integration-tests/vite.config.mts
@@ -1,5 +1,20 @@
+import { fileURLToPath } from 'node:url';
 import { defineConfig } from 'vitest/config';
 import baseConfig from '../../vite/vite.config';
+import { NODE_SUITES_EXCLUDE, SENTRY_BUN_EXCLUDE, SENTRY_NODE_EXCLUDE } from './node-suites/excludes';
+
+const NODE_SUITES_ROOT = fileURLToPath(new URL('../node-integration-tests', import.meta.url));
+
+// All Node suites also run on Bun. The scenarios stay in `node-integration-tests`.
+const NODE_SUITES = ['suites/**/test.ts'];
+
+const nodeSuitesTest = {
+  root: NODE_SUITES_ROOT,
+  include: NODE_SUITES,
+  exclude: NODE_SUITES_EXCLUDE,
+  // Above the 30 second port timeout of the runner on Bun, so a slow start can still pass.
+  testTimeout: 45_000,
+};
 
 export default defineConfig({
   ...baseConfig,
@@ -9,7 +24,6 @@ export default defineConfig({
       enabled: false,
     },
     isolate: false,
-    include: ['./suites/**/test.ts'],
     testTimeout: 20_000,
     ...(process.env.DEBUG
       ? {
@@ -18,15 +32,56 @@ export default defineConfig({
         }
       : {}),
     pool: 'threads',
-    poolOptions: {
-      threads: {
-        singleThread: true,
-      },
-    },
     reporters: process.env.DEBUG
       ? ['default', { summary: false }]
       : process.env.GITHUB_ACTIONS
         ? ['dot', 'github-actions']
         : ['verbose'],
+    projects: [
+      {
+        extends: true,
+        test: {
+          name: 'bun',
+          include: ['./suites/**/test.ts'],
+          env: { RUNTIME: 'bun' },
+          // Above the 30 second port timeout of the runner on Bun, so a slow start can still pass.
+          testTimeout: 45_000,
+          poolOptions: {
+            threads: {
+              singleThread: true,
+            },
+          },
+        },
+      },
+      {
+        extends: true,
+        test: {
+          ...nodeSuitesTest,
+          name: 'node-suites',
+          exclude: [...NODE_SUITES_EXCLUDE, ...SENTRY_NODE_EXCLUDE],
+          env: { RUNTIME: 'bun' },
+        },
+      },
+      {
+        extends: true,
+        test: {
+          ...nodeSuitesTest,
+          name: 'node-suites-sentry-bun',
+          exclude: [
+            ...NODE_SUITES_EXCLUDE,
+            ...SENTRY_BUN_EXCLUDE,
+            // The scenario creates a `NodeClient` itself, which sends `sentry.javascript.node`.
+            'suites/public-api/logs/test.ts',
+            // `@sentry/bun` has `bunRuntimeMetricsIntegration` instead of `nodeRuntimeMetricsIntegration`.
+            'suites/node-runtime-metrics/test.ts',
+          ],
+          env: {
+            RUNTIME: 'bun',
+            RUNTIME_PRELOAD: fileURLToPath(new URL('./node-suites/alias-sentry-bun.ts', import.meta.url)),
+            EXPECTED_SDK_NAME: 'sentry.javascript.bun',
+          },
+        },
+      },
+    ],
   },
 });
diff --git a/dev-packages/bundler-plugin-integration-tests/fixtures/vite8/component-annotation-next.test.ts b/dev-packages/bundler-plugin-integration-tests/fixtures/vite8/component-annotation-next.test.ts
index ad52e996a9f5..41b172e14dd2 100644
--- a/dev-packages/bundler-plugin-integration-tests/fixtures/vite8/component-annotation-next.test.ts
+++ b/dev-packages/bundler-plugin-integration-tests/fixtures/vite8/component-annotation-next.test.ts
@@ -34,13 +34,13 @@ test(import.meta.url, ({ runBundler, readOutputFiles }) => {
     		"data-sentry-component": "App",
     		children: [/* @__PURE__ */ jsxDEV(ComponentA, {}, void 0, false, {
     			fileName: _jsxFileName,
-    			lineNumber: 4,
+    			lineNumber: 6,
     			columnNumber: 7
     		}, this), ";"]
     	}, void 0, true, {
     		fileName: _jsxFileName,
-    		lineNumber: 3,
-    		columnNumber: 10
+    		lineNumber: 5,
+    		columnNumber: 5
     	}, this);
     }
     console.log(App());
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 7a2ff9c21551..7dd5ab3cf5ac 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -33,7 +33,7 @@
     "@cloudflare/workers-types": "^4.20260426.0",
     "@cloudflare/workers-types-v5": "npm:@cloudflare/workers-types@5.20260710.1",
     "@sentry-internal/test-utils": "11.0.0",
-    "@sentry/conventions": "0.23.0",
+    "@sentry/conventions": "0.24.0",
     "eslint-plugin-regexp": "^3.1.0",
     "prisma": "6.15.0",
     "vite": "7.3.5",
diff --git a/dev-packages/cloudflare-integration-tests/suites/binding-connect/index.ts b/dev-packages/cloudflare-integration-tests/suites/binding-connect/index.ts
new file mode 100644
index 000000000000..cf28459187c5
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/binding-connect/index.ts
@@ -0,0 +1,44 @@
+import * as Sentry from '@sentry/cloudflare';
+import { DurableObject } from 'cloudflare:workers';
+
+interface Env {
+  SENTRY_DSN: string;
+  SELF: Fetcher;
+  CONNECT_DO: DurableObjectNamespace<ConnectDurableObject>;
+}
+
+export class ConnectDurableObject extends DurableObject<Env> {}
+
+function tryConnect(connect: () => Socket): string {
+  try {
+    const socket = connect();
+    socket.opened.catch(() => {});
+    socket.closed.catch(() => {});
+    return 'ok';
+  } catch (error) {
+    return (error as Error).message;
+  }
+}
+
+export default Sentry.withSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+  }),
+  {
+    async fetch(request, env) {
+      const url = new URL(request.url);
+
+      if (url.pathname === '/connect') {
+        const stub = env.CONNECT_DO.get(env.CONNECT_DO.idFromName('connect'));
+
+        return Response.json({
+          durableObject: tryConnect(() => stub.connect('127.0.0.1:9')),
+          service: tryConnect(() => env.SELF.connect('127.0.0.1:9')),
+        });
+      }
+
+      return new Response('not found', { status: 404 });
+    },
+  } satisfies ExportedHandler<Env>,
+);
diff --git a/dev-packages/cloudflare-integration-tests/suites/binding-connect/test.ts b/dev-packages/cloudflare-integration-tests/suites/binding-connect/test.ts
new file mode 100644
index 000000000000..defed12ded34
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/binding-connect/test.ts
@@ -0,0 +1,25 @@
+import type { Envelope, SerializedStreamedSpanContainer } from '@sentry/core';
+import { expect, it } from 'vitest';
+import { createRunner } from '../../runner';
+
+it('calls connect() on Durable Object stubs and service bindings with the binding as `this`', async ({ signal }) => {
+  const runner = createRunner(__dirname)
+    .expect((envelope: Envelope) => {
+      const spanItem = envelope[1].find(item => item[0].type === 'span');
+      expect(spanItem).toBeDefined();
+      const segmentSpan = (spanItem![1] as SerializedStreamedSpanContainer).items.find(span => !!span.is_segment);
+      expect(segmentSpan).toMatchObject({
+        name: 'GET',
+        status: 'ok',
+        attributes: expect.objectContaining({ 'url.path': { type: 'string', value: '/connect' } }),
+      });
+    })
+    .start(signal);
+
+  const result = await runner.makeRequest<{ durableObject: string; service: string }>('get', '/connect');
+
+  expect(result?.durableObject).toBe('ok');
+  // Local workerd rejects CONNECT on a Worker after the `this` check, so only that check is asserted here.
+  expect(result?.service).not.toMatch(/Illegal invocation/);
+  await runner.completed();
+});
diff --git a/dev-packages/cloudflare-integration-tests/suites/binding-connect/wrangler.jsonc b/dev-packages/cloudflare-integration-tests/suites/binding-connect/wrangler.jsonc
new file mode 100644
index 000000000000..0ad9e3a17f67
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/binding-connect/wrangler.jsonc
@@ -0,0 +1,26 @@
+{
+  "name": "binding-connect-worker",
+  "main": "index.ts",
+  "compatibility_date": "2025-06-17",
+  "compatibility_flags": ["nodejs_compat"],
+  "migrations": [
+    {
+      "new_sqlite_classes": ["ConnectDurableObject"],
+      "tag": "v1",
+    },
+  ],
+  "durable_objects": {
+    "bindings": [
+      {
+        "class_name": "ConnectDurableObject",
+        "name": "CONNECT_DO",
+      },
+    ],
+  },
+  "services": [
+    {
+      "binding": "SELF",
+      "service": "binding-connect-worker",
+    },
+  ],
+}
diff --git a/dev-packages/deno-integration-tests/node-suites/excludes.ts b/dev-packages/deno-integration-tests/node-suites/excludes.ts
new file mode 100644
index 000000000000..e2b5e0cd5b01
--- /dev/null
+++ b/dev-packages/deno-integration-tests/node-suites/excludes.ts
@@ -0,0 +1,85 @@
+// Node suites that do not run on Deno, relative to `node-integration-tests`. A single test that
+// fails on Deno is skipped with `test.skipIf` on `RUNTIME` in the Node suite, not listed here.
+
+// Node-only features: ANR and native thread watchdogs, child process and worker thread breadcrumbs.
+const NODE_ONLY = ['suites/anr/test.ts', 'suites/breadcrumbs/**', 'suites/thread-blocked-native/test.ts'];
+
+// `@sentry/node` instruments `fetch` through undici's diagnostics channels, which Deno's `fetch`
+// does not publish. `@sentry/deno` has its own `fetchIntegration` for this. These suites check
+// spans, breadcrumbs or headers of outgoing `fetch` requests.
+const NO_FETCH_INSTRUMENTATION = [
+  'suites/tracing/double-baggage/**',
+  'suites/tracing/http-client-span-streamed/test.ts',
+  'suites/tracing/http-client-spans/fetch-basic-streamed/test.ts',
+  'suites/tracing/http-client-spans/fetch-basic/test.ts',
+  'suites/tracing/http-client-spans/fetch-error/test.ts',
+  'suites/tracing/http-client-spans/fetch-forward-request-hook/test.ts',
+  'suites/tracing/http-client-spans/fetch-headers-to-span-attributes/test.ts',
+  'suites/tracing/http-client-spans/fetch-strip-query/test.ts',
+  'suites/tracing/ignoreSpans-streamed/continued-trace-child/test.ts',
+  'suites/tracing/ignoreSpans-streamed/continued-trace-http-client/test.ts',
+  'suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts',
+  'suites/tracing/no-parent-span-client-report/test.ts',
+  'suites/tracing/requests/fetch-breadcrumbs/test.ts',
+  'suites/tracing/requests/fetch-no-trace-propagation/test.ts',
+  'suites/tracing/requests/fetch-no-tracing-no-spans/test.ts',
+  'suites/tracing/requests/fetch-no-tracing/test.ts',
+  'suites/tracing/requests/fetch-sampled-no-active-span/test.ts',
+  'suites/tracing/requests/fetch-unsampled/test.ts',
+  'suites/tracing/requests/traceparent/test.ts',
+  'suites/tracing/sample-rand-propagation/test.ts',
+  'suites/tracing/sample-rate-propagation/**',
+];
+
+// In the ESM tests Deno cannot find `PrismaClient`, a CommonJS export of `@prisma/client`.
+const PRISMA_ESM_INTEROP = ['suites/tracing/prisma-orm-v5/test.ts', 'suites/tracing/prisma-orm-v6/test.ts'];
+
+// In the CJS tests Deno cannot `require()` a dependency that ships only ES modules: `graphql` 17,
+// `escape-string-regexp` under `mastra`, and `@prisma/orm-postgres`. The ESM tests of `mastra` also
+// check `fetch` spans. The ESM test of `prisma-orm-v8` imports JSON with `with { type: 'json' }`,
+// which any module load hook breaks on Deno 2.8.3 (the CI version); it passes on Deno 2.9.0.
+const REQUIRE_OF_ESM_ONLY_DEPENDENCY = [
+  'suites/tracing/graphql-tracing-channel/**',
+  'suites/tracing/mastra/test.ts',
+  'suites/tracing/prisma-orm-v8/test.ts',
+];
+
+// Some or all tests fail on Deno, cause not investigated yet. In most AI suites the span
+// streaming test fails. `apollo-graphql` (CJS tests only) and `mongodb` fail on Deno 2.8.3 (the CI
+// version) and pass on Deno 2.9.0.
+const NOT_TRIAGED = [
+  'suites/tracing/anthropic/test.ts',
+  'suites/tracing/apollo-graphql/**',
+  'suites/tracing/fastify/test.ts',
+  'suites/tracing/flue/test.ts',
+  'suites/tracing/google-genai/test.ts',
+  'suites/tracing/groq/test.ts',
+  'suites/tracing/http-client-spans/http-strip-query/test.ts',
+  'suites/tracing/ioredis-dc/test.ts',
+  'suites/tracing/koa/test.ts',
+  'suites/tracing/langchain/test.ts',
+  'suites/tracing/langgraph/test.ts',
+  'suites/tracing/mistral/test.ts',
+  'suites/tracing/mongodb/test.ts',
+  'suites/tracing/mongoose-v5/test.ts',
+  'suites/tracing/mysql/test.ts',
+  'suites/tracing/openai/test.ts',
+  'suites/tracing/openai/v7/test.ts',
+  'suites/tracing/orchestrion-lazy-registration/test.ts',
+  'suites/tracing/prisma-orm-v7/test.ts',
+  'suites/tracing/together-ai/test.ts',
+  'suites/tracing/vercelai/v6_v7/test.ts',
+];
+
+// Passes on Deno when run alone, but failed in about 1 of 3 full runs of this package.
+const FLAKY = ['suites/tracing/tracePropagationTargets/**'];
+
+export const NODE_SUITES_EXCLUDE = [
+  '**/node_modules/**',
+  ...NODE_ONLY,
+  ...NO_FETCH_INSTRUMENTATION,
+  ...PRISMA_ESM_INTEROP,
+  ...REQUIRE_OF_ESM_ONLY_DEPENDENCY,
+  ...NOT_TRIAGED,
+  ...FLAKY,
+];
diff --git a/dev-packages/deno-integration-tests/node-suites/import-map.json b/dev-packages/deno-integration-tests/node-suites/import-map.json
new file mode 100644
index 000000000000..a0776ec28c65
--- /dev/null
+++ b/dev-packages/deno-integration-tests/node-suites/import-map.json
@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "@sentry-internal/node-integration-tests": "../../node-integration-tests/build/esm/index.js"
+  }
+}
diff --git a/dev-packages/deno-integration-tests/package.json b/dev-packages/deno-integration-tests/package.json
index 3fdf392ec21b..f2b8cc9335e9 100644
--- a/dev-packages/deno-integration-tests/package.json
+++ b/dev-packages/deno-integration-tests/package.json
@@ -11,8 +11,9 @@
     "install:deno": "node ./scripts/install-deno.mjs",
     "lint": "oxlint . --type-aware",
     "lint:fix": "oxlint . --fix --type-aware",
-    "test": "run-s install:deno deno-types test:unit",
-    "test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check"
+    "test": "node ./scripts/run-tests.mjs",
+    "test:unit": "deno test --allow-net --allow-read --allow-run --allow-env --no-check suites",
+    "test:node-suites": "vitest run"
   },
   "dependencies": {
     "@sentry/core": "11.0.0",
@@ -20,6 +21,10 @@
     "mysql": "^2.18.1",
     "pg": "^8.22.0"
   },
+  "devDependencies": {
+    "@sentry-internal/node-integration-tests": "11.0.0",
+    "vitest": "^3.2.7"
+  },
   "volta": {
     "extends": "../../package.json"
   }
diff --git a/dev-packages/deno-integration-tests/scripts/run-tests.mjs b/dev-packages/deno-integration-tests/scripts/run-tests.mjs
new file mode 100644
index 000000000000..dd6114395553
--- /dev/null
+++ b/dev-packages/deno-integration-tests/scripts/run-tests.mjs
@@ -0,0 +1,27 @@
+// `yarn test` runs the Deno-only suites (`deno test`) and then the shared Node suites (vitest),
+// like the other integration test packages.
+//
+// `yarn test <filter>` runs only the shared Node suites with that filter, e.g. `yarn test express`,
+// because `deno test` does not take vitest filters. To filter the Deno-only suites by test name,
+// run `yarn test:unit --filter <name>`.
+import { spawnSync } from 'node:child_process';
+
+const filters = process.argv.slice(2);
+
+function run(script, args = []) {
+  const result = spawnSync('yarn', ['--silent', script, ...args], {
+    stdio: 'inherit',
+    shell: process.platform === 'win32',
+  });
+  if (result.status !== 0) {
+    process.exit(result.status ?? 1);
+  }
+}
+
+if (filters.length === 0) {
+  run('install:deno');
+  run('deno-types');
+  run('test:unit');
+}
+
+run('test:node-suites', filters);
diff --git a/dev-packages/deno-integration-tests/vite.config.mts b/dev-packages/deno-integration-tests/vite.config.mts
new file mode 100644
index 000000000000..6dccfdc74a5e
--- /dev/null
+++ b/dev-packages/deno-integration-tests/vite.config.mts
@@ -0,0 +1,38 @@
+import { fileURLToPath } from 'node:url';
+import { defineConfig } from 'vitest/config';
+import baseConfig from '../../vite/vite.config';
+import { NODE_SUITES_EXCLUDE } from './node-suites/excludes';
+
+// Runs all Node suites on Deno. The scenarios stay in `node-integration-tests`, and the
+// Deno-only suites in `suites/` run with `deno test`.
+export default defineConfig({
+  ...baseConfig,
+  test: {
+    ...baseConfig.test,
+    root: fileURLToPath(new URL('../node-integration-tests', import.meta.url)),
+    coverage: {
+      enabled: false,
+    },
+    isolate: false,
+    include: ['suites/**/test.ts'],
+    exclude: NODE_SUITES_EXCLUDE,
+    env: {
+      RUNTIME: 'deno',
+      DENO_IMPORT_MAP: fileURLToPath(new URL('./node-suites/import-map.json', import.meta.url)),
+    },
+    // Above the 30 second port timeout of the runner on Deno, so a slow start can still pass.
+    testTimeout: 45_000,
+    ...(process.env.DEBUG
+      ? {
+          disableConsoleIntercept: true,
+          silent: false,
+        }
+      : {}),
+    pool: 'threads',
+    reporters: process.env.DEBUG
+      ? ['default', { summary: false }]
+      : process.env.GITHUB_ACTIONS
+        ? ['dot', 'github-actions']
+        : ['verbose'],
+  },
+});
diff --git a/dev-packages/e2e-tests/test-applications/astro-5-cf-workers/package.json b/dev-packages/e2e-tests/test-applications/astro-5-cf-workers/package.json
index 1a8b6a37a695..b792cbf5dcad 100644
--- a/dev-packages/e2e-tests/test-applications/astro-5-cf-workers/package.json
+++ b/dev-packages/e2e-tests/test-applications/astro-5-cf-workers/package.json
@@ -21,7 +21,6 @@
     "wrangler": "^4.63.0"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/astro-6-cf-workers/package.json b/dev-packages/e2e-tests/test-applications/astro-6-cf-workers/package.json
index af7235ed84a8..3c5502c6f6c6 100644
--- a/dev-packages/e2e-tests/test-applications/astro-6-cf-workers/package.json
+++ b/dev-packages/e2e-tests/test-applications/astro-6-cf-workers/package.json
@@ -23,7 +23,6 @@
     "wrangler": "^4.72.0"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/package.json
index 372b2c2055c6..2b33e38f5580 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/package.json
@@ -32,7 +32,6 @@
     "ws": "^8.21.1"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
index 4139071b884f..792e61834ce1 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
@@ -97,10 +97,8 @@ for (const { title, binding, agentClass } of [
     expect(rpcSpan.attributes['sentry.op']?.value).toBe('rpc');
     expect(rpcSpan.attributes['sentry.origin']?.value).toBe('auto.faas.cloudflare.agents');
     // Read back off the instance at runtime (`_ParentClass.name`), so it
-    // confirms the wrapper landed on the user's real class. Matched loosely
-    // because the transform renames the class it wraps to
-    // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
-    expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toContain(agentClass);
+    // confirms the wrapper landed on the user's real class, with its name intact.
+    expect(rpcSpan.attributes['gen_ai.agent.name']?.value).toBe(agentClass);
   });
 }
 
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-local-workers/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-local-workers/package.json
index bca3f6ac9d3e..c2aa8fbb7bdc 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-local-workers/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-local-workers/package.json
@@ -25,7 +25,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   },
   "pnpm": {
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/package.json
index c6ea2d8e823c..03853b91aaa1 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp-agent/package.json
@@ -27,7 +27,6 @@
     "wrangler": "^4.86.0"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
index c31d593c1f70..bef9e2e7ffd4 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
@@ -28,7 +28,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/package.json
index 8c9f23e5b282..d9d14c23914e 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-orchestrion-mysql/package.json
@@ -28,7 +28,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-think/package.json
new file mode 100644
index 000000000000..0bb10a6be700
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/package.json
@@ -0,0 +1,50 @@
+{
+  "name": "cloudflare-think",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "vite dev",
+    "build": "vite build",
+    "preview": "vite preview --port 38788",
+    "typecheck": "tsc --noEmit",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm test:prod",
+    "test:prod": "TEST_ENV=production playwright test",
+    "test:dev": "TEST_ENV=development playwright test",
+    "test:build-ai-v6": "pnpm install && pnpm add ai@^6.0.0 @openrouter/ai-sdk-provider@^2.9.1 && pnpm build",
+    "test:assert-ai-v6": "AI_SDK_MAJOR=6 pnpm test:prod"
+  },
+  "dependencies": {
+    "@cloudflare/think": "^0.19.0",
+    "@openrouter/ai-sdk-provider": "^3.1.0",
+    "@sentry/cloudflare": "file:../../packed/sentry-cloudflare-packed.tgz",
+    "agents": "^0.24.0",
+    "ai": "^7.0.112",
+    "dataloader": "^2.2.3",
+    "zod": "^4.0.0"
+  },
+  "devDependencies": {
+    "@cloudflare/vite-plugin": "1.57.2",
+    "@cloudflare/workers-types": "^4.20260426.0",
+    "@playwright/test": "~1.63.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "typescript": "^5.5.2",
+    "vite": "7.3.5",
+    "wrangler": "^4.136.2",
+    "ws": "^8.18.3"
+  },
+  "volta": {
+    "node": "24.15.0",
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "optional": true,
+    "optionalVariants": [
+      {
+        "build-command": "pnpm test:build-ai-v6",
+        "assert-command": "pnpm test:assert-ai-v6",
+        "label": "cloudflare-think (ai v6)"
+      }
+    ]
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/playwright.config.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/playwright.config.ts
new file mode 100644
index 000000000000..d5838d66e04a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/playwright.config.ts
@@ -0,0 +1,23 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const testEnv = process.env.TEST_ENV;
+
+if (!testEnv) {
+  throw new Error('No test env defined');
+}
+
+const APP_PORT = 38788;
+
+const config = getPlaywrightConfig(
+  {
+    startCommand: `pnpm preview`,
+    port: APP_PORT,
+  },
+  // Each test drives a real OpenRouter tool-calling turn (up to two model calls) and then waits for
+  // the spans to flush, which does not fit the default 30s timeout when the provider is slow. The
+  // serial default from `getPlaywrightConfig` is kept: these turns share one worker and one event
+  // proxy, so running them in parallel only makes traces harder to tell apart.
+  { timeout: 90_000 },
+);
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/src/env.d.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/env.d.ts
new file mode 100644
index 000000000000..c18846580a4e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/env.d.ts
@@ -0,0 +1,9 @@
+declare namespace Cloudflare {
+  interface Env {
+    E2E_TEST_DSN: string;
+    E2E_OPENROUTER_API_KEY: string;
+    ThinkAgent: DurableObjectNamespace;
+  }
+}
+
+interface Env extends Cloudflare.Env {}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/src/index.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/index.ts
new file mode 100644
index 000000000000..2e2784df6e67
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/index.ts
@@ -0,0 +1,11 @@
+import { routeAgentRequest } from 'agents';
+
+// Re-exported rather than declared here so the build-time wrapper has to cross a module boundary
+// to find and wrap the class. See the note on the class itself.
+export { ThinkAgent } from './think-agent';
+
+export default {
+  async fetch(request, env): Promise<Response> {
+    return (await routeAgentRequest(request, env)) ?? new Response('Not found', { status: 404 });
+  },
+} satisfies ExportedHandler<Env>;
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/src/instrument.server.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/instrument.server.ts
new file mode 100644
index 000000000000..4bd8e8b9fdc0
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/instrument.server.ts
@@ -0,0 +1,10 @@
+import { defineCloudflareOptions } from '@sentry/cloudflare';
+
+// The Sentry Vite plugin picks this file up by convention, next to the worker entry named in
+// wrangler's `main`, and hands its default export to `withSentry`.
+export default defineCloudflareOptions((env: Env) => ({
+  dsn: env.E2E_TEST_DSN,
+  environment: 'qa',
+  tunnel: 'http://localhost:3031/',
+  tracesSampleRate: 1.0,
+}));
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/src/think-agent.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/think-agent.ts
new file mode 100644
index 000000000000..93e28fe08307
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/src/think-agent.ts
@@ -0,0 +1,76 @@
+import { createOpenRouter } from '@openrouter/ai-sdk-provider';
+import { Think } from '@cloudflare/think';
+import * as Sentry from '@sentry/cloudflare';
+import type { LanguageModel, ToolSet } from 'ai';
+import { tool } from 'ai';
+import DataLoader from 'dataloader';
+import { z } from 'zod';
+
+/**
+ * Not wrapped by hand: `@sentry/cloudflare/vite` detects `extends Think` and rewrites the worker
+ * entry's export of this class into `instrumentAgentWithSentry(...)` at build time. Wrapping it
+ * here would prove nothing about the zero-config path.
+ *
+ * The class deliberately lives outside the worker entry, which only re-exports it. That is the
+ * harder case for the plugin: the entry never binds the class, so detection has to follow the
+ * re-export into this module and the wrapper has to import the class under a private name.
+ */
+export class ThinkAgent extends Think<Env> {
+  public getModel(): LanguageModel {
+    // Call OpenRouter directly (rather than the default Vercel AI Gateway) so the e2e test needs
+    // only a single OpenRouter key, reusing `E2E_OPENROUTER_API_KEY` like the other AI apps. A real
+    // provider is also what makes the outgoing model request observable as an `http.client` span.
+    const openrouter = createOpenRouter({ apiKey: this.env.E2E_OPENROUTER_API_KEY ?? '' });
+
+    return openrouter('openai/gpt-4o-mini');
+  }
+
+  public getSystemPrompt(): string {
+    return [
+      'You are a concise assistant used by an automated end-to-end test.',
+      'When the user asks about the weather in a place, call the `get_weather` tool for that place and answer in one short sentence using its result.',
+      'When the user asks you to trigger a failure, call the `fail_now` tool.',
+      'Do not ask follow-up questions.',
+    ].join('\n');
+  }
+
+  public getTools(): ToolSet {
+    return {
+      get_weather: tool({
+        description: 'Get the current weather for a location',
+        inputSchema: z.object({ location: z.string() }),
+        execute: async ({ location }: { location: string }) => {
+          // A manual span raised inside a tool must nest under that tool's `gen_ai.execute_tool`
+          // span, which only holds if Think runs the tool inside the SDK's async context.
+          return Sentry.startSpan({ name: 'lookup-forecast', op: 'gen_ai.tool.manual' }, async () => {
+            // `dataloader` is instrumented through the orchestrion module transform rather than by
+            // patching a global, so its spans are the probe for whether channel injection reached
+            // this bundled worker at all.
+            const loader = new DataLoader<string, string>(async keys => keys.map(key => `forecast:${key}`));
+            await Promise.all([loader.load(location), loader.load(location)]);
+
+            return { city: location, condition: 'Sunny', temperatureC: 22 };
+          });
+        },
+      }),
+      fail_now: tool({
+        description: 'Always throws an error. Call this when the user asks to trigger a failure.',
+        // A nominal argument rather than `z.object({})`, and an explicit return type: the AI SDK
+        // infers `never` for an empty input schema, and a body that only throws infers
+        // `Promise<never>`. Either one alone makes the `tool()` overload unresolvable.
+        inputSchema: z.object({ reason: z.string() }),
+        execute: async (_input: { reason: string }): Promise<string> => {
+          throw new Error('Think tool failed on purpose');
+        },
+      }),
+    };
+  }
+
+  public async onRequest(request: Request): Promise<Response> {
+    const message = new URL(request.url).searchParams.get('message') ?? 'What is the weather in Paris?';
+
+    const result = await this.runTurn({ input: message });
+
+    return Response.json({ continuation: result.continuation });
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/cloudflare-think/start-event-proxy.mjs
new file mode 100644
index 000000000000..784fc99f86ba
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/start-event-proxy.mjs
@@ -0,0 +1,7 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'cloudflare-think',
+  envelopeDumpPath: process.env.SENTRY_ENVELOPE_DUMP_PATH,
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/dataloader.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/dataloader.test.ts
new file mode 100644
index 000000000000..a2336e3ac52c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/dataloader.test.ts
@@ -0,0 +1,44 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import { attr, isTurnOf, newAgentId, runAgentTurn, type StreamedSpan } from './utils';
+
+const APP = 'cloudflare-think';
+
+const isDataloaderSpan = (span: { attributes?: Record<string, { value?: unknown }> }): boolean =>
+  span.attributes?.['sentry.origin']?.value === 'auto.db.dataloader';
+
+/**
+ * `dataloader` is instrumented by the orchestrion module transform rather than by patching anything
+ * at runtime, so its spans are the probe for whether channel injection reached the worker at all.
+ * Libraries that do not need the transform (`node:http`, and the AI spans themselves) would pass
+ * even if injection were broken.
+ *
+ * On Cloudflare the injection is done at build time by `sentryCloudflareVitePlugin()`, so unlike the
+ * Node apps this needs no `--import` bootstrap. A Think worker is heavily bundled, which is exactly
+ * the situation where a transform can silently stop applying, so this is the test that catches it.
+ *
+ * The loader runs inside a tool so its spans land in the turn's trace rather than one of their own.
+ */
+test('captures orchestrion-instrumented dataloader spans in the same trace as the AI spans', async ({ baseURL }) => {
+  const agentId = newAgentId('dataloader');
+  const ofThisTurn = isTurnOf(agentId);
+
+  const spansPromise = collectStreamedSpans(
+    APP,
+    spansOfTrace =>
+      ofThisTurn(spansOfTrace as StreamedSpan[]) &&
+      spansOfTrace.some(span => attr(span as StreamedSpan, 'gen_ai.tool.name') === 'get_weather') &&
+      spansOfTrace.some(isDataloaderSpan),
+  );
+
+  await runAgentTurn(baseURL!, agentId, 'What is the weather in Paris?');
+
+  const spans = await spansPromise;
+  const dataloaderSpan = spans.find(isDataloaderSpan);
+  const toolSpan = spans.find(span => span.attributes?.['gen_ai.tool.name']?.value === 'get_weather');
+
+  // Sharing the trace is the point. Not asserting the exact parent: the model may call the tool more
+  // than once, so the tool span found here is not reliably the one that ran this loader.
+  expect(getSpanOp(dataloaderSpan!)).toBe('cache.get');
+  expect(dataloaderSpan?.trace_id).toBe(toolSpan?.trace_id);
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/errors.test.ts
new file mode 100644
index 000000000000..76f65c74e01b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/errors.test.ts
@@ -0,0 +1,51 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp, waitForError } from '@sentry-internal/test-utils';
+import { attr, isTurnOf, newAgentId, runAgentTurn, type StreamedSpan } from './utils';
+
+const APP = 'cloudflare-think';
+
+/**
+ * A tool throw is not an agent failure: the AI SDK catches it, hands the error back to the model as
+ * a tool result, and the turn carries on and usually answers. So the error has to reach Sentry from
+ * the tool span itself, and the spans above it stay `ok` — the model calls did succeed.
+ */
+test('captures an error thrown inside a Think tool and marks its span errored', async ({ baseURL }) => {
+  const agentId = newAgentId('tool-error');
+  const ofThisTurn = isTurnOf(agentId);
+
+  const errorPromise = waitForError(
+    APP,
+    event => event.exception?.values?.[0]?.value === 'Think tool failed on purpose',
+  );
+
+  const spansPromise = collectStreamedSpans(
+    APP,
+    spansOfTrace =>
+      ofThisTurn(spansOfTrace as StreamedSpan[]) &&
+      spansOfTrace.some(span => attr(span as StreamedSpan, 'gen_ai.tool.name') === 'fail_now'),
+  );
+
+  await runAgentTurn(baseURL!, agentId, 'Please trigger a failure now.');
+
+  const error = await errorPromise;
+  const spans = await spansPromise;
+
+  const exception = error.exception?.values?.[0];
+  expect(exception?.type).toBe('Error');
+  expect(exception?.value).toBe('Think tool failed on purpose');
+  expect(exception?.mechanism?.type).toBe('auto.vercelai.channel');
+
+  const toolSpan = spans.find(span => span.attributes?.['gen_ai.tool.name']?.value === 'fail_now');
+  expect(getSpanOp(toolSpan!)).toBe('gen_ai.execute_tool');
+  expect(toolSpan?.status).toBe('error');
+
+  // The issue belongs to the same trace as the turn that produced it.
+  expect(error.contexts?.trace?.trace_id).toBe(toolSpan?.trace_id);
+
+  // The model calls around the failing tool succeeded, so only the tool span is errored.
+  const modelCalls = spans.filter(span => getSpanOp(span) === 'gen_ai.generate_content');
+  expect(modelCalls.length).toBeGreaterThan(0);
+  for (const modelCall of modelCalls) {
+    expect(modelCall.status).toBe('ok');
+  }
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/think.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/think.test.ts
new file mode 100644
index 000000000000..1368b59298a7
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/think.test.ts
@@ -0,0 +1,136 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import { attr, isTurnOf, newAgentId, runAgentTurn, type StreamedSpan } from './utils';
+
+const APP = 'cloudflare-think';
+
+/**
+ * The whole point of the app: nothing wires Sentry into Think by hand. `sentryCloudflareVitePlugin()`
+ * detects `class ThinkAgent extends Think` and wraps the export at build time, and the `ai` SDK publishes
+ * the telemetry `vercelAIIntegration` consumes. The worker's only Sentry import is the `startSpan` the
+ * manual-span test below needs. Nothing here is Think-specific on the SDK side, so this test is what
+ * would catch either half of that chain breaking.
+ *
+ * `collectStreamedSpans` rather than `waitForStreamedSpans`: the streamed `invoke_agent` parent stays
+ * open until its children settle and flushes in a separate envelope from them, so a single envelope
+ * never holds the whole turn.
+ */
+test('captures the invoke_agent / generate_content / execute_tool hierarchy for a Think turn', async ({ baseURL }) => {
+  const agentId = newAgentId('hierarchy');
+  const ofThisTurn = isTurnOf(agentId);
+
+  const spansPromise = collectStreamedSpans(
+    APP,
+    spansOfTrace =>
+      ofThisTurn(spansOfTrace as StreamedSpan[]) &&
+      ['gen_ai.invoke_agent', 'gen_ai.generate_content', 'gen_ai.execute_tool'].every(op =>
+        spansOfTrace.some(span => getSpanOp(span) === op),
+      ),
+  );
+
+  await runAgentTurn(baseURL!, agentId, 'What is the weather in Paris?');
+
+  const spans = (await spansPromise) as StreamedSpan[];
+
+  const invokeAgent = spans.find(span => getSpanOp(span) === 'gen_ai.invoke_agent');
+  const generateContent = spans.find(span => getSpanOp(span) === 'gen_ai.generate_content');
+  const executeTool = spans.find(span => getSpanOp(span) === 'gen_ai.execute_tool');
+
+  expect(attr(invokeAgent, 'sentry.origin')).toBe('auto.vercelai.channel');
+  expect(attr(invokeAgent, 'gen_ai.operation.name')).toBe('invoke_agent');
+  // Think passes `this.constructor.name` to the AI SDK as the `functionId`, so this only holds while
+  // the build-time wrapper leaves the user's class name alone (#24700).
+  expect(invokeAgent?.name).toBe('invoke_agent ThinkAgent');
+  expect(attr(invokeAgent, 'gen_ai.function_id')).toBe('ThinkAgent');
+  expect(attr(invokeAgent, 'gen_ai.provider.name')).toBe('openrouter');
+  expect(typeof attr(invokeAgent, 'gen_ai.usage.input_tokens')).toBe('number');
+  expect(typeof attr(invokeAgent, 'gen_ai.usage.output_tokens')).toBe('number');
+  expect(typeof attr(invokeAgent, 'gen_ai.usage.total_tokens')).toBe('number');
+
+  expect(attr(generateContent, 'gen_ai.operation.name')).toBe('generate_content');
+  expect(attr(generateContent, 'gen_ai.request.model')).toBe('openai/gpt-4o-mini');
+
+  expect(attr(executeTool, 'gen_ai.operation.name')).toBe('execute_tool');
+  expect(attr(executeTool, 'gen_ai.tool.name')).toBe('get_weather');
+
+  // Inputs and outputs are recorded under the SDK's default data collection (the app sets no
+  // `dataCollection` override).
+  expect(String(attr(invokeAgent, 'gen_ai.input.messages') ?? '')).toContain('Paris');
+  expect(String(attr(executeTool, 'gen_ai.tool.call.arguments') ?? '')).toContain('Paris');
+  expect(String(attr(executeTool, 'gen_ai.tool.call.result') ?? '')).toContain('Sunny');
+
+  // Think drives one `streamText` per turn with the step loop inside it, so the model calls are
+  // children of the single agent span rather than siblings of it.
+  expect(generateContent?.parent_span_id).toBe(invokeAgent?.span_id);
+  expect(executeTool?.parent_span_id).toBe(invokeAgent?.span_id);
+});
+
+/**
+ * A span the user starts inside a tool has to nest under that tool's span, which only holds if Think
+ * runs tool execution inside the async context the SDK opened. Nothing in the SDK arranges this for
+ * Think specifically, so it is worth pinning.
+ */
+test('nests a manual span raised inside a tool under that tool span', async ({ baseURL }) => {
+  const agentId = newAgentId('manual-span');
+  const ofThisTurn = isTurnOf(agentId);
+
+  const spansPromise = collectStreamedSpans(
+    APP,
+    spansOfTrace =>
+      ofThisTurn(spansOfTrace as StreamedSpan[]) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'gen_ai.execute_tool') &&
+      spansOfTrace.some(span => getSpanOp(span) === 'gen_ai.tool.manual'),
+  );
+
+  await runAgentTurn(baseURL!, agentId, 'What is the weather in Paris?');
+
+  const spans = (await spansPromise) as StreamedSpan[];
+  const manualSpan = spans.find(span => getSpanOp(span) === 'gen_ai.tool.manual');
+  const toolSpan = spans.find(span => span.span_id === manualSpan?.parent_span_id);
+
+  expect(manualSpan?.name).toBe('lookup-forecast');
+  expect(getSpanOp(toolSpan!)).toBe('gen_ai.execute_tool');
+  expect(attr(toolSpan, 'gen_ai.tool.name')).toBe('get_weather');
+});
+
+/**
+ * The request to the model provider must join the turn's trace rather than run beside it. A mocked
+ * model cannot show this, which is why the app calls OpenRouter for real.
+ *
+ * Where it lands differs by `ai` major, and the difference is ours rather than the framework's. On
+ * v7 the native `ai:telemetry` channel binds the model-call span into async context, so the fetch it
+ * wraps nests under `gen_ai.generate_content`. On v4-v6 the model span comes from the orchestrion
+ * `resolveLanguageModel` patch, which never makes that span active, so the fetch attaches to the
+ * agent span instead and lands as the model call's sibling. Both keep the request in the turn, which
+ * is what this asserts for every lane; the tighter parent is asserted only where it holds, so the
+ * v6 shape is recorded rather than papered over.
+ */
+test('keeps the provider HTTP call inside the turn, under the model call on ai >= 7', async ({ baseURL }) => {
+  const agentId = newAgentId('provider-http');
+  const ofThisTurn = isTurnOf(agentId);
+
+  const isProviderRequest = (span: StreamedSpan): boolean =>
+    getSpanOp(span) === 'http.client' && String(attr(span, 'server.address') ?? span.name ?? '').includes('openrouter');
+
+  const spansPromise = collectStreamedSpans(
+    APP,
+    spansOfTrace =>
+      ofThisTurn(spansOfTrace as StreamedSpan[]) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'gen_ai.generate_content') &&
+      spansOfTrace.some(span => isProviderRequest(span as StreamedSpan)),
+  );
+
+  await runAgentTurn(baseURL!, agentId, 'What is the weather in Paris?');
+
+  const spans = (await spansPromise) as StreamedSpan[];
+  const providerRequest = spans.find(isProviderRequest);
+  const invokeAgent = spans.find(span => getSpanOp(span) === 'gen_ai.invoke_agent');
+  const parent = spans.find(span => span.span_id === providerRequest?.parent_span_id);
+
+  expect(providerRequest?.trace_id).toBe(invokeAgent?.trace_id);
+  expect(['gen_ai.generate_content', 'gen_ai.invoke_agent']).toContain(getSpanOp(parent!));
+
+  if ((process.env.AI_SDK_MAJOR ?? '7') !== '6') {
+    expect(getSpanOp(parent!)).toBe('gen_ai.generate_content');
+  }
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/utils.ts b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/utils.ts
new file mode 100644
index 000000000000..dc30ad54f95d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/tests/utils.ts
@@ -0,0 +1,54 @@
+import { expect } from '@playwright/test';
+
+export type StreamedSpan = {
+  span_id?: string;
+  parent_span_id?: string;
+  trace_id?: string;
+  name?: string;
+  status?: string;
+  attributes?: Record<string, { value?: unknown }>;
+};
+
+export const attr = (span: StreamedSpan | undefined, key: string): unknown => span?.attributes?.[key]?.value;
+
+/**
+ * An agent instance id nothing has used yet.
+ *
+ * The id is the `:name` path segment `routeAgentRequest` maps to a Durable Object, so reusing one
+ * across tests would reuse its stored transcript and alarm state. A fresh id per turn keeps each
+ * test to its own agent, and keeps `test:dev` from inheriting what `test:prod` left behind.
+ */
+export function newAgentId(prefix: string): string {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+}
+
+/**
+ * Whether a trace belongs to the turn `agentId` drove.
+ *
+ * Every test in this app drives the same agent class through the same two tools, so a predicate
+ * written only in terms of span ops matches any test's trace. Playwright runs the files in parallel
+ * against one worker and one event proxy, so that is not hypothetical: a test asserting on
+ * `get_weather` will happily latch onto the trace of the one asserting on `fail_now`. The agent id
+ * is in the request path, which is unique per turn, so scoping on it is what keeps each test to its
+ * own trace.
+ */
+export function isTurnOf(agentId: string) {
+  return (spansOfTrace: StreamedSpan[]): boolean =>
+    spansOfTrace.some(span => String(attr(span, 'url.path') ?? '').endsWith(`/${agentId}`));
+}
+
+/**
+ * Run one Think turn and wait for it to finish.
+ *
+ * The agent's `onRequest` drives `runTurn()` in its default `wait` mode, so unlike frameworks that
+ * admit the work and return `202`, the response only arrives once the turn has settled. That makes
+ * this a plain request: no polling needed.
+ */
+export async function runAgentTurn(baseURL: string, agentId: string, message: string): Promise<void> {
+  const res = await fetch(`${baseURL}/agents/think-agent/${agentId}?message=${encodeURIComponent(message)}`, {
+    method: 'POST',
+  });
+
+  expect(res.status).toBe(200);
+  await res.text();
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/tsconfig.json b/dev-packages/e2e-tests/test-applications/cloudflare-think/tsconfig.json
new file mode 100644
index 000000000000..40863136da68
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "es2022",
+    "lib": ["es2022"],
+    "module": "es2022",
+    "moduleResolution": "Bundler",
+    "resolveJsonModule": true,
+    "allowJs": true,
+    "checkJs": false,
+    "noEmit": true,
+    "isolatedModules": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "types": ["@cloudflare/workers-types"]
+  },
+  "exclude": ["tests"],
+  "include": ["src/**/*.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/vite.config.mts b/dev-packages/e2e-tests/test-applications/cloudflare-think/vite.config.mts
new file mode 100644
index 000000000000..46781d245acc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/vite.config.mts
@@ -0,0 +1,17 @@
+import { cloudflare } from '@cloudflare/vite-plugin';
+import { sentryCloudflareVitePlugin } from '@sentry/cloudflare/vite';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  resolve: {
+    alias: {
+      // `@cloudflare/think` pulls in `just-bash` -> `turndown`, whose Node build calls a bare
+      // `require('@mixmark-io/domino')` at module scope when `DOMParser` is missing. workerd has no
+      // `DOMParser` and no `require`, so the worker dies on startup before any handler runs. This is
+      // upstream of Sentry — it reproduces with `cloudflare()` alone. `turndown` already ships a
+      // browser build with that branch compiled out; point at it directly.
+      turndown: 'turndown/lib/turndown.browser.es.js',
+    },
+  },
+  plugins: [cloudflare(), sentryCloudflareVitePlugin()],
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-think/wrangler.toml b/dev-packages/e2e-tests/test-applications/cloudflare-think/wrangler.toml
new file mode 100644
index 000000000000..6be3e1f730ad
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-think/wrangler.toml
@@ -0,0 +1,18 @@
+#:schema node_modules/wrangler/config-schema.json
+name = "cloudflare-think"
+main = "src/index.ts"
+compatibility_date = "2026-09-15"
+compatibility_flags = ["nodejs_compat"]
+
+# `vite preview` takes no `--var` flag, so the DSN is declared here and read from
+# the process environment the Playwright web server inherits.
+[secrets]
+required = ["E2E_TEST_DSN", "E2E_OPENROUTER_API_KEY"]
+
+[[durable_objects.bindings]]
+name = "ThinkAgent"
+class_name = "ThinkAgent"
+
+[[migrations]]
+tag = "v1"
+new_sqlite_classes = ["ThinkAgent"]
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-vercelai-v7/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-vercelai-v7/package.json
index bddb63d19e40..955e1435d558 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-vercelai-v7/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-vercelai-v7/package.json
@@ -27,7 +27,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/deployed-worker.mjs b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/deployed-worker.ts
similarity index 53%
rename from dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/deployed-worker.mjs
rename to dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/deployed-worker.ts
index 9dacbe052b8b..514927322439 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/deployed-worker.mjs
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/deployed-worker.ts
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-function wrangler(args, env = {}) {
+function wrangler(args: string[], env: Record<string, string> = {}): void {
   execFileSync('pnpm', ['exec', 'wrangler', ...args], {
     cwd: __dirname,
     env: { ...process.env, ...env },
@@ -18,10 +18,12 @@ function wrangler(args, env = {}) {
  * Workflow names are unique per Cloudflare account, so every worker gets its own. The Vite build writes the
  * config wrangler deploys from, and `.wrangler/deploy/config.json` points to it.
  */
-function nameWorkflowsAfterWorker(name) {
-  const redirect = JSON.parse(readFileSync(join(__dirname, '.wrangler/deploy/config.json'), 'utf8'));
+function nameWorkflowsAfterWorker(name: string): void {
+  const redirect: { configPath: string } = JSON.parse(
+    readFileSync(join(__dirname, '.wrangler/deploy/config.json'), 'utf8'),
+  );
   const configPath = join(__dirname, '.wrangler/deploy', redirect.configPath);
-  const config = JSON.parse(readFileSync(configPath, 'utf8'));
+  const config: { workflows?: { name: string }[] } = JSON.parse(readFileSync(configPath, 'utf8'));
 
   for (const workflow of config.workflows ?? []) {
     workflow.name = name;
@@ -30,7 +32,7 @@ function nameWorkflowsAfterWorker(name) {
 }
 
 /** Deploys the worker under `name` and returns its workers.dev URL. */
-export function deployWorker(name, dsn) {
+export function deployWorker(name: string, dsn: string): string {
   nameWorkflowsAfterWorker(name);
   const outputDir = mkdtempSync(join(tmpdir(), 'wrangler-output-'));
   const outputFile = join(outputDir, 'output.ndjson');
@@ -41,7 +43,7 @@ export function deployWorker(name, dsn) {
     const url = readFileSync(outputFile, 'utf8')
       .split('\n')
       .filter(Boolean)
-      .map(line => JSON.parse(line))
+      .map(line => JSON.parse(line) as { type?: string; targets?: string[] })
       .find(entry => entry.type === 'deploy')
       ?.targets?.find(target => target.endsWith('.workers.dev'));
 
@@ -55,7 +57,7 @@ export function deployWorker(name, dsn) {
   }
 }
 
-export function deleteWorker(name) {
+export function deleteWorker(name: string): void {
   wrangler(['delete', '--name', name, '--force']);
 }
 
@@ -63,12 +65,12 @@ export function deleteWorker(name) {
  * CI keeps its Workers: one per ref, overwritten by the next run of the same ref and deleted by the
  * cleanup workflow once a PR closes. Local runs delete theirs unless `E2E_KEEP_WORKER` is set.
  */
-export function keepsWorker() {
+export function keepsWorker(): boolean {
   return Boolean(process.env.GITHUB_ACTIONS || process.env.E2E_KEEP_WORKER);
 }
 
 /** A freshly created workers.dev route can take a moment to become reachable. */
-export async function waitForWorker(url) {
+export async function waitForWorker(url: string): Promise<void> {
   const deadline = Date.now() + 60_000;
 
   while (Date.now() < deadline) {
@@ -88,3 +90,39 @@ export async function waitForWorker(url) {
 
   throw new Error(`Worker at ${url} did not become reachable within 60s.`);
 }
+
+/**
+ * Sends a request until the Worker itself answers it, and returns the body of that answer.
+ *
+ * On the first deployment of a Worker name, Cloudflare has answered a request with a 500 while
+ * Workers Logs had no invocation for it. `status` is the status the Worker answers with. A Worker
+ * that threw answers with status 500 and Cloudflare error code 1101, which sets it apart from a 500
+ * that did not come from the Worker.
+ */
+export async function fetchFromWorker(url: string, status: number, init?: RequestInit): Promise<string> {
+  const deadline = Date.now() + 60_000;
+  let lastAnswer = 'no answer';
+
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(url, init);
+      const body = await response.text();
+      // Cloudflare sends its error page as HTML to some clients (Node's fetch among them) and as
+      // `error code: <code>` plain text to others, so the code is read from either format.
+      const errorCode = /cf-error-code">(\d+)<|^error code: (\d+)/.exec(body)?.slice(1).find(Boolean);
+
+      if (response.status === status && (status !== 500 || errorCode === '1101')) {
+        return body;
+      }
+
+      lastAnswer = `${response.status}, cf-ray ${response.headers.get('cf-ray')}, error code ${errorCode ?? 'none'}, body: ${body.slice(0, 200)}`;
+    } catch (error) {
+      lastAnswer = String(error);
+    }
+
+    console.log(`The Worker did not answer ${url}: ${lastAnswer}`);
+    await new Promise(resolve => setTimeout(resolve, 2_000));
+  }
+
+  throw new Error(`The Worker did not answer ${url} with status ${status} within 60s. Last answer: ${lastAnswer}`);
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-setup.mjs b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-setup.ts
similarity index 94%
rename from dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-setup.mjs
rename to dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-setup.ts
index 08e9311cb7ca..b33f187e1d94 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-setup.mjs
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-setup.ts
@@ -1,6 +1,6 @@
 import { randomBytes } from 'node:crypto';
 import { existsSync } from 'node:fs';
-import { deleteWorker, deployWorker, keepsWorker, waitForWorker } from './deployed-worker.mjs';
+import { deleteWorker, deployWorker, keepsWorker, waitForWorker } from './deployed-worker';
 
 const WORKER_PREFIX = 'e2e-send-to-sentry';
 
@@ -9,7 +9,7 @@ const WORKER_PREFIX = 'e2e-send-to-sentry';
  * next run of the same ref overwrites. Pull request refs look like `123/merge` and merge queue refs
  * like `gh-readonly-queue/<base>/pr-123-<sha>`; both map to the PR's Worker.
  */
-export function getWorkerName() {
+export function getWorkerName(): string {
   if (!process.env.GITHUB_ACTIONS) {
     return `${WORKER_PREFIX}-local-${randomBytes(3).toString('hex')}`;
   }
@@ -24,7 +24,7 @@ export function getWorkerName() {
   return `${WORKER_PREFIX}-${slug}`.slice(0, 63).replace(/-+$/, '');
 }
 
-export default async function globalSetup() {
+export default async function globalSetup(): Promise<void> {
   if (!existsSync(new URL('.wrangler/deploy/config.json', import.meta.url))) {
     throw new Error('Run `pnpm build` first: wrangler would deploy the uninstrumented source.');
   }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-teardown.mjs b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-teardown.ts
similarity index 82%
rename from dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-teardown.mjs
rename to dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-teardown.ts
index 0fee903dc5c7..9f012cd51101 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-teardown.mjs
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/global-teardown.ts
@@ -1,6 +1,6 @@
-import { deleteWorker, keepsWorker } from './deployed-worker.mjs';
+import { deleteWorker, keepsWorker } from './deployed-worker';
 
-export default function globalTeardown() {
+export default function globalTeardown(): void {
   const workerName = process.env.E2E_TEST_WORKER_NAME;
 
   if (!workerName) {
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/package.json
index 75bbb77d0b7c..3bebd9caebf1 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "build": "vite build",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.node.json",
     "test": "playwright test",
     "clean": "npx rimraf node_modules pnpm-lock.yaml dist .wrangler",
     "test:build": "pnpm install && pnpm build",
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/playwright.config.ts b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/playwright.config.ts
index 0b79fb88052f..91e214f15493 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/playwright.config.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/playwright.config.ts
@@ -3,8 +3,8 @@ import { defineConfig } from '@playwright/test';
 export default defineConfig({
   testDir: './tests',
   // The worker is deployed once for the whole run and deleted again afterwards.
-  globalSetup: './global-setup.mjs',
-  globalTeardown: './global-teardown.mjs',
+  globalSetup: './global-setup.ts',
+  globalTeardown: './global-teardown.ts',
   /* Spans take ~2min to become queryable via the trace endpoint. */
   timeout: 210_000,
   fullyParallel: true,
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tests/send-to-sentry.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tests/send-to-sentry.test.ts
index ab642bf55b1a..8578ecb7bee7 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tests/send-to-sentry.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tests/send-to-sentry.test.ts
@@ -8,14 +8,15 @@ import {
   flattenTrace,
   traceTarget,
 } from '@sentry-internal/test-utils/cli';
+import { fetchFromWorker } from '../deployed-worker';
 
-// Set by global-setup.mjs once the worker for this run is deployed.
+// Set by global-setup.ts once the worker for this run is deployed.
 const workerUrl = process.env.E2E_TEST_WORKER_URL;
 
 test('Sends a captured exception to Sentry', async () => {
-  const response = await fetch(`${workerUrl}/test-error`);
-  expect(response.status).toBe(200);
-  const { eventId, traceId } = await response.json();
+  const { eventId, traceId }: { eventId: string; traceId: string } = JSON.parse(
+    await fetchFromWorker(`${workerUrl}/test-error`, 200),
+  );
 
   console.log(`Polling for error eventId ${eventId}: sentry trace view ${traceTarget(traceId)}`);
 
@@ -25,13 +26,12 @@ test('Sends a captured exception to Sentry', async () => {
 test('Sends an unhandled exception and its request span to Sentry', async () => {
   const traceId = randomBytes(16).toString('hex');
   const publicKey = new URL(process.env.E2E_TEST_DSN!).username;
-  const response = await fetch(`${workerUrl}/test-unhandled-error`, {
+  await fetchFromWorker(`${workerUrl}/test-unhandled-error`, 500, {
     headers: {
       'sentry-trace': `${traceId}-${randomBytes(8).toString('hex')}-1`,
       baggage: `sentry-trace_id=${traceId},sentry-public_key=${publicKey},sentry-sampled=true,sentry-sample_rate=1`,
     },
   });
-  expect(response.status).toBe(500);
 
   console.log(`Polling for unhandled error: sentry trace view ${traceTarget(traceId)}`);
 
@@ -40,9 +40,9 @@ test('Sends an unhandled exception and its request span to Sentry', async () =>
 });
 
 test('Sends a request span to Sentry', async () => {
-  const response = await fetch(`${workerUrl}/test-span`);
-  expect(response.status).toBe(200);
-  const { spanId, traceId } = await response.json();
+  const { spanId, traceId }: { spanId: string; traceId: string } = JSON.parse(
+    await fetchFromWorker(`${workerUrl}/test-span`, 200),
+  );
 
   console.log(`Polling for request spanId ${spanId}: sentry trace view ${traceTarget(traceId)}`);
 
@@ -52,9 +52,9 @@ test('Sends a request span to Sentry', async () => {
 });
 
 test('Sends the spans of Workflow steps before the Workflow goes to sleep', async () => {
-  const response = await fetch(`${workerUrl}/test-workflow-sleep`);
-  expect(response.status).toBe(200);
-  const { instanceId, traceId } = await response.json();
+  const { instanceId, traceId }: { instanceId: string; traceId: string } = JSON.parse(
+    await fetchFromWorker(`${workerUrl}/test-workflow-sleep`, 200),
+  );
 
   console.log(`Polling for the Workflow step spans: sentry trace view ${traceTarget(traceId)}`);
 
@@ -68,6 +68,8 @@ test('Sends the spans of Workflow steps before the Workflow goes to sleep', asyn
     )
     .toBe(3);
 
-  const { status } = await fetch(`${workerUrl}/test-workflow-status?id=${instanceId}`).then(res => res.json());
+  const { status }: { status: string } = JSON.parse(
+    await fetchFromWorker(`${workerUrl}/test-workflow-status?id=${instanceId}`, 200),
+  );
   expect(['running', 'waiting']).toContain(status);
 });
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tsconfig.node.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tsconfig.node.json
new file mode 100644
index 000000000000..657ecc4ef24a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/tsconfig.node.json
@@ -0,0 +1,7 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": ["tests/**/*", "deployed-worker.ts", "global-setup.ts", "global-teardown.ts", "playwright.config.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/wrangler.jsonc b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/wrangler.jsonc
index 351a68bd023f..d6b15b1dbf5e 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/wrangler.jsonc
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-send-to-sentry/wrangler.jsonc
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/wrangler/config-schema.json",
-  // Placeholder only: every test run deploys under a unique name, see global-setup.mjs.
+  // Placeholder only: every test run deploys under a unique name, see global-setup.ts.
   "name": "cloudflare-workers-send-to-sentry",
   "main": "src/index.ts",
   "compatibility_date": "2026-05-20",
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-static/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers-static/package.json
index 48a8d42b5a35..8a844eb74fc8 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-static/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-static/package.json
@@ -25,7 +25,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   },
   "pnpm": {
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers-workflow-legacy/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers-workflow-legacy/package.json
index d13053c80a6e..5f0e7973aaec 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers-workflow-legacy/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers-workflow-legacy/package.json
@@ -21,7 +21,6 @@
     "wrangler": "4.70.0"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
index 41caa28d08a2..e1889148b604 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
@@ -25,7 +25,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   },
   "pnpm": {
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workersentrypoint/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workersentrypoint/package.json
index f81bb3c8467a..56a59febe7f3 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workersentrypoint/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workersentrypoint/package.json
@@ -25,7 +25,6 @@
     "ws": "^8.18.3"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   },
   "pnpm": {
diff --git a/dev-packages/e2e-tests/test-applications/effect-4-browser/package.json b/dev-packages/e2e-tests/test-applications/effect-4-browser/package.json
index bccf0b94e6b3..f3f429c25b9f 100644
--- a/dev-packages/e2e-tests/test-applications/effect-4-browser/package.json
+++ b/dev-packages/e2e-tests/test-applications/effect-4-browser/package.json
@@ -37,7 +37,6 @@
     ]
   },
   "volta": {
-    "node": "22.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/effect-4-node/package.json b/dev-packages/e2e-tests/test-applications/effect-4-node/package.json
index b07fe4ad4756..460bfb57ec45 100644
--- a/dev-packages/e2e-tests/test-applications/effect-4-node/package.json
+++ b/dev-packages/e2e-tests/test-applications/effect-4-node/package.json
@@ -12,10 +12,10 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@effect/platform-node": "^4.0.0-beta.50",
+    "@effect/platform-node": "^4.0.0-rc.118",
     "@sentry/effect": "file:../../packed/sentry-effect-packed.tgz",
     "@types/node": "^18.19.1",
-    "effect": "^4.0.0-beta.50",
+    "effect": "^4.0.0-rc.118",
     "typescript": "~5.0.0"
   },
   "devDependencies": {
@@ -23,7 +23,6 @@
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },
   "volta": {
-    "node": "22.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/effect-4-node/src/app.ts b/dev-packages/e2e-tests/test-applications/effect-4-node/src/app.ts
index 4f3c7f2f3128..db5b1fae44eb 100644
--- a/dev-packages/e2e-tests/test-applications/effect-4-node/src/app.ts
+++ b/dev-packages/e2e-tests/test-applications/effect-4-node/src/app.ts
@@ -8,7 +8,7 @@ import * as Layer from 'effect/Layer';
 import * as Logger from 'effect/Logger';
 import * as Tracer from 'effect/Tracer';
 import * as References from 'effect/References';
-import { HttpRouter, HttpServerResponse } from 'effect/unstable/http';
+import { HttpRouter, HttpServerResponse } from 'effect/http';
 import { createServer } from 'http';
 
 const SentryLive = Layer.mergeAll(
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/lib/fragments.ts b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/lib/fragments.ts
index ccf430475620..e8639a6bfba7 100644
--- a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/lib/fragments.ts
+++ b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/lib/fragments.ts
@@ -102,73 +102,3 @@ export const CART_QUERY_FRAGMENT = `#graphql
     }
   }
 ` as const;
-
-const MENU_FRAGMENT = `#graphql
-  fragment MenuItem on MenuItem {
-    id
-    resourceId
-    tags
-    title
-    type
-    url
-  }
-  fragment ChildMenuItem on MenuItem {
-    ...MenuItem
-  }
-  fragment ParentMenuItem on MenuItem {
-    ...MenuItem
-    items {
-      ...ChildMenuItem
-    }
-  }
-  fragment Menu on Menu {
-    id
-    items {
-      ...ParentMenuItem
-    }
-  }
-` as const;
-
-export const HEADER_QUERY = `#graphql
-  fragment Shop on Shop {
-    id
-    name
-    description
-    primaryDomain {
-      url
-    }
-    brand {
-      logo {
-        image {
-          url
-        }
-      }
-    }
-  }
-  query Header(
-    $country: CountryCode
-    $headerMenuHandle: String!
-    $language: LanguageCode
-  ) @inContext(language: $language, country: $country) {
-    shop {
-      ...Shop
-    }
-    menu(handle: $headerMenuHandle) {
-      ...Menu
-    }
-  }
-  ${MENU_FRAGMENT}
-` as const;
-
-export const FOOTER_QUERY = `#graphql
-  query Footer(
-    $country: CountryCode
-    $footerMenuHandle: String!
-    $language: LanguageCode
-  ) @inContext(language: $language, country: $country) {
-    menu(handle: $footerMenuHandle) {
-      ...Menu
-    }
-  }
-  ${MENU_FRAGMENT}
-` as const;
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/root.tsx b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/root.tsx
index e45feb5dd576..4e3a2f362bdf 100644
--- a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/root.tsx
+++ b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/root.tsx
@@ -8,7 +8,6 @@ import {
   Scripts,
   ScrollRestoration,
 } from 'react-router';
-import { FOOTER_QUERY, HEADER_QUERY } from '~/lib/fragments';
 
 import { useNonce } from '@shopify/hydrogen';
 
@@ -56,17 +55,11 @@ export function links() {
 }
 
 export async function loader(args: LoaderFunctionArgs) {
-  // Start fetching non-critical data without blocking time to first byte
-  const deferredData = loadDeferredData(args);
-
-  // Await the critical data required to render initial state of the page
-  const criticalData = await loadCriticalData(args);
-
-  const { env } = args.context;
+  const { env, customerAccount, cart } = args.context;
 
   return {
-    ...deferredData,
-    ...criticalData,
+    cart: cart.get(),
+    isLoggedIn: customerAccount.isLoggedIn(),
     ENV: {
       sentryTrace: env.SENTRY_TRACE,
       sentryBaggage: env.SENTRY_BAGGAGE,
@@ -83,54 +76,6 @@ export async function loader(args: LoaderFunctionArgs) {
   };
 }
 
-/**
- * Load data necessary for rendering content above the fold. This is the critical data
- * needed to render the page. If it's unavailable, the whole page should 400 or 500 error.
- */
-async function loadCriticalData({ context }: LoaderFunctionArgs) {
-  const { storefront } = context;
-
-  const [header] = await Promise.all([
-    storefront.query(HEADER_QUERY, {
-      cache: storefront.CacheLong(),
-      variables: {
-        headerMenuHandle: 'main-menu', // Adjust to your header menu handle
-      },
-    }),
-    // Add other queries here, so that they are loaded in parallel
-  ]);
-
-  return { header };
-}
-
-/**
- * Load data for rendering content below the fold. This data is deferred and will be
- * fetched after the initial page load. If it's unavailable, the page should still 200.
- * Make sure to not throw any errors here, as it will cause the page to 500.
- */
-function loadDeferredData({ context }: LoaderFunctionArgs) {
-  const { storefront, customerAccount, cart } = context;
-
-  // defer the footer query (below the fold)
-  const footer = storefront
-    .query(FOOTER_QUERY, {
-      cache: storefront.CacheLong(),
-      variables: {
-        footerMenuHandle: 'footer', // Adjust to your footer menu handle
-      },
-    })
-    .catch((error: any) => {
-      // Log query errors, but don't throw them so the page can still render
-      console.error(error);
-      return null;
-    });
-  return {
-    cart: cart.get(),
-    isLoggedIn: customerAccount.isLoggedIn(),
-    footer,
-  };
-}
-
 export function Layout({ children }: { children?: React.ReactNode }) {
   const nonce = useNonce();
 
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/routes/action-error.tsx b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/routes/action-error.tsx
new file mode 100644
index 000000000000..083926e454ff
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/app/routes/action-error.tsx
@@ -0,0 +1,11 @@
+export async function action() {
+  throw new Error('Action Error');
+}
+
+export default function ActionError() {
+  return (
+    <div>
+      <h1>Action Error</h1>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/server.ts b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/server.ts
index 9bb5529320b6..74ef453d062b 100644
--- a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/server.ts
+++ b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/server.ts
@@ -9,7 +9,7 @@ import {
 import { type AppLoadContext, createRequestHandler, getStorefrontHeaders } from '@shopify/remix-oxygen';
 import { CART_QUERY_FRAGMENT } from '~/lib/fragments';
 import { AppSession } from '~/lib/session';
-import { wrapRequestHandler } from '@sentry/cloudflare/request';
+import { httpServerIntegration, wrapRequestHandler } from '@sentry/cloudflare/request';
 // Virtual entry point for the app
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-expect-error
@@ -38,6 +38,7 @@ export default {
           dsn: 'https://public@dsn.ingest.sentry.io/1337',
           tracesSampleRate: 1.0,
           tunnel: `http://localhost:3031/`, // proxy server
+          integrations: [httpServerIntegration({ maxRequestBodySize: 'small' })],
         },
         // Need to cast to any because this is not on cloudflare
         request: request as any,
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/tests/server-errors.test.ts b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/tests/server-errors.test.ts
new file mode 100644
index 000000000000..3b1030adacec
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/tests/server-errors.test.ts
@@ -0,0 +1,18 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Applies the options of `httpServerIntegration` imported from `@sentry/cloudflare/request`', async ({
+  request,
+}) => {
+  const errorPromise = waitForError('hydrogen-react-router-7', errorEvent => {
+    return errorEvent.exception?.values?.[0]?.value === 'Action Error';
+  });
+
+  const body = JSON.stringify({ payload: 'x'.repeat(4_000) });
+  await request.post('/action-error', { data: body, headers: { 'content-type': 'application/json' } });
+
+  const errorEvent = await errorPromise;
+
+  // `maxRequestBodySize: 'small'` truncates at 1,000 bytes, the default (`'medium'`) would keep the full body.
+  expect(errorEvent.request?.data).toBe(`${body.slice(0, 997)}...`);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/app/navigation/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/app/navigation/page.tsx
index 918c03de3d0a..21bdce977a7f 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/app/navigation/page.tsx
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/app/navigation/page.tsx
@@ -17,6 +17,15 @@ export default function Page() {
           router.push()
         </button>
       </li>
+      <li>
+        <button
+          onClick={() => {
+            router.push(`${window.location.origin}/my-app/navigation/42/router-push`);
+          }}
+        >
+          Absolute URL push
+        </button>
+      </li>
       <li>
         <Link href="/navigation/42/link">Normal Link</Link>
       </li>
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/tests/routing-basepath-span.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/tests/routing-basepath-span.test.ts
index fbdb962d4262..c3c62b908f2c 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/tests/routing-basepath-span.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15-basepath/tests/routing-basepath-span.test.ts
@@ -81,3 +81,21 @@ test('Creates a navigation span for basePath <Link> with prefix', async ({ page
 
   expect(await navigationSpanPromise).toBeDefined();
 });
+
+test('Does not prepend basePath to absolute router.push URLs', async ({ page }) => {
+  const navigationSpanPromise = waitForStreamedSpan('nextjs-15-basepath', span => {
+    return getSpanOp(span) === 'navigation' && span.is_segment;
+  });
+
+  await page.goto('/my-app/navigation');
+  await page.waitForTimeout(1000);
+  await page.getByText('Absolute URL push').click();
+
+  const navigationSpan = await navigationSpanPromise;
+
+  expect(navigationSpan.name).toBe('/my-app/navigation/:param/router-push');
+  expect(navigationSpan.attributes).toMatchObject({
+    'sentry.segment.name.source': { value: 'route', type: 'string' },
+    'url.path': { value: '/my-app/navigation/42/router-push', type: 'string' },
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/layout.tsx
new file mode 100644
index 000000000000..a61f15ee7e3f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/layout.tsx
@@ -0,0 +1,25 @@
+import type { ReactNode } from 'react';
+import { cacheLife } from 'next/cache';
+
+// The awaited param puts the request id into the cache key, so a fresh id is a guaranteed miss
+// and the entry cannot come from a build-time fill. `children` passes through as an uncached hole.
+export default async function CachedMidLayout({
+  children,
+  params,
+}: {
+  children: ReactNode;
+  params: Promise<{ id: string }>;
+}) {
+  'use cache';
+  cacheLife('hours');
+  const { id } = await params;
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <div data-testid="cached-mid-layout">
+      <p id="cached-layout-stamp">
+        {id}:{Date.now()}
+      </p>
+      {children}
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/page.tsx
new file mode 100644
index 000000000000..94196e6e5ee8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/page.tsx
@@ -0,0 +1,6 @@
+import { headers } from 'next/headers';
+
+export default async function Page() {
+  await headers();
+  return <p id="dynamic-leaf">Dynamic leaf: {Date.now()}</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout-cached-leaf/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout-cached-leaf/page.tsx
new file mode 100644
index 000000000000..8e7de36d156a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout-cached-leaf/page.tsx
@@ -0,0 +1,17 @@
+import { cacheLife } from 'next/cache';
+
+async function CachedLeaf({ id }: { id: string }) {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <p id="cached-leaf">
+      {id}:{Date.now()}
+    </p>
+  );
+}
+
+export default async function Page({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  return <CachedLeaf id={id} />;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout.tsx
new file mode 100644
index 000000000000..412587fd8f33
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout.tsx
@@ -0,0 +1,7 @@
+import type { ReactNode } from 'react';
+import { headers } from 'next/headers';
+
+export default async function DynamicLayout({ children }: { children: ReactNode }) {
+  await headers();
+  return <div data-testid="dynamic-layout">{children}</div>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/layout.tsx
new file mode 100644
index 000000000000..84a6395b39ac
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/layout.tsx
@@ -0,0 +1,11 @@
+import { Suspense, type ReactNode } from 'react';
+
+// The Suspense boundary lets the nested layouts/pages below use request APIs (`headers()`,
+// runtime params) without tripping the Cache Components prerender guards.
+export default function Layout({ children }: { children: ReactNode }) {
+  return (
+    <div data-testid="cached-nesting-group">
+      <Suspense fallback={<div>Loading...</div>}>{children}</Suspense>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/layout.tsx
new file mode 100644
index 000000000000..2b0b77b6e3a9
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/layout.tsx
@@ -0,0 +1,24 @@
+import type { ReactNode } from 'react';
+import { cacheLife } from 'next/cache';
+
+// Hard-expires after 2s while the page's cached component lives for hours, so one request can
+// refill the layout while hitting the component: two cached levels with different origin traces.
+export default async function ShortLivedLayout({
+  children,
+  params,
+}: {
+  children: ReactNode;
+  params: Promise<{ id: string }>;
+}) {
+  'use cache';
+  cacheLife({ revalidate: 1, expire: 2 });
+  const { id } = await params;
+  return (
+    <div data-testid="short-lived-layout">
+      <p id="layout-stamp">
+        {id}:{Date.now()}
+      </p>
+      {children}
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/page.tsx
new file mode 100644
index 000000000000..18913cbe9790
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/page.tsx
@@ -0,0 +1,19 @@
+import { headers } from 'next/headers';
+import { cacheLife } from 'next/cache';
+
+async function LongLivedComponent({ id }: { id: string }) {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <p id="component-stamp">
+      {id}:{Date.now()}
+    </p>
+  );
+}
+
+export default async function Page({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  await headers();
+  return <LongLivedComponent id={id} />;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/a/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/a/page.tsx
new file mode 100644
index 000000000000..ec8d5e21d947
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/a/page.tsx
@@ -0,0 +1,6 @@
+import { headers } from 'next/headers';
+
+export default async function Page() {
+  await headers();
+  return <p id="route-a">Route a: {Date.now()}</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/b/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/b/page.tsx
new file mode 100644
index 000000000000..9a1b84b2ca28
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/b/page.tsx
@@ -0,0 +1,6 @@
+import { headers } from 'next/headers';
+
+export default async function Page() {
+  await headers();
+  return <p id="route-b">Route b: {Date.now()}</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/layout.tsx
new file mode 100644
index 000000000000..220fdcf92ca8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/(cached-nesting)/shared-layout/[id]/layout.tsx
@@ -0,0 +1,24 @@
+import type { ReactNode } from 'react';
+import { cacheLife } from 'next/cache';
+
+// One cache entry (keyed by id) shared by the sibling routes `a` and `b` below.
+export default async function SharedLayout({
+  children,
+  params,
+}: {
+  children: ReactNode;
+  params: Promise<{ id: string }>;
+}) {
+  'use cache';
+  cacheLife('hours');
+  const { id } = await params;
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <div data-testid="shared-layout">
+      <p id="shared-layout-stamp">
+        {id}:{Date.now()}
+      </p>
+      {children}
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cached-sibling-components/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cached-sibling-components/page.tsx
new file mode 100644
index 000000000000..c8b8858f7785
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cached-sibling-components/page.tsx
@@ -0,0 +1,34 @@
+import { Suspense } from 'react';
+import { cacheLife } from 'next/cache';
+
+async function CachedSection({ id, label }: { id: string; label: string }) {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <section id={`cached-${label}`}>
+      {label}:{id}:{Date.now()}
+    </section>
+  );
+}
+
+async function DynamicContent({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  // Awaiting searchParams makes this hole dynamic, so every request renders it and consults the
+  // cache handler instead of serving prerendered output. The two sibling components cache as two
+  // separate entries (the props are part of the cache key).
+  const { id = 'default-id' } = await searchParams;
+  return (
+    <>
+      <CachedSection id={id} label="first" />
+      <CachedSection id={id} label="second" />
+    </>
+  );
+}
+
+export default function Page({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <DynamicContent searchParams={searchParams} />
+    </Suspense>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/nested-caches/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/nested-caches/page.tsx
new file mode 100644
index 000000000000..481d7e5e46e6
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/nested-caches/page.tsx
@@ -0,0 +1,33 @@
+import { Suspense } from 'react';
+import { cacheLife } from 'next/cache';
+
+async function getSlowChangingValue(id: string): Promise<{ id: string; createdAt: number }> {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return { id, createdAt: Date.now() };
+}
+
+async function ShortLivedSection({ id }: { id: string }) {
+  'use cache';
+  // The component entry hard-expires after 2s while the nested function entry lives on, so a
+  // delayed request refills the component and reads the nested entry as a hit inside that fill.
+  cacheLife({ revalidate: 1, expire: 2 });
+  const nested = await getSlowChangingValue(id);
+  return <div id="nested-data">{JSON.stringify({ ...nested, renderedAt: Date.now() })}</div>;
+}
+
+async function DynamicContent({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  // Awaiting searchParams makes this hole dynamic, so every request renders it and consults the
+  // cache handler instead of serving prerendered output.
+  const { id = 'default-id' } = await searchParams;
+  return <ShortLivedSection id={id} />;
+}
+
+export default function Page({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <DynamicContent searchParams={searchParams} />
+    </Suspense>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOrigin-pageloadConnection.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOrigin-pageloadConnection.spec.ts
new file mode 100644
index 000000000000..c182106f5d10
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOrigin-pageloadConnection.spec.ts
@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+// TODO: Remove the inverse assertion in cacheComponents.spec.ts ("Prerendered shell does not stitch the pageload onto a stale trace") when this test passes.
+test('connects the pageload trace to the runtime server request', async ({ page }) => {
+  test.fail();
+
+  // The shell is prerendered, but the page's dynamic part (`DynamicContent` awaits `headers()`)
+  // runs on the server on every request and produces the `GET /pageload-tracing` transaction.
+  // A fully prerendered page would produce no server transaction.
+  const serverTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.transaction === 'GET /pageload-tracing'
+    );
+  });
+
+  const pageloadTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === '/pageload-tracing';
+  });
+
+  await page.goto('/pageload-tracing');
+
+  await expect(page.locator('#todos-fetched')).toHaveText('Todos fetched: 5');
+
+  const [serverTx, pageloadTx] = await Promise.all([serverTxPromise, pageloadTxPromise]);
+
+  expect(serverTx.contexts?.trace?.trace_id).toBeTruthy();
+  expect(pageloadTx.contexts?.trace?.trace_id).toBe(serverTx.contexts?.trace?.trace_id);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-nesting.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-nesting.spec.ts
new file mode 100644
index 000000000000..5025d7d2e104
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-nesting.spec.ts
@@ -0,0 +1,221 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+// Origin links (`sentry.link.type: 'cache_origin'` on `cache.get` hit spans, pointing at the
+// filling `cache.put`) for `use cache` in nested layout trees under `app/(cached-nesting)/`.
+// Not implemented yet — every test is `test.fail()` with the final expected assertions.
+
+// A `use cache` layout between dynamic segments. The layout entry is keyed by the awaited [id]
+// param. If Next serves the entry from the prerendered shell (Resume Data Cache) instead of the
+// cache handlers, there is no `cache.get` span at all — then this stays failing until Next
+// exposes RDC reads.
+test('links a cached layout hit to the trace that filled the layout entry', async ({ request }) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /cached-mid-layout/[id]' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === false)
+    );
+  });
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /cached-mid-layout/[id]' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/cached-mid-layout/${id}`);
+  const missTx = await missTxPromise;
+
+  await request.get(`/cached-mid-layout/${id}`);
+  const hitTx = await hitTxPromise;
+
+  // The layout is the only cached entry on this route.
+  const putSpans = (missTx.spans ?? []).filter(span => span.op === 'cache.put');
+  expect(new Set(putSpans.map(span => span.description)).size).toBe(1);
+
+  const hitGetSpan = hitTx.spans?.find(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.description).toBe(putSpans[0]!.description);
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: missTx.contexts?.trace?.trace_id,
+      span_id: putSpans[0]!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
+
+// Inverse nesting: all layouts above are dynamic, only the leaf component is cached — the leaf
+// entry is the only span that carries a link.
+test('links a cached leaf component under dynamic layouts to the trace that filled the leaf entry', async ({
+  request,
+}) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /dynamic-layouts/[id]/layout-cached-leaf' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === false)
+    );
+  });
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /dynamic-layouts/[id]/layout-cached-leaf' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/dynamic-layouts/${id}/layout-cached-leaf`);
+  const missTx = await missTxPromise;
+
+  await request.get(`/dynamic-layouts/${id}/layout-cached-leaf`);
+  const hitTx = await hitTxPromise;
+
+  const putSpans = (missTx.spans ?? []).filter(span => span.op === 'cache.put');
+  expect(new Set(putSpans.map(span => span.description)).size).toBe(1);
+
+  const hitGetSpan = hitTx.spans?.find(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.description).toBe(putSpans[0]!.description);
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: missTx.contexts?.trace?.trace_id,
+      span_id: putSpans[0]!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
+
+// Nested levels with different lifetimes: after the layout expired, request 2 refills the layout
+// while the component still hits. Request 3 then hits both entries, and its two `cache.get`
+// spans point at two different origin traces.
+test('links two cached levels to different origin traces after the layout expires', async ({ request }) => {
+  test.skip(process.env.TEST_ENV !== 'production', 'Entries are only discarded at `expire` in production');
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const fillTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /mixed-lifetimes/[id]' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.put')
+    );
+  });
+
+  await request.get(`/mixed-lifetimes/${id}`);
+  const fillTx = await fillTxPromise;
+
+  // Layout + component entry.
+  const fillPutSpans = (fillTx.spans ?? []).filter(span => span.op === 'cache.put');
+  expect(new Set(fillPutSpans.map(span => span.description)).size).toBe(2);
+
+  // Sleep past the layout's `expire` (2s); the component entry stays valid for hours.
+  await new Promise(resolve => setTimeout(resolve, 3_000));
+
+  const refillTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /mixed-lifetimes/[id]' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.put') &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/mixed-lifetimes/${id}`);
+  const refillTx = await refillTxPromise;
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /mixed-lifetimes/[id]' &&
+      (transactionEvent.spans?.filter(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true).length ??
+        0) >= 2
+    );
+  });
+
+  await request.get(`/mixed-lifetimes/${id}`);
+  const hitTx = await hitTxPromise;
+
+  const layoutPutSpan = refillTx.spans?.find(span => span.op === 'cache.put');
+  expect(layoutPutSpan).toBeDefined();
+  const componentPutSpan = fillPutSpans.find(span => span.description !== layoutPutSpan!.description);
+  expect(componentPutSpan).toBeDefined();
+  expect(refillTx.contexts?.trace?.trace_id).not.toBe(fillTx.contexts?.trace?.trace_id);
+
+  const layoutHitSpan = hitTx.spans?.find(
+    span => span.op === 'cache.get' && span.description === layoutPutSpan!.description,
+  );
+  expect(layoutHitSpan?.links).toEqual([
+    {
+      trace_id: refillTx.contexts?.trace?.trace_id,
+      span_id: layoutPutSpan!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+
+  const componentHitSpan = hitTx.spans?.find(
+    span => span.op === 'cache.get' && span.description === componentPutSpan!.description,
+  );
+  expect(componentHitSpan?.links).toEqual([
+    {
+      trace_id: fillTx.contexts?.trace?.trace_id,
+      span_id: componentPutSpan!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
+
+// Routes `a` and `b` share one layout entry: a hit on `b` links to the fill trace of `a`, so the
+// origin is a different transaction than the serving one.
+test('links a shared layout hit on a sibling route to the trace of the route that filled the entry', async ({
+  request,
+}) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const fillTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /shared-layout/[id]/a' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.put')
+    );
+  });
+
+  await request.get(`/shared-layout/${id}/a`);
+  const fillTx = await fillTxPromise;
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /shared-layout/[id]/b' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/shared-layout/${id}/b`);
+  const hitTx = await hitTxPromise;
+
+  const putSpan = fillTx.spans?.find(span => span.op === 'cache.put');
+  expect(putSpan).toBeDefined();
+
+  const hitGetSpan = hitTx.spans?.find(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.description).toBe(putSpan!.description);
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: fillTx.contexts?.trace?.trace_id,
+      span_id: putSpan!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-page.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-page.spec.ts
new file mode 100644
index 000000000000..a0acf25df078
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-page.spec.ts
@@ -0,0 +1,117 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+// Origin links for `use cache` inside rendered pages (cached components and nested cached
+// functions). Target behavior: a cache hit records a `cache.get` span carrying a
+// `sentry.link.type: 'cache_origin'` span link to the `cache.put` span of the trace that filled
+// the entry. Not implemented yet — every test is `test.fail()`.
+
+// Two cached sibling components are two cache entries (props are part of the key), so one request
+// carries one `cache.get` hit span per section, each linking to its own fill. The components sit
+// in a dynamic hole: entries served from the prerendered shell (Resume Data Cache) never reach
+// the cache handlers and produce no spans until Next.js exposes RDC reads.
+test('links each sibling component hit to the fill of its own entry', async ({ request }) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /cached-sibling-components' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === false)
+    );
+  });
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /cached-sibling-components' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/cached-sibling-components?id=${id}`);
+  const missTx = await missTxPromise;
+
+  await request.get(`/cached-sibling-components?id=${id}`);
+  const hitTx = await hitTxPromise;
+
+  // Without span streaming, the key digest doubles as the span description, so it pairs a hit
+  // with the put that filled the same entry.
+  const putSpansByDigest = new Map(
+    (missTx.spans ?? []).filter(span => span.op === 'cache.put').map(span => [span.description, span] as const),
+  );
+  expect(putSpansByDigest.size).toBe(2);
+
+  const hitGetSpans = (hitTx.spans ?? []).filter(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true);
+  // Deduplicated by entry because dev mode can render (and therefore read) more than once.
+  expect(new Set(hitGetSpans.map(span => span.description)).size).toBe(2);
+
+  for (const hitSpan of hitGetSpans) {
+    const putSpan = putSpansByDigest.get(hitSpan.description);
+    expect(putSpan).toBeDefined();
+    expect(hitSpan.links).toEqual([
+      {
+        trace_id: missTx.contexts?.trace?.trace_id,
+        span_id: putSpan!.span_id,
+        sampled: true,
+        attributes: { 'sentry.link.type': 'cache_origin' },
+      },
+    ]);
+  }
+
+  // The two sections link to two different fill spans, not to one shared origin.
+  expect(new Set(hitGetSpans.map(span => span.links?.[0]?.span_id)).size).toBe(2);
+});
+
+test("links a nested cache hit inside another entry's refill to the original fill trace", async ({ request }) => {
+  test.skip(process.env.TEST_ENV !== 'production', 'Entries are only discarded at `expire` in production');
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /nested-caches' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.put')
+    );
+  });
+
+  await request.get(`/nested-caches?id=${id}`);
+  const missTx = await missTxPromise;
+
+  // Sleep past the component entry's hard `expire` limit (2s); the nested function entry
+  // (`cacheLife('hours')`) stays valid.
+  await new Promise(resolve => setTimeout(resolve, 3_000));
+
+  const refillTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /nested-caches' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/nested-caches?id=${id}`);
+  const refillTx = await refillTxPromise;
+
+  // The only hit is the nested function entry, read while the expired component entry refills.
+  const hitGetSpans = (refillTx.spans ?? []).filter(
+    span => span.op === 'cache.get' && span.data?.['cache.hit'] === true,
+  );
+  expect(hitGetSpans).toHaveLength(1);
+
+  const nestedPutSpan = missTx.spans?.find(
+    span => span.op === 'cache.put' && span.description === hitGetSpans[0]!.description,
+  );
+  expect(nestedPutSpan).toBeDefined();
+
+  // Even though the read happens inside the component's isolated fill context, the link still
+  // points at the trace that originally filled the nested entry.
+  expect(hitGetSpans[0]!.links).toEqual([
+    {
+      trace_id: missTx.contexts?.trace?.trace_id,
+      span_id: nestedPutSpan!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-routeHandler.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-routeHandler.spec.ts
new file mode 100644
index 000000000000..2f604f0402f3
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheOriginLinks-routeHandler.spec.ts
@@ -0,0 +1,112 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+// Origin links for `use cache` in route handlers. Target behavior: a cache hit records a
+// `cache.get` span carrying a `sentry.link.type: 'cache_origin'` span link to the `cache.put`
+// span of the trace that filled the entry; unknown origin means no link. Not implemented yet —
+// every test is `test.fail()`; shipping the feature should only require deleting those lines.
+
+test('links a route handler cache hit to the trace that filled the entry', async ({ request }) => {
+  test.fail();
+
+  // A fresh id makes the first request a guaranteed cache miss (the id is part of the cache key)
+  // even when the test is retried against the same server.
+  const id = crypto.randomUUID();
+
+  const missTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /api/use-cache' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === false)
+    );
+  });
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /api/use-cache' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/api/use-cache?id=${id}`);
+  const missTx = await missTxPromise;
+
+  await request.get(`/api/use-cache?id=${id}`);
+  const hitTx = await hitTxPromise;
+
+  const putSpan = missTx.spans?.find(span => span.op === 'cache.put');
+  expect(putSpan).toBeDefined();
+
+  // A miss has no origin, and the SDK never guesses one.
+  const missGetSpan = missTx.spans?.find(span => span.op === 'cache.get');
+  expect(missGetSpan?.links).toBeUndefined();
+  expect(putSpan?.links).toBeUndefined();
+
+  const hitGetSpan = hitTx.spans?.find(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: missTx.contexts?.trace?.trace_id,
+      span_id: putSpan!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
+
+test('moves the origin link to the refill trace after the entry expires', async ({ request }) => {
+  test.skip(process.env.TEST_ENV !== 'production', 'Entries are only discarded at `expire` in production');
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const fillTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /api/use-cache-expiring' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.put')
+    );
+  });
+
+  await request.get(`/api/use-cache-expiring?id=${id}`);
+  const fillTx = await fillTxPromise;
+
+  // Sleep past the entry's hard `expire` limit (2s), so the next read must discard and refill it.
+  await new Promise(resolve => setTimeout(resolve, 3_000));
+
+  // Registered after the fill transaction was consumed, so it only matches the refill.
+  const refillTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /api/use-cache-expiring' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.put')
+    );
+  });
+
+  await request.get(`/api/use-cache-expiring?id=${id}`);
+  const refillTx = await refillTxPromise;
+
+  const hitTxPromise = waitForTransaction('nextjs-16-cacheComponents', transactionEvent => {
+    return (
+      transactionEvent.transaction === 'GET /api/use-cache-expiring' &&
+      !!transactionEvent.spans?.some(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true)
+    );
+  });
+
+  await request.get(`/api/use-cache-expiring?id=${id}`);
+  const hitTx = await hitTxPromise;
+
+  expect(refillTx.contexts?.trace?.trace_id).not.toBe(fillTx.contexts?.trace?.trace_id);
+
+  const refillPutSpan = refillTx.spans?.find(span => span.op === 'cache.put');
+  expect(refillPutSpan).toBeDefined();
+
+  // The hit read the refilled entry, so the link points at the refill trace, not the first fill.
+  const hitGetSpan = hitTx.spans?.find(span => span.op === 'cache.get' && span.data?.['cache.hit'] === true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: refillTx.contexts?.trace?.trace_id,
+      span_id: refillPutSpan!.span_id,
+      sampled: true,
+      attributes: { 'sentry.link.type': 'cache_origin' },
+    },
+  ]);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/layout.tsx
new file mode 100644
index 000000000000..a61f15ee7e3f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/layout.tsx
@@ -0,0 +1,25 @@
+import type { ReactNode } from 'react';
+import { cacheLife } from 'next/cache';
+
+// The awaited param puts the request id into the cache key, so a fresh id is a guaranteed miss
+// and the entry cannot come from a build-time fill. `children` passes through as an uncached hole.
+export default async function CachedMidLayout({
+  children,
+  params,
+}: {
+  children: ReactNode;
+  params: Promise<{ id: string }>;
+}) {
+  'use cache';
+  cacheLife('hours');
+  const { id } = await params;
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <div data-testid="cached-mid-layout">
+      <p id="cached-layout-stamp">
+        {id}:{Date.now()}
+      </p>
+      {children}
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/page.tsx
new file mode 100644
index 000000000000..94196e6e5ee8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/cached-mid-layout/[id]/page.tsx
@@ -0,0 +1,6 @@
+import { headers } from 'next/headers';
+
+export default async function Page() {
+  await headers();
+  return <p id="dynamic-leaf">Dynamic leaf: {Date.now()}</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout-cached-leaf/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout-cached-leaf/page.tsx
new file mode 100644
index 000000000000..8e7de36d156a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout-cached-leaf/page.tsx
@@ -0,0 +1,17 @@
+import { cacheLife } from 'next/cache';
+
+async function CachedLeaf({ id }: { id: string }) {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <p id="cached-leaf">
+      {id}:{Date.now()}
+    </p>
+  );
+}
+
+export default async function Page({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  return <CachedLeaf id={id} />;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout.tsx
new file mode 100644
index 000000000000..412587fd8f33
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/dynamic-layouts/[id]/layout.tsx
@@ -0,0 +1,7 @@
+import type { ReactNode } from 'react';
+import { headers } from 'next/headers';
+
+export default async function DynamicLayout({ children }: { children: ReactNode }) {
+  await headers();
+  return <div data-testid="dynamic-layout">{children}</div>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/layout.tsx
new file mode 100644
index 000000000000..84a6395b39ac
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/layout.tsx
@@ -0,0 +1,11 @@
+import { Suspense, type ReactNode } from 'react';
+
+// The Suspense boundary lets the nested layouts/pages below use request APIs (`headers()`,
+// runtime params) without tripping the Cache Components prerender guards.
+export default function Layout({ children }: { children: ReactNode }) {
+  return (
+    <div data-testid="cached-nesting-group">
+      <Suspense fallback={<div>Loading...</div>}>{children}</Suspense>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/layout.tsx
new file mode 100644
index 000000000000..2b0b77b6e3a9
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/layout.tsx
@@ -0,0 +1,24 @@
+import type { ReactNode } from 'react';
+import { cacheLife } from 'next/cache';
+
+// Hard-expires after 2s while the page's cached component lives for hours, so one request can
+// refill the layout while hitting the component: two cached levels with different origin traces.
+export default async function ShortLivedLayout({
+  children,
+  params,
+}: {
+  children: ReactNode;
+  params: Promise<{ id: string }>;
+}) {
+  'use cache';
+  cacheLife({ revalidate: 1, expire: 2 });
+  const { id } = await params;
+  return (
+    <div data-testid="short-lived-layout">
+      <p id="layout-stamp">
+        {id}:{Date.now()}
+      </p>
+      {children}
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/page.tsx
new file mode 100644
index 000000000000..18913cbe9790
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/mixed-lifetimes/[id]/page.tsx
@@ -0,0 +1,19 @@
+import { headers } from 'next/headers';
+import { cacheLife } from 'next/cache';
+
+async function LongLivedComponent({ id }: { id: string }) {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <p id="component-stamp">
+      {id}:{Date.now()}
+    </p>
+  );
+}
+
+export default async function Page({ params }: { params: Promise<{ id: string }> }) {
+  const { id } = await params;
+  await headers();
+  return <LongLivedComponent id={id} />;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/a/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/a/page.tsx
new file mode 100644
index 000000000000..ec8d5e21d947
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/a/page.tsx
@@ -0,0 +1,6 @@
+import { headers } from 'next/headers';
+
+export default async function Page() {
+  await headers();
+  return <p id="route-a">Route a: {Date.now()}</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/b/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/b/page.tsx
new file mode 100644
index 000000000000..9a1b84b2ca28
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/b/page.tsx
@@ -0,0 +1,6 @@
+import { headers } from 'next/headers';
+
+export default async function Page() {
+  await headers();
+  return <p id="route-b">Route b: {Date.now()}</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/layout.tsx
new file mode 100644
index 000000000000..220fdcf92ca8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/(cached-nesting)/shared-layout/[id]/layout.tsx
@@ -0,0 +1,24 @@
+import type { ReactNode } from 'react';
+import { cacheLife } from 'next/cache';
+
+// One cache entry (keyed by id) shared by the sibling routes `a` and `b` below.
+export default async function SharedLayout({
+  children,
+  params,
+}: {
+  children: ReactNode;
+  params: Promise<{ id: string }>;
+}) {
+  'use cache';
+  cacheLife('hours');
+  const { id } = await params;
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <div data-testid="shared-layout">
+      <p id="shared-layout-stamp">
+        {id}:{Date.now()}
+      </p>
+      {children}
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/api/use-cache-expiring/route.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/api/use-cache-expiring/route.ts
new file mode 100644
index 000000000000..ca237ca4785f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/api/use-cache-expiring/route.ts
@@ -0,0 +1,14 @@
+import { cacheLife } from 'next/cache';
+import type { NextRequest } from 'next/server';
+
+async function getExpiringValue(id: string): Promise<{ id: string; createdAt: number }> {
+  'use cache';
+  // Hard-expires after 2 seconds, so a delayed second request exercises the expired-entry path.
+  cacheLife({ revalidate: 1, expire: 2 });
+  return { id, createdAt: Date.now() };
+}
+
+export async function GET(request: NextRequest) {
+  const id = request.nextUrl.searchParams.get('id') ?? 'default-id';
+  return Response.json(await getExpiringValue(id));
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/api/use-cache/route.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/api/use-cache/route.ts
new file mode 100644
index 000000000000..dd5f63024523
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/api/use-cache/route.ts
@@ -0,0 +1,18 @@
+import { cacheLife, cacheTag } from 'next/cache';
+import type { NextRequest } from 'next/server';
+
+async function getCachedValue(id: string): Promise<{ id: string; createdAt: number }> {
+  'use cache';
+  // The 'hours' profile has a finite `expire` (1 day), so the entry carries a real TTL.
+  cacheLife('hours');
+  cacheTag('e2e-use-cache-tag');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return { id, createdAt: Date.now() };
+}
+
+export async function GET(request: NextRequest) {
+  // The id ends up in the cache key (it is an argument of the cached function), so tests get a
+  // guaranteed cache miss by passing a fresh id.
+  const id = request.nextUrl.searchParams.get('id') ?? 'default-id';
+  return Response.json(await getCachedValue(id));
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/cached-sibling-components/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/cached-sibling-components/page.tsx
new file mode 100644
index 000000000000..c8b8858f7785
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/cached-sibling-components/page.tsx
@@ -0,0 +1,34 @@
+import { Suspense } from 'react';
+import { cacheLife } from 'next/cache';
+
+async function CachedSection({ id, label }: { id: string; label: string }) {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return (
+    <section id={`cached-${label}`}>
+      {label}:{id}:{Date.now()}
+    </section>
+  );
+}
+
+async function DynamicContent({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  // Awaiting searchParams makes this hole dynamic, so every request renders it and consults the
+  // cache handler instead of serving prerendered output. The two sibling components cache as two
+  // separate entries (the props are part of the cache key).
+  const { id = 'default-id' } = await searchParams;
+  return (
+    <>
+      <CachedSection id={id} label="first" />
+      <CachedSection id={id} label="second" />
+    </>
+  );
+}
+
+export default function Page({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <DynamicContent searchParams={searchParams} />
+    </Suspense>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/nested-caches/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/nested-caches/page.tsx
new file mode 100644
index 000000000000..481d7e5e46e6
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/app/nested-caches/page.tsx
@@ -0,0 +1,33 @@
+import { Suspense } from 'react';
+import { cacheLife } from 'next/cache';
+
+async function getSlowChangingValue(id: string): Promise<{ id: string; createdAt: number }> {
+  'use cache';
+  cacheLife('hours');
+  await new Promise(resolve => setTimeout(resolve, 100));
+  return { id, createdAt: Date.now() };
+}
+
+async function ShortLivedSection({ id }: { id: string }) {
+  'use cache';
+  // The component entry hard-expires after 2s while the nested function entry lives on, so a
+  // delayed request refills the component and reads the nested entry as a hit inside that fill.
+  cacheLife({ revalidate: 1, expire: 2 });
+  const nested = await getSlowChangingValue(id);
+  return <div id="nested-data">{JSON.stringify({ ...nested, renderedAt: Date.now() })}</div>;
+}
+
+async function DynamicContent({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  // Awaiting searchParams makes this hole dynamic, so every request renders it and consults the
+  // cache handler instead of serving prerendered output.
+  const { id = 'default-id' } = await searchParams;
+  return <ShortLivedSection id={id} />;
+}
+
+export default function Page({ searchParams }: { searchParams: Promise<{ id?: string }> }) {
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <DynamicContent searchParams={searchParams} />
+    </Suspense>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOrigin-pageloadConnection.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOrigin-pageloadConnection.spec.ts
new file mode 100644
index 000000000000..efc35fd92c3d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOrigin-pageloadConnection.spec.ts
@@ -0,0 +1,27 @@
+import { expect, test } from '@playwright/test';
+import { getSpanOp, waitForStreamedSpan } from '@sentry-internal/test-utils';
+
+// TODO: Remove the inverse assertion in cacheComponents.spec.ts ("Prerendered shell does not stitch the pageload onto a stale trace") when this test passes.
+test('connects the pageload trace to the runtime server request', async ({ page }) => {
+  test.fail();
+
+  // The shell is prerendered, but the page's dynamic part (`DynamicContent` awaits `headers()`)
+  // runs on the server on every request and produces the `GET /pageload-tracing` root span.
+  // A fully prerendered page would produce no server span.
+  const serverSpanPromise = waitForStreamedSpan('nextjs-16-streaming-cacheComponents', span => {
+    return span.name === 'GET /pageload-tracing' && getSpanOp(span) === 'http.server' && span.is_segment;
+  });
+
+  const pageloadSpanPromise = waitForStreamedSpan('nextjs-16-streaming-cacheComponents', span => {
+    return span.name === '/pageload-tracing' && getSpanOp(span) === 'pageload' && span.is_segment;
+  });
+
+  await page.goto('/pageload-tracing');
+
+  await expect(page.locator('#todos-fetched')).toHaveText('Todos fetched: 5');
+
+  const [serverSpan, pageloadSpan] = await Promise.all([serverSpanPromise, pageloadSpanPromise]);
+
+  expect(serverSpan.trace_id).toBeTruthy();
+  expect(pageloadSpan.trace_id).toBe(serverSpan.trace_id);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-nesting.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-nesting.spec.ts
new file mode 100644
index 000000000000..d456686f24ec
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-nesting.spec.ts
@@ -0,0 +1,226 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import { CACHE_ORIGIN_LINK_ATTRIBUTES, findCacheSpan } from './cacheOriginLinks-utils';
+
+// Origin links (`sentry.link.type: 'cache_origin'` on `cache.get` hit spans, pointing at the
+// filling `cache.put`) for `use cache` in nested layout trees under `app/(cached-nesting)/`.
+// Not implemented yet — every test is `test.fail()` with the final expected assertions.
+
+// A `use cache` layout between dynamic segments. The layout entry is keyed by the awaited [id]
+// param. If Next serves the entry from the prerendered shell (Resume Data Cache) instead of the
+// cache handlers, there is no `cache.get` span at all — then this stays failing until Next
+// exposes RDC reads.
+test('links a cached layout hit to the trace that filled the layout entry', async ({ request }) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /cached-mid-layout/[id]' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put')
+    );
+  });
+
+  await request.get(`/cached-mid-layout/${id}`);
+  const missSpans = await missSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /cached-mid-layout/[id]' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/cached-mid-layout/${id}`);
+  const hitSpans = await hitSpansPromise;
+
+  // The layout is the only cached entry on this route.
+  const putSpan = findCacheSpan(missSpans, 'cache.put');
+  expect(putSpan).toBeDefined();
+
+  const hitGetSpan = findCacheSpan(hitSpans, 'cache.get', true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan!.attributes['cache.key']).toEqual(putSpan!.attributes['cache.key']);
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: putSpan!.trace_id,
+      span_id: putSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
+
+// Inverse nesting: all layouts above are dynamic, only the leaf component is cached — the leaf
+// entry is the only span that carries a link.
+test('links a cached leaf component under dynamic layouts to the trace that filled the leaf entry', async ({
+  request,
+}) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /dynamic-layouts/[id]/layout-cached-leaf' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put')
+    );
+  });
+
+  await request.get(`/dynamic-layouts/${id}/layout-cached-leaf`);
+  const missSpans = await missSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /dynamic-layouts/[id]/layout-cached-leaf' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/dynamic-layouts/${id}/layout-cached-leaf`);
+  const hitSpans = await hitSpansPromise;
+
+  const putSpan = findCacheSpan(missSpans, 'cache.put');
+  expect(putSpan).toBeDefined();
+
+  const hitGetSpan = findCacheSpan(hitSpans, 'cache.get', true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan!.attributes['cache.key']).toEqual(putSpan!.attributes['cache.key']);
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: putSpan!.trace_id,
+      span_id: putSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
+
+// Nested levels with different lifetimes: after the layout expired, request 2 refills the layout
+// while the component still hits. Request 3 then hits both entries, and its two `cache.get`
+// spans point at two different origin traces.
+test('links two cached levels to different origin traces after the layout expires', async ({ request }) => {
+  test.skip(process.env.TEST_ENV !== 'production', 'Entries are only discarded at `expire` in production');
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const fillSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /mixed-lifetimes/[id]' && span.is_segment) &&
+      spansOfTrace.filter(span => getSpanOp(span) === 'cache.put').length >= 2
+    );
+  });
+
+  await request.get(`/mixed-lifetimes/${id}`);
+  const fillSpans = await fillSpansPromise;
+
+  // Layout + component entry.
+  const fillPutSpans = fillSpans.filter(span => getSpanOp(span) === 'cache.put');
+  expect(new Set(fillPutSpans.map(span => JSON.stringify(span.attributes['cache.key']?.value))).size).toBe(2);
+
+  // Sleep past the layout's `expire` (2s); the component entry stays valid for hours.
+  await new Promise(resolve => setTimeout(resolve, 3_000));
+
+  const refillSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /mixed-lifetimes/[id]' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put') &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/mixed-lifetimes/${id}`);
+  const refillSpans = await refillSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /mixed-lifetimes/[id]' && span.is_segment) &&
+      spansOfTrace.filter(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+        .length >= 2
+    );
+  });
+
+  await request.get(`/mixed-lifetimes/${id}`);
+  const hitSpans = await hitSpansPromise;
+
+  const layoutPutSpan = findCacheSpan(refillSpans, 'cache.put');
+  expect(layoutPutSpan).toBeDefined();
+  const layoutKey = JSON.stringify(layoutPutSpan!.attributes['cache.key']?.value);
+  const componentPutSpan = fillPutSpans.find(span => JSON.stringify(span.attributes['cache.key']?.value) !== layoutKey);
+  expect(componentPutSpan).toBeDefined();
+  expect(layoutPutSpan!.trace_id).not.toBe(componentPutSpan!.trace_id);
+
+  const layoutHitSpan = hitSpans.find(
+    span => getSpanOp(span) === 'cache.get' && JSON.stringify(span.attributes['cache.key']?.value) === layoutKey,
+  );
+  expect(layoutHitSpan?.links).toEqual([
+    {
+      trace_id: layoutPutSpan!.trace_id,
+      span_id: layoutPutSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+
+  const componentHitSpan = hitSpans.find(
+    span =>
+      getSpanOp(span) === 'cache.get' &&
+      JSON.stringify(span.attributes['cache.key']?.value) ===
+        JSON.stringify(componentPutSpan!.attributes['cache.key']?.value),
+  );
+  expect(componentHitSpan?.links).toEqual([
+    {
+      trace_id: componentPutSpan!.trace_id,
+      span_id: componentPutSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
+
+// Routes `a` and `b` share one layout entry: a hit on `b` links to the fill trace of `a`, so the
+// origin is a different transaction than the serving one.
+test('links a shared layout hit on a sibling route to the trace of the route that filled the entry', async ({
+  request,
+}) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const fillSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /shared-layout/[id]/a' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put')
+    );
+  });
+
+  await request.get(`/shared-layout/${id}/a`);
+  const fillSpans = await fillSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /shared-layout/[id]/b' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/shared-layout/${id}/b`);
+  const hitSpans = await hitSpansPromise;
+
+  const putSpan = findCacheSpan(fillSpans, 'cache.put');
+  expect(putSpan).toBeDefined();
+
+  const hitGetSpan = findCacheSpan(hitSpans, 'cache.get', true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan!.attributes['cache.key']).toEqual(putSpan!.attributes['cache.key']);
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: putSpan!.trace_id,
+      span_id: putSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-page.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-page.spec.ts
new file mode 100644
index 000000000000..fd8a86a5c848
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-page.spec.ts
@@ -0,0 +1,125 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import { CACHE_ORIGIN_LINK_ATTRIBUTES } from './cacheOriginLinks-utils';
+
+// Origin links for `use cache` inside rendered pages (cached components and nested cached
+// functions). Target behavior: a cache hit records a `cache.get` span carrying a
+// `sentry.link.type: 'cache_origin'` span link to the `cache.put` span of the trace that filled
+// the entry. Not implemented yet — every test is `test.fail()`.
+
+// Two cached sibling components are two cache entries (props are part of the key), so one request
+// carries one `cache.get` hit span per section, each linking to its own fill. The components sit
+// in a dynamic hole: entries served from the prerendered shell (Resume Data Cache) never reach
+// the cache handlers and produce no spans until Next.js exposes RDC reads.
+test('links each sibling component hit to the fill of its own entry', async ({ request }) => {
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /cached-sibling-components' && span.is_segment) &&
+      spansOfTrace.filter(span => getSpanOp(span) === 'cache.put').length >= 2
+    );
+  });
+
+  await request.get(`/cached-sibling-components?id=${id}`);
+  const missSpans = await missSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /cached-sibling-components' && span.is_segment) &&
+      spansOfTrace.filter(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+        .length >= 2
+    );
+  });
+
+  await request.get(`/cached-sibling-components?id=${id}`);
+  const hitSpans = await hitSpansPromise;
+
+  // The key digest (`cache.key`) pairs a hit with the put that filled the same entry.
+  const putSpansByKey = new Map(
+    missSpans
+      .filter(span => getSpanOp(span) === 'cache.put')
+      .map(span => [JSON.stringify(span.attributes['cache.key']?.value), span] as const),
+  );
+  expect(putSpansByKey.size).toBe(2);
+
+  const hitGetSpans = hitSpans.filter(
+    span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true,
+  );
+  // Deduplicated by entry because dev mode can render (and therefore read) more than once.
+  expect(new Set(hitGetSpans.map(span => JSON.stringify(span.attributes['cache.key']?.value))).size).toBe(2);
+
+  for (const hitSpan of hitGetSpans) {
+    const putSpan = putSpansByKey.get(JSON.stringify(hitSpan.attributes['cache.key']?.value));
+    expect(putSpan).toBeDefined();
+    expect(hitSpan.links).toEqual([
+      {
+        trace_id: putSpan!.trace_id,
+        span_id: putSpan!.span_id,
+        sampled: true,
+        attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+      },
+    ]);
+  }
+
+  // The two sections link to two different fill spans, not to one shared origin.
+  expect(new Set(hitGetSpans.map(span => span.links?.[0]?.span_id)).size).toBe(2);
+});
+
+test("links a nested cache hit inside another entry's refill to the original fill trace", async ({ request }) => {
+  test.skip(process.env.TEST_ENV !== 'production', 'Entries are only discarded at `expire` in production');
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const missSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /nested-caches' && span.is_segment) &&
+      spansOfTrace.filter(span => getSpanOp(span) === 'cache.put').length >= 2
+    );
+  });
+
+  await request.get(`/nested-caches?id=${id}`);
+  const missSpans = await missSpansPromise;
+
+  // Sleep past the component entry's hard `expire` limit (2s); the nested function entry
+  // (`cacheLife('hours')`) stays valid.
+  await new Promise(resolve => setTimeout(resolve, 3_000));
+
+  const refillSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /nested-caches' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/nested-caches?id=${id}`);
+  const refillSpans = await refillSpansPromise;
+
+  // The only hit is the nested function entry, read while the expired component entry refills.
+  const hitGetSpans = refillSpans.filter(
+    span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true,
+  );
+  expect(hitGetSpans).toHaveLength(1);
+
+  const nestedPutSpan = missSpans.find(
+    span =>
+      getSpanOp(span) === 'cache.put' &&
+      JSON.stringify(span.attributes['cache.key']?.value) ===
+        JSON.stringify(hitGetSpans[0]!.attributes['cache.key']?.value),
+  );
+  expect(nestedPutSpan).toBeDefined();
+
+  // Even though the read happens inside the component's isolated fill context, the link still
+  // points at the trace that originally filled the nested entry.
+  expect(hitGetSpans[0]!.links).toEqual([
+    {
+      trace_id: nestedPutSpan!.trace_id,
+      span_id: nestedPutSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-routeHandler.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-routeHandler.spec.ts
new file mode 100644
index 000000000000..09148406915d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-routeHandler.spec.ts
@@ -0,0 +1,113 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import { CACHE_ORIGIN_LINK_ATTRIBUTES, findCacheSpan } from './cacheOriginLinks-utils';
+
+// Origin links for `use cache` in route handlers. Target behavior: a cache hit records a
+// `cache.get` span carrying a `sentry.link.type: 'cache_origin'` span link to the `cache.put`
+// span of the trace that filled the entry; unknown origin means no link. Not implemented yet —
+// every test is `test.fail()`; shipping the feature should only require deleting those lines.
+
+test('links a route handler cache hit to the trace that filled the entry', async ({ request }) => {
+  test.fail();
+
+  // A fresh id makes the first request a guaranteed cache miss (the id is part of the cache key)
+  // even when the test is retried against the same server.
+  const id = crypto.randomUUID();
+
+  const missSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /api/use-cache' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put')
+    );
+  });
+
+  await request.get(`/api/use-cache?id=${id}`);
+  const missSpans = await missSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /api/use-cache' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/api/use-cache?id=${id}`);
+  const hitSpans = await hitSpansPromise;
+
+  const putSpan = findCacheSpan(missSpans, 'cache.put');
+  expect(putSpan).toBeDefined();
+
+  // A miss has no origin, and the SDK never guesses one.
+  const missGetSpan = findCacheSpan(missSpans, 'cache.get', false);
+  expect(missGetSpan?.links).toBeUndefined();
+  expect(putSpan?.links).toBeUndefined();
+
+  const hitGetSpan = findCacheSpan(hitSpans, 'cache.get', true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: putSpan!.trace_id,
+      span_id: putSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
+
+test('moves the origin link to the refill trace after the entry expires', async ({ request }) => {
+  test.skip(process.env.TEST_ENV !== 'production', 'Entries are only discarded at `expire` in production');
+  test.fail();
+
+  const id = crypto.randomUUID();
+
+  const fillSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /api/use-cache-expiring' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put')
+    );
+  });
+
+  await request.get(`/api/use-cache-expiring?id=${id}`);
+  const fillSpans = await fillSpansPromise;
+
+  // Sleep past the entry's hard `expire` limit (2s), so the next read must discard and refill it.
+  await new Promise(resolve => setTimeout(resolve, 3_000));
+
+  // Registered after the fill trace was consumed, so it only matches the refill.
+  const refillSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /api/use-cache-expiring' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.put') &&
+      spansOfTrace.every(span => span.trace_id !== fillSpans[0]!.trace_id)
+    );
+  });
+
+  await request.get(`/api/use-cache-expiring?id=${id}`);
+  const refillSpans = await refillSpansPromise;
+
+  const hitSpansPromise = collectStreamedSpans('nextjs-16-streaming-cacheComponents', spansOfTrace => {
+    return (
+      spansOfTrace.some(span => span.name === 'GET /api/use-cache-expiring' && span.is_segment) &&
+      spansOfTrace.some(span => getSpanOp(span) === 'cache.get' && span.attributes['cache.hit']?.value === true)
+    );
+  });
+
+  await request.get(`/api/use-cache-expiring?id=${id}`);
+  const hitSpans = await hitSpansPromise;
+
+  const refillPutSpan = findCacheSpan(refillSpans, 'cache.put');
+  expect(refillPutSpan).toBeDefined();
+  expect(refillPutSpan!.trace_id).not.toBe(fillSpans[0]!.trace_id);
+
+  // The hit read the refilled entry, so the link points at the refill trace, not the first fill.
+  const hitGetSpan = findCacheSpan(hitSpans, 'cache.get', true);
+  expect(hitGetSpan).toBeDefined();
+  expect(hitGetSpan?.links).toEqual([
+    {
+      trace_id: refillPutSpan!.trace_id,
+      span_id: refillPutSpan!.span_id,
+      sampled: true,
+      attributes: CACHE_ORIGIN_LINK_ATTRIBUTES,
+    },
+  ]);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-utils.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-utils.ts
new file mode 100644
index 000000000000..d43ce40324fb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-streaming-cacheComponents/tests/cacheOriginLinks-utils.ts
@@ -0,0 +1,16 @@
+import type { SerializedStreamedSpan } from '@sentry-internal/test-utils';
+import { getSpanOp } from '@sentry-internal/test-utils';
+
+export const CACHE_ORIGIN_LINK_ATTRIBUTES = {
+  'sentry.link.type': { value: 'cache_origin', type: 'string' },
+};
+
+export function findCacheSpan(
+  spans: SerializedStreamedSpan[],
+  op: 'cache.get' | 'cache.put',
+  hit?: boolean,
+): SerializedStreamedSpan | undefined {
+  return spans.find(
+    span => getSpanOp(span) === op && (hit === undefined || span.attributes['cache.hit']?.value === hit),
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/instrument.mjs b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/instrument.mjs
new file mode 100644
index 000000000000..f3dd95215d03
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/instrument.mjs
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  debug: !!process.env.DEBUG,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1,
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/package.json b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/package.json
new file mode 100644
index 000000000000..d82b94ec77f4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "node-express-mcp-v1-app",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "build": "tsc",
+    "start": "node --import ./instrument.mjs dist/app.js",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.26.0",
+    "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+    "@types/express": "^4.17.21",
+    "@types/node": "^18.19.1",
+    "express": "^4.21.2",
+    "typescript": "~5.0.0",
+    "zod": "~3.25.0"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.63.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+  },
+  "type": "module",
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "optional": true
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/playwright.config.mjs
new file mode 100644
index 000000000000..31f2b913b58b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/playwright.config.mjs
@@ -0,0 +1,7 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/src/app.ts b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/src/app.ts
new file mode 100644
index 000000000000..3ed8df4a040a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/src/app.ts
@@ -0,0 +1,17 @@
+import * as Sentry from '@sentry/node';
+import express from 'express';
+import { mcpRouter } from './mcp.js';
+
+const app = express();
+const port = 3030;
+
+app.use(express.json());
+app.use(mcpRouter);
+
+app.get('/test-success', function (_req, res) {
+  res.send({ version: 'v1' });
+});
+
+app.listen(port, () => {
+  console.log(`Example app listening on port ${port}`);
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/src/mcp.ts b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/src/mcp.ts
new file mode 100644
index 000000000000..c1a9dfea3622
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/src/mcp.ts
@@ -0,0 +1,120 @@
+import { randomUUID } from 'node:crypto';
+import express from 'express';
+import { McpServer, ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import { z } from 'zod';
+
+const mcpRouter = express.Router();
+
+// Intentionally NOT wrapped with `wrapMcpServerWithSentry`: the `mcpServer` integration
+// auto-instruments the `McpServer` constructor, so spans must be produced anyway.
+const server = new McpServer({
+  name: 'Echo-V1',
+  version: '1.0.0',
+});
+
+server.registerResource(
+  'echo',
+  new ResourceTemplate('echo://{message}', { list: undefined }),
+  { title: 'Echo Resource' },
+  async (uri, { message }) => ({
+    contents: [
+      {
+        uri: uri.href,
+        text: `Resource echo: ${message}`,
+      },
+    ],
+  }),
+);
+
+server.registerTool(
+  'echo',
+  { description: 'Echo tool', inputSchema: { message: z.string() } },
+  async ({ message }) => ({
+    content: [{ type: 'text', text: `Tool echo: ${message}` }],
+  }),
+);
+
+server.registerPrompt('echo', { description: 'Echo prompt', argsSchema: { message: z.string() } }, ({ message }) => ({
+  messages: [
+    {
+      role: 'user',
+      content: {
+        type: 'text',
+        text: `Please process this message: ${message}`,
+      },
+    },
+  ],
+}));
+
+server.registerTool('always-error', {}, async () => {
+  throw new Error('intentional error for span status testing');
+});
+
+const transports: Record<string, StreamableHTTPServerTransport> = {};
+
+mcpRouter.post('/mcp', async (req, res) => {
+  const sessionId = req.headers['mcp-session-id'] as string | undefined;
+
+  try {
+    let transport: StreamableHTTPServerTransport;
+
+    if (sessionId && transports[sessionId]) {
+      transport = transports[sessionId];
+    } else if (!sessionId && req.body?.method === 'initialize') {
+      transport = new StreamableHTTPServerTransport({
+        sessionIdGenerator: () => randomUUID(),
+        onsessioninitialized: sid => {
+          transports[sid] = transport;
+        },
+      });
+
+      transport.onclose = () => {
+        const sid = transport.sessionId;
+        if (sid && transports[sid]) {
+          delete transports[sid];
+        }
+      };
+
+      await server.connect(transport);
+    } else {
+      res.status(400).json({
+        jsonrpc: '2.0',
+        error: { code: -32000, message: 'Bad Request: No valid session ID provided' },
+        id: null,
+      });
+      return;
+    }
+
+    await transport.handleRequest(req, res, req.body);
+  } catch (error) {
+    console.error('Error handling MCP request:', error);
+    if (!res.headersSent) {
+      res.status(500).json({
+        jsonrpc: '2.0',
+        error: { code: -32603, message: 'Internal server error' },
+        id: null,
+      });
+    }
+  }
+});
+
+mcpRouter.get('/mcp', async (req, res) => {
+  const sessionId = req.headers['mcp-session-id'] as string | undefined;
+  if (!sessionId || !transports[sessionId]) {
+    res.status(400).send('Invalid or missing session ID');
+    return;
+  }
+  await transports[sessionId].handleRequest(req, res);
+});
+
+mcpRouter.delete('/mcp', async (req, res) => {
+  const sessionId = req.headers['mcp-session-id'] as string | undefined;
+  if (!sessionId || !transports[sessionId]) {
+    res.status(400).send('Invalid or missing session ID');
+    return;
+  }
+  await transports[sessionId].handleRequest(req, res);
+});
+
+export { mcpRouter };
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/start-event-proxy.mjs
new file mode 100644
index 000000000000..69bb0c645c0a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'node-express-mcp-v1',
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/tests/mcp.test.ts b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/tests/mcp.test.ts
new file mode 100644
index 000000000000..0e34722b1243
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/tests/mcp.test.ts
@@ -0,0 +1,100 @@
+import { expect, test } from '@playwright/test';
+import { waitForStreamedSpan, getSpanOp } from '@sentry-internal/test-utils';
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
+
+// The server in this app is never wrapped with `wrapMcpServerWithSentry` — spans are produced
+// solely by the auto-instrumenting `mcpServer` integration against the legacy v1 SDK.
+test('auto-instruments a legacy MCP SDK v1 server (no manual wrap)', async ({ baseURL }) => {
+  const transport = new StreamableHTTPClientTransport(new URL(`${baseURL}/mcp`));
+
+  const client = new Client({
+    name: 'test-client-v1',
+    version: '1.0.0',
+  });
+
+  const initializeSegmentPromise = waitForStreamedSpan(
+    'node-express-mcp-v1',
+    segment => segment.is_segment && segment.name === 'initialize',
+  );
+
+  await client.connect(transport);
+
+  await test.step('initialize handshake', async () => {
+    const initializeSegment = await initializeSegmentPromise;
+    expect(initializeSegment).toBeDefined();
+    expect(getSpanOp(initializeSegment)).toEqual('mcp.server');
+    expect(initializeSegment.attributes?.['mcp.method.name']?.value).toEqual('initialize');
+    expect(initializeSegment.attributes?.['mcp.client.name']?.value).toEqual('test-client-v1');
+    expect(initializeSegment.attributes?.['mcp.server.name']?.value).toEqual('Echo-V1');
+  });
+
+  await test.step('tool call', async () => {
+    const toolSegmentPromise = waitForStreamedSpan(
+      'node-express-mcp-v1',
+      segment => segment.is_segment && segment.name === 'tools/call echo',
+    );
+
+    const toolResult = await client.callTool({
+      name: 'echo',
+      arguments: {
+        message: 'foobar',
+      },
+    });
+
+    expect(toolResult).toMatchObject({
+      content: [
+        {
+          text: 'Tool echo: foobar',
+          type: 'text',
+        },
+      ],
+    });
+
+    const toolSegment = await toolSegmentPromise;
+    expect(toolSegment).toBeDefined();
+    expect(getSpanOp(toolSegment)).toEqual('mcp.server');
+    expect(toolSegment.attributes?.['mcp.method.name']?.value).toEqual('tools/call');
+    expect(toolSegment.attributes?.['mcp.tool.name']?.value).toEqual('echo');
+  });
+
+  await test.step('resource read', async () => {
+    const resourceSegmentPromise = waitForStreamedSpan(
+      'node-express-mcp-v1',
+      segment => segment.is_segment && segment.name === 'resources/read',
+    );
+
+    const resourceResult = await client.readResource({
+      uri: 'echo://foobar',
+    });
+
+    expect(resourceResult).toMatchObject({
+      contents: [{ text: 'Resource echo: foobar', uri: 'echo://foobar' }],
+    });
+
+    const resourceSegment = await resourceSegmentPromise;
+    expect(resourceSegment).toBeDefined();
+    expect(getSpanOp(resourceSegment)).toEqual('mcp.server');
+    expect(resourceSegment.attributes?.['mcp.method.name']?.value).toEqual('resources/read');
+  });
+
+  await test.step('error tool sets span status to error', async () => {
+    const toolSegmentPromise = waitForStreamedSpan(
+      'node-express-mcp-v1',
+      segment => segment.is_segment && segment.name === 'tools/call always-error',
+    );
+
+    try {
+      await client.callTool({ name: 'always-error', arguments: {} });
+    } catch {
+      // Expected: MCP SDK throws when the tool returns a JSON-RPC error
+    }
+
+    const toolSegment = await toolSegmentPromise;
+    expect(toolSegment).toBeDefined();
+    expect(getSpanOp(toolSegment)).toEqual('mcp.server');
+    expect(toolSegment?.status).toEqual('error');
+  });
+
+  await client.close();
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/tsconfig.json
new file mode 100644
index 000000000000..21ecf1357722
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v1/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "types": ["node"],
+    "esModuleInterop": true,
+    "lib": ["es2020"],
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "strict": true,
+    "outDir": "dist",
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/src/mcp.ts b/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/src/mcp.ts
index 6034032b46df..86076f743d62 100644
--- a/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/src/mcp.ts
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/src/mcp.ts
@@ -3,16 +3,15 @@ import express from 'express';
 import { McpServer, ResourceTemplate } from '@modelcontextprotocol/server';
 import { NodeStreamableHTTPServerTransport } from '@modelcontextprotocol/node';
 import { z } from 'zod';
-import { wrapMcpServerWithSentry } from '@sentry/node';
 
 const mcpRouter = express.Router();
 
-const server = wrapMcpServerWithSentry(
-  new McpServer({
-    name: 'Echo-V2',
-    version: '2.0.0',
-  }),
-);
+// Intentionally NOT wrapped with `wrapMcpServerWithSentry`: the `mcpServer` integration
+// auto-instruments the `McpServer` constructor, so spans must be produced anyway.
+const server = new McpServer({
+  name: 'Echo-V2',
+  version: '2.0.0',
+});
 
 server.registerResource(
   'echo',
diff --git a/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/tests/mcp.test.ts b/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/tests/mcp.test.ts
index 747ebda30062..c7e7e2dae2e2 100644
--- a/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/tests/mcp.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-express-mcp-v2/tests/mcp.test.ts
@@ -3,7 +3,9 @@ import { waitForStreamedSpan, getSpanOp } from '@sentry-internal/test-utils';
 import { Client } from '@modelcontextprotocol/client';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/client';
 
-test('records spans for stable MCP SDK v2 handlers using the register API', async ({ baseURL }) => {
+// The server in this app is never wrapped with `wrapMcpServerWithSentry` — spans are produced
+// solely by the auto-instrumenting `mcpServer` integration.
+test('auto-instruments a stable MCP SDK v2 server (no manual wrap)', async ({ baseURL }) => {
   const transport = new StreamableHTTPClientTransport(new URL(`${baseURL}/mcp`));
 
   const client = new Client({
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/.gitignore b/dev-packages/e2e-tests/test-applications/node-prisma-8/.gitignore
new file mode 100644
index 000000000000..1521c8b7652b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/.gitignore
@@ -0,0 +1 @@
+dist
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/docker-compose.yml b/dev-packages/e2e-tests/test-applications/node-prisma-8/docker-compose.yml
new file mode 100644
index 000000000000..ad294fe8d2ea
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/docker-compose.yml
@@ -0,0 +1,21 @@
+services:
+  db:
+    # Prisma 8 requires PostgreSQL 15 or newer.
+    image: postgres:16
+    restart: always
+    container_name: e2e-tests-node-prisma-8
+    ports:
+      - '5438:5432'
+    environment:
+      POSTGRES_USER: prisma
+      POSTGRES_PASSWORD: prisma
+      POSTGRES_DB: tests
+    # Dumped from `prisma-cli db init`; the Prisma 8 CLI needs Node 22.18+, so it isn't run at test time.
+    volumes:
+      - ./init.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U prisma -d tests']
+      interval: 2s
+      timeout: 3s
+      retries: 30
+      start_period: 5s
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/global-setup.mjs b/dev-packages/e2e-tests/test-applications/node-prisma-8/global-setup.mjs
new file mode 100644
index 000000000000..53682b876046
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/global-setup.mjs
@@ -0,0 +1,14 @@
+import { execSync } from 'child_process';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default async function globalSetup() {
+  // Start PostgreSQL via Docker Compose. `--wait` blocks until the healthcheck
+  // in docker-compose.yml passes, so the app can connect immediately.
+  execSync('docker compose up -d --wait', {
+    cwd: __dirname,
+    stdio: 'inherit',
+  });
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/global-teardown.mjs b/dev-packages/e2e-tests/test-applications/node-prisma-8/global-teardown.mjs
new file mode 100644
index 000000000000..2742279431ad
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/global-teardown.mjs
@@ -0,0 +1,12 @@
+import { execSync } from 'child_process';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default async function globalTeardown() {
+  execSync('docker compose down --volumes', {
+    cwd: __dirname,
+    stdio: 'inherit',
+  });
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/init.sql b/dev-packages/e2e-tests/test-applications/node-prisma-8/init.sql
new file mode 100644
index 000000000000..655d447ca485
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/init.sql
@@ -0,0 +1,64 @@
+CREATE SCHEMA prisma_contract;
+CREATE TABLE prisma_contract.contract (
+    core_hash text NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    contract_json jsonb NOT NULL
+);
+CREATE TABLE prisma_contract.ledger (
+    id bigint NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    space text NOT NULL,
+    migration_name text NOT NULL,
+    migration_hash text NOT NULL,
+    origin_core_hash text,
+    origin_profile_hash text,
+    destination_core_hash text NOT NULL,
+    destination_profile_hash text,
+    operations jsonb NOT NULL
+);
+CREATE SEQUENCE prisma_contract.ledger_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE prisma_contract.ledger_id_seq OWNED BY prisma_contract.ledger.id;
+CREATE TABLE prisma_contract.marker (
+    space text DEFAULT 'app'::text NOT NULL,
+    core_hash text NOT NULL,
+    profile_hash text NOT NULL,
+    contract_json jsonb,
+    canonical_version integer,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    app_tag text,
+    meta jsonb DEFAULT '{}'::jsonb NOT NULL,
+    invariants text[] DEFAULT '{}'::text[] NOT NULL
+);
+CREATE TABLE public."user" (
+    email text NOT NULL,
+    id integer NOT NULL,
+    name text
+);
+CREATE SEQUENCE public.user_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE public.user_id_seq OWNED BY public."user".id;
+ALTER TABLE ONLY prisma_contract.ledger ALTER COLUMN id SET DEFAULT nextval('prisma_contract.ledger_id_seq'::regclass);
+ALTER TABLE ONLY public."user" ALTER COLUMN id SET DEFAULT nextval('public.user_id_seq'::regclass);
+INSERT INTO prisma_contract.contract VALUES ('f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', '2026-09-09 09:15:28.369559+00', '{"meta": {}, "roots": {"user": {"model": "User", "namespace": "public"}}, "domain": {"namespaces": {"public": {"models": {"User": {"fields": {"id": {"type": {"kind": "scalar", "codecId": "pg/int4@1"}, "nullable": false}, "name": {"type": {"kind": "scalar", "codecId": "pg/text@1"}, "nullable": true}, "email": {"type": {"kind": "scalar", "codecId": "pg/text@1"}, "nullable": false}}, "storage": {"table": "user", "fields": {"id": {"column": "id"}, "name": {"column": "name"}, "email": {"column": "email"}}, "namespaceId": "public"}, "relations": {}}}}}}, "target": "postgres", "storage": {"namespaces": {"public": {"id": "public", "entries": {"table": {"user": {"columns": {"id": {"codecId": "pg/int4@1", "default": {"kind": "function", "expression": "autoincrement()"}, "nullable": false, "nativeType": "int4"}, "name": {"codecId": "pg/text@1", "nullable": true, "nativeType": "text"}, "email": {"codecId": "pg/text@1", "nullable": false, "nativeType": "text"}}, "indexes": [], "uniques": [{"columns": ["email"]}], "primaryKey": {"columns": ["id"]}, "foreignKeys": []}}}}}, "storageHash": "f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5"}, "extensions": {}, "profileHash": "3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2", "capabilities": {"sql": {"enums": true, "lateral": true, "returning": true, "scalarList": true, "checkConstraint": true, "defaultInInsert": true}, "postgres": {"limit": true, "jsonAgg": true, "lateral": true, "orderBy": true, "returning": true, "distinctOn": true}}, "targetFamily": "sql"}');
+INSERT INTO prisma_contract.ledger VALUES (1, '2026-09-09 09:15:28.369559+00', 'app', '', 'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', '', NULL, 'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', NULL, '[{"id": "table.user", "label": "Create table \"user\"", "target": {"id": "postgres", "details": {"name": "user", "schema": "public", "objectType": "table"}}, "execute": [{"sql": "CREATE TABLE \"public\".\"user\" (\n  \"email\" text NOT NULL,\n  \"id\" SERIAL NOT NULL,\n  \"name\" text,\n  PRIMARY KEY (\"id\")\n)", "params": [], "description": "create table \"user\""}], "summary": "Creates table \"user\"", "precheck": [{"sql": "SELECT (to_regclass($1)) IS NULL AS \"result\"", "params": ["\"public\".\"user\""], "description": "ensure table \"user\" does not exist"}], "postcheck": [{"sql": "SELECT (to_regclass($1)) IS NOT NULL AS \"result\"", "params": ["\"public\".\"user\""], "description": "verify table \"user\" exists"}], "operationClass": "additive"}, {"id": "unique.user.user_email_key", "label": "Add unique constraint on \"user\" (email)", "target": {"id": "postgres", "details": {"name": "user_email_key", "table": "user", "schema": "public", "objectType": "unique"}}, "execute": [{"sql": "ALTER TABLE \"public\".\"user\" ADD CONSTRAINT \"user_email_key\" UNIQUE (\"email\")", "description": "add unique constraint \"user_email_key\""}], "precheck": [{"sql": "SELECT NOT EXISTS (SELECT 1 AS \"one\" FROM \"pg_constraint\" AS \"c\" INNER JOIN \"pg_namespace\" AS \"n\" ON \"n\".\"oid\" = \"c\".\"connamespace\" WHERE (\"c\".\"conname\" = $1 AND \"n\".\"nspname\" = $2 AND \"c\".\"conrelid\" = to_regclass($3))) AS \"result\"", "params": ["user_email_key", "public", "\"public\".\"user\""], "description": "ensure constraint \"user_email_key\" does not exist"}], "postcheck": [{"sql": "SELECT EXISTS (SELECT 1 AS \"one\" FROM \"pg_constraint\" AS \"c\" INNER JOIN \"pg_namespace\" AS \"n\" ON \"n\".\"oid\" = \"c\".\"connamespace\" WHERE (\"c\".\"conname\" = $1 AND \"n\".\"nspname\" = $2 AND \"c\".\"conrelid\" = to_regclass($3))) AS \"result\"", "params": ["user_email_key", "public", "\"public\".\"user\""], "description": "verify constraint \"user_email_key\" exists"}], "operationClass": "additive"}]');
+INSERT INTO prisma_contract.marker VALUES ('app', 'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', '3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2', NULL, NULL, '2026-09-09 09:15:28.369559+00', NULL, '{}', '{}');
+ALTER TABLE ONLY prisma_contract.contract
+    ADD CONSTRAINT contract_pkey PRIMARY KEY (core_hash);
+ALTER TABLE ONLY prisma_contract.ledger
+    ADD CONSTRAINT ledger_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY prisma_contract.marker
+    ADD CONSTRAINT marker_pkey PRIMARY KEY (space);
+ALTER TABLE ONLY public."user"
+    ADD CONSTRAINT user_email_key UNIQUE (email);
+ALTER TABLE ONLY public."user"
+    ADD CONSTRAINT user_pkey PRIMARY KEY (id);
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/package.json b/dev-packages/e2e-tests/test-applications/node-prisma-8/package.json
new file mode 100644
index 000000000000..a6e8bb692e57
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "node-prisma-8",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "build": "tsc",
+    "start": "node --import ./dist/instrument.js dist/app.js",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml dist",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@prisma/orm-postgres": "8.0.0-rc.8",
+    "@sentry/node": "file:../../packed/sentry-node-packed.tgz",
+    "@types/express": "^4.17.21",
+    "@types/node": "^20.19.0",
+    "express": "^4.21.2",
+    "typescript": "~5.9.0"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.56.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@sentry/core": "file:../../packed/sentry-core-packed.tgz"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/node-prisma-8/playwright.config.mjs
new file mode 100644
index 000000000000..d5fd0b394f15
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/playwright.config.mjs
@@ -0,0 +1,11 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+});
+
+export default {
+  ...config,
+  globalSetup: './global-setup.mjs',
+  globalTeardown: './global-teardown.mjs',
+};
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/src/app.ts b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/app.ts
new file mode 100644
index 000000000000..2b90f41a9edf
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/app.ts
@@ -0,0 +1,30 @@
+import { randomBytes } from 'node:crypto';
+import postgres from '@prisma/orm-postgres/runtime';
+import express from 'express';
+import type { Contract } from './prisma/contract.d.ts';
+import contractJson from './prisma/contract.json' with { type: 'json' };
+
+const db = postgres<Contract>({
+  contractJson,
+  url: 'postgresql://prisma:prisma@localhost:5438/tests',
+});
+
+const app = express();
+const port = 3030;
+
+app.get('/test-prisma', async (_req, res) => {
+  const created = await db.orm.public.User.create({
+    name: 'Tilda',
+    email: `tilda_${randomBytes(4).toString('hex')}@sentry.io`,
+  });
+
+  const users = await db.orm.public.User.all();
+
+  await db.orm.public.User.where(user => user.email.like('%sentry.io')).delete();
+
+  res.json({ created: created.id, count: users.length });
+});
+
+app.listen(port, () => {
+  console.log(`Example app listening on port ${port}`);
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/src/instrument.ts b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/instrument.ts
new file mode 100644
index 000000000000..f3dd95215d03
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/instrument.ts
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  debug: !!process.env.DEBUG,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1,
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.d.ts b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.d.ts
new file mode 100644
index 000000000000..010a73846882
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.d.ts
@@ -0,0 +1,390 @@
+// ⚠️  GENERATED FILE - DO NOT EDIT
+// This file is automatically generated by 'prisma contract emit'.
+// To regenerate, run: prisma contract emit
+import type { QueryOperationTypes as PgAdapterQueryOps } from '@prisma/orm-postgres/adapter/operation-types';
+import type {
+  Bit,
+  Char,
+  CodecTypes as PgTypes,
+  Interval,
+  JsonValue,
+  Numeric,
+  Time,
+  TimeString,
+  Timestamp,
+  TimestampString,
+  Timestamptz,
+  TimestamptzString,
+  Timetz,
+  VarBit,
+  Varchar,
+} from '@prisma/orm-postgres/target/codec-types';
+
+import type { ContractWithTypeMaps, TypeMaps as TypeMapsType } from '@prisma/orm-postgres/family-contract/types';
+import type {
+  Contract as ContractType,
+  ExecutionHashBase,
+  NamespaceId,
+  ProfileHashBase,
+  StorageHashBase,
+} from '@prisma/orm-postgres/contract/types';
+
+export type StorageHash = StorageHashBase<'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5'>;
+export type ExecutionHash = ExecutionHashBase<string>;
+export type ProfileHash = ProfileHashBase<'3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2'>;
+
+export type CodecTypes = PgTypes;
+export type LaneCodecTypes = CodecTypes;
+export type QueryOperationTypes = PgAdapterQueryOps<CodecTypes>;
+export type AggregateTypes = {
+  readonly avg: {
+    readonly byCodec: {
+      readonly 'pg/float@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/float4@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/float8@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/int@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/int2@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/int4@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/int8@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/int8number@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/interval@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/numeric@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/time-string@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/time-temporal@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/unboundedint@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'sql/float@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'sql/int@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+    };
+  };
+  readonly avgDecimal: {
+    readonly byCodec: {
+      readonly 'pg/int@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/int2@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/int4@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/int8@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/int8number@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/numeric@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/unboundedint@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'sql/int@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+    };
+  };
+  readonly count: {
+    readonly byCodec: {};
+    readonly withoutInput: { readonly output: 'pg/int8number@1'; readonly nullable: false };
+    readonly anyInput: { readonly output: 'pg/int8number@1'; readonly nullable: false };
+  };
+  readonly countBigInt: {
+    readonly byCodec: {};
+    readonly withoutInput: { readonly output: 'pg/int8@1'; readonly nullable: false };
+    readonly anyInput: { readonly output: 'pg/int8@1'; readonly nullable: false };
+  };
+  readonly max: {
+    readonly byCodec: {
+      readonly 'pg/char@1': { readonly output: 'pg/char@1'; readonly nullable: true };
+      readonly 'pg/date-string@1': { readonly output: 'pg/date-string@1'; readonly nullable: true };
+      readonly 'pg/date-temporal@1': {
+        readonly output: 'pg/date-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/enum@1': { readonly output: 'pg/enum@1'; readonly nullable: true };
+      readonly 'pg/float@1': { readonly output: 'pg/float@1'; readonly nullable: true };
+      readonly 'pg/float4@1': { readonly output: 'pg/float4@1'; readonly nullable: true };
+      readonly 'pg/float8@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/inet@1': { readonly output: 'pg/inet@1'; readonly nullable: true };
+      readonly 'pg/int@1': { readonly output: 'pg/int@1'; readonly nullable: true };
+      readonly 'pg/int2@1': { readonly output: 'pg/int2@1'; readonly nullable: true };
+      readonly 'pg/int4@1': { readonly output: 'pg/int4@1'; readonly nullable: true };
+      readonly 'pg/int8@1': { readonly output: 'pg/int8@1'; readonly nullable: true };
+      readonly 'pg/int8number@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/interval@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/numeric@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/text-array@1': { readonly output: 'pg/text-array@1'; readonly nullable: true };
+      readonly 'pg/text@1': { readonly output: 'pg/text@1'; readonly nullable: true };
+      readonly 'pg/time-string@1': { readonly output: 'pg/time-string@1'; readonly nullable: true };
+      readonly 'pg/time-temporal@1': {
+        readonly output: 'pg/time-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamp-string@1': {
+        readonly output: 'pg/timestamp-string@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamp-temporal@1': {
+        readonly output: 'pg/timestamp-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamptz-string@1': {
+        readonly output: 'pg/timestamptz-string@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamptz-temporal@1': {
+        readonly output: 'pg/timestamptz-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timetz@1': { readonly output: 'pg/timetz@1'; readonly nullable: true };
+      readonly 'pg/unboundedint@1': {
+        readonly output: 'pg/unboundedint@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/varchar@1': { readonly output: 'pg/text@1'; readonly nullable: true };
+      readonly 'sql/char@1': { readonly output: 'sql/char@1'; readonly nullable: true };
+      readonly 'sql/float@1': { readonly output: 'sql/float@1'; readonly nullable: true };
+      readonly 'sql/int@1': { readonly output: 'sql/int@1'; readonly nullable: true };
+      readonly 'sql/text@1': { readonly output: 'sql/text@1'; readonly nullable: true };
+      readonly 'sql/varchar@1': { readonly output: 'pg/text@1'; readonly nullable: true };
+    };
+  };
+  readonly min: {
+    readonly byCodec: {
+      readonly 'pg/char@1': { readonly output: 'pg/char@1'; readonly nullable: true };
+      readonly 'pg/date-string@1': { readonly output: 'pg/date-string@1'; readonly nullable: true };
+      readonly 'pg/date-temporal@1': {
+        readonly output: 'pg/date-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/enum@1': { readonly output: 'pg/enum@1'; readonly nullable: true };
+      readonly 'pg/float@1': { readonly output: 'pg/float@1'; readonly nullable: true };
+      readonly 'pg/float4@1': { readonly output: 'pg/float4@1'; readonly nullable: true };
+      readonly 'pg/float8@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/inet@1': { readonly output: 'pg/inet@1'; readonly nullable: true };
+      readonly 'pg/int@1': { readonly output: 'pg/int@1'; readonly nullable: true };
+      readonly 'pg/int2@1': { readonly output: 'pg/int2@1'; readonly nullable: true };
+      readonly 'pg/int4@1': { readonly output: 'pg/int4@1'; readonly nullable: true };
+      readonly 'pg/int8@1': { readonly output: 'pg/int8@1'; readonly nullable: true };
+      readonly 'pg/int8number@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/interval@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/numeric@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/text-array@1': { readonly output: 'pg/text-array@1'; readonly nullable: true };
+      readonly 'pg/text@1': { readonly output: 'pg/text@1'; readonly nullable: true };
+      readonly 'pg/time-string@1': { readonly output: 'pg/time-string@1'; readonly nullable: true };
+      readonly 'pg/time-temporal@1': {
+        readonly output: 'pg/time-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamp-string@1': {
+        readonly output: 'pg/timestamp-string@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamp-temporal@1': {
+        readonly output: 'pg/timestamp-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamptz-string@1': {
+        readonly output: 'pg/timestamptz-string@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timestamptz-temporal@1': {
+        readonly output: 'pg/timestamptz-temporal@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/timetz@1': { readonly output: 'pg/timetz@1'; readonly nullable: true };
+      readonly 'pg/unboundedint@1': {
+        readonly output: 'pg/unboundedint@1';
+        readonly nullable: true;
+      };
+      readonly 'pg/varchar@1': { readonly output: 'pg/text@1'; readonly nullable: true };
+      readonly 'sql/char@1': { readonly output: 'sql/char@1'; readonly nullable: true };
+      readonly 'sql/float@1': { readonly output: 'sql/float@1'; readonly nullable: true };
+      readonly 'sql/int@1': { readonly output: 'sql/int@1'; readonly nullable: true };
+      readonly 'sql/text@1': { readonly output: 'sql/text@1'; readonly nullable: true };
+      readonly 'sql/varchar@1': { readonly output: 'pg/text@1'; readonly nullable: true };
+    };
+  };
+  readonly sum: {
+    readonly byCodec: {
+      readonly 'pg/float@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/float4@1': { readonly output: 'pg/float4@1'; readonly nullable: true };
+      readonly 'pg/float8@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'pg/int@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/int2@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/int4@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/int8@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/int8number@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+      readonly 'pg/interval@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/numeric@1': { readonly output: 'pg/numeric@1'; readonly nullable: true };
+      readonly 'pg/time-string@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/time-temporal@1': { readonly output: 'pg/interval@1'; readonly nullable: true };
+      readonly 'pg/unboundedint@1': {
+        readonly output: 'pg/unboundedint@1';
+        readonly nullable: true;
+      };
+      readonly 'sql/float@1': { readonly output: 'pg/float8@1'; readonly nullable: true };
+      readonly 'sql/int@1': { readonly output: 'pg/int8number@1'; readonly nullable: true };
+    };
+  };
+  readonly sumBigInt: {
+    readonly byCodec: {
+      readonly 'pg/int@1': { readonly output: 'pg/int8@1'; readonly nullable: true };
+      readonly 'pg/int2@1': { readonly output: 'pg/int8@1'; readonly nullable: true };
+      readonly 'pg/int4@1': { readonly output: 'pg/int8@1'; readonly nullable: true };
+      readonly 'pg/int8@1': { readonly output: 'pg/unboundedint@1'; readonly nullable: true };
+      readonly 'pg/int8number@1': { readonly output: 'pg/unboundedint@1'; readonly nullable: true };
+      readonly 'pg/unboundedint@1': {
+        readonly output: 'pg/unboundedint@1';
+        readonly nullable: true;
+      };
+      readonly 'sql/int@1': { readonly output: 'pg/int8@1'; readonly nullable: true };
+    };
+  };
+};
+type DefaultLiteralValue<CodecId extends string, Encoded> = CodecId extends keyof CodecTypes
+  ? Encoded extends CodecTypes[CodecId]['json']
+    ? Encoded
+    : CodecTypes[CodecId]['json']
+  : Encoded;
+
+export type FieldOutputTypes = {
+  readonly public: {
+    readonly User: {
+      readonly id: CodecTypes['pg/int4@1']['output'];
+      readonly email: CodecTypes['pg/text@1']['output'];
+      readonly name: CodecTypes['pg/text@1']['output'] | null;
+    };
+  };
+};
+export type FieldInputTypes = {
+  readonly public: {
+    readonly User: {
+      readonly id: CodecTypes['pg/int4@1']['input'];
+      readonly email: CodecTypes['pg/text@1']['input'];
+      readonly name: CodecTypes['pg/text@1']['input'] | null;
+    };
+  };
+};
+export type StorageColumnTypes = {
+  readonly public: {
+    readonly user: {
+      readonly email: CodecTypes['pg/text@1']['output'];
+      readonly id: CodecTypes['pg/int4@1']['output'];
+      readonly name: CodecTypes['pg/text@1']['output'] | null;
+    };
+  };
+};
+export type StorageColumnInputTypes = {
+  readonly public: {
+    readonly user: {
+      readonly email: CodecTypes['pg/text@1']['input'];
+      readonly id: CodecTypes['pg/int4@1']['input'];
+      readonly name: CodecTypes['pg/text@1']['input'] | null;
+    };
+  };
+};
+export type TypeMaps = TypeMapsType<
+  CodecTypes,
+  QueryOperationTypes,
+  FieldOutputTypes,
+  FieldInputTypes,
+  StorageColumnTypes,
+  StorageColumnInputTypes,
+  AggregateTypes
+>;
+
+type ContractBase = Omit<
+  ContractType<{
+    readonly namespaces: {
+      readonly public: {
+        readonly id: 'public';
+        readonly kind: 'postgres-schema';
+        readonly entries: {
+          readonly table: {
+            readonly user: {
+              columns: {
+                readonly id: {
+                  readonly nativeType: 'int4';
+                  readonly codecId: 'pg/int4@1';
+                  readonly nullable: false;
+                  readonly default: {
+                    readonly kind: 'function';
+                    readonly expression: 'autoincrement()';
+                  };
+                };
+                readonly email: {
+                  readonly nativeType: 'text';
+                  readonly codecId: 'pg/text@1';
+                  readonly nullable: false;
+                };
+                readonly name: {
+                  readonly nativeType: 'text';
+                  readonly codecId: 'pg/text@1';
+                  readonly nullable: true;
+                };
+              };
+              primaryKey: { readonly columns: readonly ['id'] };
+              uniques: readonly [{ readonly columns: readonly ['email'] }];
+              indexes: readonly [];
+              foreignKeys: readonly [];
+            };
+          };
+        };
+      };
+    };
+    readonly storageHash: StorageHash;
+  }>,
+  'roots' | 'domain'
+> & {
+  readonly target: 'postgres';
+  readonly targetFamily: 'sql';
+  readonly roots: {
+    readonly user: { readonly namespace: 'public' & NamespaceId; readonly model: 'User' };
+  };
+  readonly domain: {
+    readonly namespaces: {
+      readonly public: {
+        readonly models: {
+          readonly User: {
+            readonly fields: {
+              readonly id: {
+                readonly nullable: false;
+                readonly type: { readonly kind: 'scalar'; readonly codecId: 'pg/int4@1' };
+              };
+              readonly email: {
+                readonly nullable: false;
+                readonly type: { readonly kind: 'scalar'; readonly codecId: 'pg/text@1' };
+              };
+              readonly name: {
+                readonly nullable: true;
+                readonly type: { readonly kind: 'scalar'; readonly codecId: 'pg/text@1' };
+              };
+            };
+            readonly relations: Record<string, never>;
+            readonly storage: {
+              readonly table: 'user';
+              readonly namespaceId: 'public';
+              readonly fields: {
+                readonly id: { readonly column: 'id' };
+                readonly email: { readonly column: 'email' };
+                readonly name: { readonly column: 'name' };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+  readonly capabilities: {
+    readonly postgres: {
+      readonly distinctOn: true;
+      readonly jsonAgg: true;
+      readonly lateral: true;
+      readonly limit: true;
+      readonly orderBy: true;
+      readonly returning: true;
+    };
+    readonly sql: {
+      readonly checkConstraint: true;
+      readonly defaultInInsert: true;
+      readonly enums: true;
+      readonly lateral: true;
+      readonly returning: true;
+      readonly scalarList: true;
+    };
+  };
+  readonly extensions: {};
+  readonly meta: {};
+
+  readonly profileHash: ProfileHash;
+};
+
+export type Contract = ContractWithTypeMaps<ContractBase, TypeMaps>;
+
+export type Namespaces = Contract['storage']['namespaces'];
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.json b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.json
new file mode 100644
index 000000000000..3b9090e28776
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.json
@@ -0,0 +1,132 @@
+{
+  "schemaVersion": "1",
+  "targetFamily": "sql",
+  "target": "postgres",
+  "profileHash": "3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2",
+  "roots": {
+    "user": {
+      "model": "User",
+      "namespace": "public"
+    }
+  },
+  "domain": {
+    "namespaces": {
+      "public": {
+        "models": {
+          "User": {
+            "fields": {
+              "email": {
+                "nullable": false,
+                "type": {
+                  "codecId": "pg/text@1",
+                  "kind": "scalar"
+                }
+              },
+              "id": {
+                "nullable": false,
+                "type": {
+                  "codecId": "pg/int4@1",
+                  "kind": "scalar"
+                }
+              },
+              "name": {
+                "nullable": true,
+                "type": {
+                  "codecId": "pg/text@1",
+                  "kind": "scalar"
+                }
+              }
+            },
+            "relations": {},
+            "storage": {
+              "fields": {
+                "email": {
+                  "column": "email"
+                },
+                "id": {
+                  "column": "id"
+                },
+                "name": {
+                  "column": "name"
+                }
+              },
+              "namespaceId": "public",
+              "table": "user"
+            }
+          }
+        }
+      }
+    }
+  },
+  "storage": {
+    "namespaces": {
+      "public": {
+        "entries": {
+          "table": {
+            "user": {
+              "columns": {
+                "email": {
+                  "codecId": "pg/text@1",
+                  "nativeType": "text",
+                  "nullable": false
+                },
+                "id": {
+                  "codecId": "pg/int4@1",
+                  "default": {
+                    "expression": "autoincrement()",
+                    "kind": "function"
+                  },
+                  "nativeType": "int4",
+                  "nullable": false
+                },
+                "name": {
+                  "codecId": "pg/text@1",
+                  "nativeType": "text",
+                  "nullable": true
+                }
+              },
+              "foreignKeys": [],
+              "indexes": [],
+              "primaryKey": {
+                "columns": ["id"]
+              },
+              "uniques": [
+                {
+                  "columns": ["email"]
+                }
+              ]
+            }
+          }
+        },
+        "id": "public",
+        "kind": "postgres-schema"
+      }
+    },
+    "storageHash": "f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5"
+  },
+  "capabilities": {
+    "postgres": {
+      "distinctOn": true,
+      "jsonAgg": true,
+      "lateral": true,
+      "limit": true,
+      "orderBy": true,
+      "returning": true
+    },
+    "sql": {
+      "checkConstraint": true,
+      "defaultInInsert": true,
+      "enums": true,
+      "lateral": true,
+      "returning": true,
+      "scalarList": true
+    }
+  },
+  "extensions": {},
+  "meta": {},
+  "_generated": {
+    "warning": "⚠️  GENERATED FILE - DO NOT EDIT",
+    "message": "This file is automatically generated by \"prisma contract emit\".",
+    "regenerate": "To regenerate, run: prisma contract emit"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.prisma b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.prisma
new file mode 100644
index 000000000000..e443ac76a64e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/src/prisma/contract.prisma
@@ -0,0 +1,9 @@
+// use prisma-next
+
+// Regenerate `contract.json`/`contract.d.ts` with `prisma-cli contract emit` and `../../init.sql` from
+// `prisma-cli db init` (Node 22.18+). No `DateTime` column: Prisma 8 decodes timestamps into `Temporal`.
+model User {
+  id    Int     @id @default(autoincrement())
+  email String  @unique
+  name  String?
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/node-prisma-8/start-event-proxy.mjs
new file mode 100644
index 000000000000..8095fa121543
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'node-prisma-8',
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/tests/prisma.test.ts b/dev-packages/e2e-tests/test-applications/node-prisma-8/tests/prisma.test.ts
new file mode 100644
index 000000000000..81cc629a2ff8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/tests/prisma.test.ts
@@ -0,0 +1,78 @@
+import { expect, test } from '@playwright/test';
+import { collectStreamedSpans, getSpanOp } from '@sentry-internal/test-utils';
+import type { SerializedStreamedSpan } from '@sentry/core';
+
+const OPERATION_METHODS = ['create', 'all', 'delete'];
+
+function isPrismaOperation(span: SerializedStreamedSpan): boolean {
+  return span.attributes['sentry.origin']?.value === 'auto.db.prisma';
+}
+
+function isTestPrismaSegment(span: SerializedStreamedSpan): boolean {
+  return getSpanOp(span) === 'http.server' && span.is_segment === true && span.name === 'GET /test-prisma';
+}
+
+test('Prisma 8 ORM calls emit operation spans with the pg queries nested underneath', async ({ baseURL }) => {
+  const spansPromise = collectStreamedSpans(
+    'node-prisma-8',
+    spans => spans.some(isTestPrismaSegment) && spans.filter(isPrismaOperation).length >= OPERATION_METHODS.length,
+  );
+
+  const res = await fetch(`${baseURL}/test-prisma`);
+  expect(res.status).toBe(200);
+
+  const spans = await spansPromise;
+  const segment = spans.find(isTestPrismaSegment)!;
+  const operationSpans = spans.filter(isPrismaOperation);
+  const spansById = new Map(spans.map(span => [span.span_id, span]));
+  // The Express request-handler span sits between the segment and the ORM calls.
+  const isInSegment = (span: SerializedStreamedSpan): boolean => {
+    for (let parent = span.parent_span_id; parent; parent = spansById.get(parent)?.parent_span_id) {
+      if (parent === segment.span_id) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  expect(operationSpans.map(span => span.attributes['method']?.value)).toEqual(OPERATION_METHODS);
+  operationSpans.forEach(span => {
+    expect(span.name).toBe('prisma:client:operation');
+    expect(isInSegment(span)).toBe(true);
+    expect(span.attributes).toMatchObject({
+      'sentry.origin': { value: 'auto.db.prisma', type: 'string' },
+      'sentry.op': { value: 'db', type: 'string' },
+      'db.operation.name': { value: span.attributes['method']?.value, type: 'string' },
+      'db.collection.name': { value: 'user', type: 'string' },
+      model: { value: 'User', type: 'string' },
+      name: { value: `User.${span.attributes['method']?.value}`, type: 'string' },
+    });
+  });
+
+  const queriesUnder = (method: string): unknown[] => {
+    const operation = operationSpans.find(span => span.attributes['method']?.value === method)!;
+    // `pg.connect` spans are `db` spans too, but carry no statement.
+    return spans
+      .filter(
+        span =>
+          getSpanOp(span) === 'db' &&
+          span.attributes['db.query.text']?.value &&
+          span.parent_span_id === operation.span_id,
+      )
+      .map(span => span.attributes['db.query.text']?.value);
+  };
+  expect(queriesUnder('create')).toEqual(
+    expect.arrayContaining([expect.stringMatching(/^INSERT INTO "public"\."user" /)]),
+  );
+  expect(queriesUnder('all')).toEqual([expect.stringMatching(/^SELECT .* FROM "public"\."user"$/)]);
+  expect(queriesUnder('delete')).toEqual(
+    expect.arrayContaining([expect.stringMatching(/^DELETE FROM "public"\."user" /)]),
+  );
+
+  const dbSpans = spans.filter(span => getSpanOp(span) === 'db' && span.attributes['db.query.text']?.value);
+  dbSpans.forEach(span => {
+    expect(span.attributes['sentry.origin']?.value).toBe('auto.db.postgres');
+    expect(span.attributes['db.system.name']?.value).toBe('postgresql');
+    expect(span.parent_span_id).not.toBe(segment.span_id);
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-prisma-8/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-prisma-8/tsconfig.json
new file mode 100644
index 000000000000..6dd09736082f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-prisma-8/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "outDir": "dist",
+    "rootDir": "src"
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-5/package.json b/dev-packages/e2e-tests/test-applications/nuxt-5/package.json
index cdf4885a9703..36aea2e0b856 100644
--- a/dev-packages/e2e-tests/test-applications/nuxt-5/package.json
+++ b/dev-packages/e2e-tests/test-applications/nuxt-5/package.json
@@ -19,6 +19,9 @@
   },
   "//": [
     "Currently, we need to install the latest version of Nitro and the Nuxt nightlies as those contain Nuxt v5",
+    "@nuxt/cli is pinned. The CLI nightlies register nitro runtime plugins that live inside the CLI package: https://github.com/nuxt/cli/pull/1570",
+    "Nuxt's impound guard blocks imports from that package in the dev server runtime, so every SSR request fails in dev mode.",
+    "TODO: remove the @nuxt/cli override when impound allows the CLI runtime plugins",
     "TODO: remove nitro from dependencies",
     "Nuxt generates `fetch.server.mjs` as a virtual module that imports `ofetch`, and since a virtual id is neither absolute nor on disk, Vite resolves from its `root` (the srcDir) instead of the importer's folder.",
     "This fails because `ofetch` is a dependency of `nuxt` rather than the app, so pnpm leaves it in `.pnpm/`",
@@ -36,6 +39,11 @@
     "@playwright/test": "~1.63.0",
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },
+  "pnpm": {
+    "overrides": {
+      "@nuxt/cli": "npm:@nuxt/cli-nightly@4.0.0-20260927-110353-6eaa0eb"
+    }
+  },
   "sentryTest": {
     "optional": true
   },
diff --git a/dev-packages/e2e-tests/test-applications/react-send-to-sentry/package.json b/dev-packages/e2e-tests/test-applications/react-send-to-sentry/package.json
index cefd05e58db5..3cfd16a29ae2 100644
--- a/dev-packages/e2e-tests/test-applications/react-send-to-sentry/package.json
+++ b/dev-packages/e2e-tests/test-applications/react-send-to-sentry/package.json
@@ -45,6 +45,7 @@
     "serve": "14.0.1"
   },
   "volta": {
+    "node": "20.19.5",
     "extends": "../../package.json"
   },
   "sentryTest": {
diff --git a/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/lib/fragments.ts b/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/lib/fragments.ts
index ccf430475620..e8639a6bfba7 100644
--- a/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/lib/fragments.ts
+++ b/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/lib/fragments.ts
@@ -102,73 +102,3 @@ export const CART_QUERY_FRAGMENT = `#graphql
     }
   }
 ` as const;
-
-const MENU_FRAGMENT = `#graphql
-  fragment MenuItem on MenuItem {
-    id
-    resourceId
-    tags
-    title
-    type
-    url
-  }
-  fragment ChildMenuItem on MenuItem {
-    ...MenuItem
-  }
-  fragment ParentMenuItem on MenuItem {
-    ...MenuItem
-    items {
-      ...ChildMenuItem
-    }
-  }
-  fragment Menu on Menu {
-    id
-    items {
-      ...ParentMenuItem
-    }
-  }
-` as const;
-
-export const HEADER_QUERY = `#graphql
-  fragment Shop on Shop {
-    id
-    name
-    description
-    primaryDomain {
-      url
-    }
-    brand {
-      logo {
-        image {
-          url
-        }
-      }
-    }
-  }
-  query Header(
-    $country: CountryCode
-    $headerMenuHandle: String!
-    $language: LanguageCode
-  ) @inContext(language: $language, country: $country) {
-    shop {
-      ...Shop
-    }
-    menu(handle: $headerMenuHandle) {
-      ...Menu
-    }
-  }
-  ${MENU_FRAGMENT}
-` as const;
-
-export const FOOTER_QUERY = `#graphql
-  query Footer(
-    $country: CountryCode
-    $footerMenuHandle: String!
-    $language: LanguageCode
-  ) @inContext(language: $language, country: $country) {
-    menu(handle: $footerMenuHandle) {
-      ...Menu
-    }
-  }
-  ${MENU_FRAGMENT}
-` as const;
diff --git a/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/root.tsx b/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/root.tsx
index 3f42a000a461..d79ed2379aba 100644
--- a/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/root.tsx
+++ b/dev-packages/e2e-tests/test-applications/remix-hydrogen/app/root.tsx
@@ -48,11 +48,7 @@ export function links() {
 }
 
 export async function loader({ context }: { context: LoaderFunctionArgs['context'] }) {
-  const { storefront, session, cart } = context as {
-    storefront: {
-      query: (query: string, options: any) => Promise<any>;
-      CacheLong: () => any;
-    };
+  const { session, cart } = context as {
     session: HydrogenSession;
     cart: unknown;
     env: unknown;
@@ -68,27 +64,9 @@ export async function loader({ context }: { context: LoaderFunctionArgs['context
   // defer the cart query by not awaiting it
   const cartPromise = typedCart.get();
 
-  // defer the footer query (below the fold)
-  const footerPromise = storefront.query(FOOTER_QUERY, {
-    cache: storefront.CacheLong(),
-    variables: {
-      footerMenuHandle: 'footer', // Adjust to your footer menu handle
-    },
-  });
-
-  // await the header query (above the fold)
-  const headerPromise = storefront.query(HEADER_QUERY, {
-    cache: storefront.CacheLong(),
-    variables: {
-      headerMenuHandle: 'main-menu', // Adjust to your header menu handle
-    },
-  });
-
   return defer(
     {
       cart: cartPromise,
-      footer: footerPromise,
-      header: await headerPromise,
       isLoggedIn,
       publicStoreDomain,
     },
@@ -225,73 +203,3 @@ async function validateCustomerAccessToken(session: HydrogenSession, customerAcc
 
   return { isLoggedIn, headers };
 }
-
-const MENU_FRAGMENT = `#graphql
-  fragment MenuItem on MenuItem {
-    id
-    resourceId
-    tags
-    title
-    type
-    url
-  }
-  fragment ChildMenuItem on MenuItem {
-    ...MenuItem
-  }
-  fragment ParentMenuItem on MenuItem {
-    ...MenuItem
-    items {
-      ...ChildMenuItem
-    }
-  }
-  fragment Menu on Menu {
-    id
-    items {
-      ...ParentMenuItem
-    }
-  }
-` as const;
-
-const HEADER_QUERY = `#graphql
-  fragment Shop on Shop {
-    id
-    name
-    description
-    primaryDomain {
-      url
-    }
-    brand {
-      logo {
-        image {
-          url
-        }
-      }
-    }
-  }
-  query Header(
-    $country: CountryCode
-    $headerMenuHandle: String!
-    $language: LanguageCode
-  ) @inContext(language: $language, country: $country) {
-    shop {
-      ...Shop
-    }
-    menu(handle: $headerMenuHandle) {
-      ...Menu
-    }
-  }
-  ${MENU_FRAGMENT}
-` as const;
-
-const FOOTER_QUERY = `#graphql
-  query Footer(
-    $country: CountryCode
-    $footerMenuHandle: String!
-    $language: LanguageCode
-  ) @inContext(language: $language, country: $country) {
-    menu(handle: $footerMenuHandle) {
-      ...Menu
-    }
-  }
-  ${MENU_FRAGMENT}
-` as const;
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/app/actions/controller.tsx b/dev-packages/e2e-tests/test-applications/remix-v3/app/actions/controller.tsx
new file mode 100644
index 000000000000..9325143b071d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/app/actions/controller.tsx
@@ -0,0 +1,34 @@
+import { createController } from 'remix/router';
+import type { Handle } from 'remix/ui';
+
+import { assets, entryHref, entryPreloads } from '../assets.ts';
+import { routes } from '../routes.ts';
+
+function HomePage(handle: Handle<Record<string, never>>) {
+  return () => (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <title>Sentry Remix 3</title>
+        {entryPreloads.map(href => (
+          <link key={href} rel="modulepreload" href={href} />
+        ))}
+        <script type="module" src={entryHref}></script>
+      </head>
+      <body>
+        <h1 id="home">Sentry Remix 3</h1>
+      </body>
+    </html>
+  );
+}
+
+export default createController(routes, {
+  actions: {
+    async assets(context) {
+      return (await assets.fetch(context.request)) ?? new Response('Not Found', { status: 404 });
+    },
+    home(context) {
+      return context.render(<HomePage />);
+    },
+  },
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/app/actions/public/entry.ts b/dev-packages/e2e-tests/test-applications/remix-v3/app/actions/public/entry.ts
new file mode 100644
index 000000000000..5f0ebdc1248e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/app/actions/public/entry.ts
@@ -0,0 +1,9 @@
+import { run } from 'remix/ui';
+
+// No Sentry here yet: `@sentry/remix/v3/client` does not export `init` until the browser SDK lands.
+export const app = run({
+  async loadModule(moduleUrl, exportName) {
+    let mod = await import(moduleUrl);
+    return mod[exportName];
+  },
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/app/assets.ts b/dev-packages/e2e-tests/test-applications/remix-v3/app/assets.ts
new file mode 100644
index 000000000000..a3c153578aa6
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/app/assets.ts
@@ -0,0 +1,15 @@
+import { createAssetServer } from 'remix/assets';
+
+export const assets = createAssetServer({
+  basePath: '/assets',
+  rootDir: process.cwd(),
+  allowFiles: ['app/routes.ts', 'app/**/public/**'],
+  allowPackages: ['remix', '@sentry/remix'],
+  minify: true,
+  watch: false,
+});
+
+const entry = 'app/actions/public/entry.ts';
+
+export const entryHref = await assets.getHref(entry);
+export const entryPreloads = await assets.getPreloads(entry);
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/app/router.ts b/dev-packages/e2e-tests/test-applications/remix-v3/app/router.ts
new file mode 100644
index 000000000000..aef480456066
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/app/router.ts
@@ -0,0 +1,21 @@
+import { createRouter, type MiddlewareContext } from 'remix/router';
+import { render } from 'remix/middleware/render';
+
+import controller from './actions/controller.tsx';
+import { assets } from './assets.ts';
+import { routes } from './routes.ts';
+
+const renderMiddleware = render({ assets });
+type AppContext = MiddlewareContext<[typeof renderMiddleware]>;
+
+declare module 'remix/router' {
+  interface RouterTypes {
+    context: AppContext;
+  }
+}
+
+export const router = createRouter<AppContext>({
+  middleware: [renderMiddleware],
+});
+
+router.map(routes, controller);
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/app/routes.ts b/dev-packages/e2e-tests/test-applications/remix-v3/app/routes.ts
new file mode 100644
index 000000000000..1ebc77927332
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/app/routes.ts
@@ -0,0 +1,6 @@
+import { get, route } from 'remix/routes';
+
+export const routes = route({
+  assets: get('/assets/*path'),
+  home: '/',
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/package.json b/dev-packages/e2e-tests/test-applications/remix-v3/package.json
new file mode 100644
index 000000000000..7f5e5928e5e4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "remix-v3-app",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "start": "NODE_ENV=production node --import @sentry/remix/v3/node server.ts",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@sentry/remix": "file:../../packed/sentry-remix-packed.tgz",
+    "remix": "3.0.0-rc.1"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.56.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@sentry/core": "file:../../packed/sentry-core-packed.tgz",
+    "@types/node": "^24.6.0",
+    "typescript": "~5.9.0"
+  },
+  "volta": {
+    "node": "24.18.0",
+    "pnpm": "9.15.9"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/remix-v3/playwright.config.mjs
new file mode 100644
index 000000000000..fe438320a9c1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/playwright.config.mjs
@@ -0,0 +1,9 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+  port: 3060,
+  eventProxyPort: 3061,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/server.ts b/dev-packages/e2e-tests/test-applications/remix-v3/server.ts
new file mode 100644
index 000000000000..56408af2bbe9
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/server.ts
@@ -0,0 +1,27 @@
+import * as Sentry from '@sentry/remix/v3';
+import * as http from 'node:http';
+import { createRequestListener } from 'remix/node-fetch-server';
+
+import { router } from './app/router.ts';
+
+Sentry.init({
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3061/',
+  tracesSampleRate: 1.0,
+});
+
+const port = process.env.PORT ? Number.parseInt(process.env.PORT, 10) : 3060;
+
+const server = http.createServer(
+  createRequestListener(async request => {
+    try {
+      return await router.fetch(request);
+    } catch {
+      return new Response('Internal Server Error', { status: 500 });
+    }
+  }),
+);
+
+server.listen(port, () => {
+  console.log(`Server listening on http://localhost:${port}`);
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/remix-v3/start-event-proxy.mjs
new file mode 100644
index 000000000000..a1fc09b10ccc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3061,
+  proxyServerName: 'remix-v3',
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/tests/smoke.test.ts b/dev-packages/e2e-tests/test-applications/remix-v3/tests/smoke.test.ts
new file mode 100644
index 000000000000..85e4619e49c4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/tests/smoke.test.ts
@@ -0,0 +1,20 @@
+import { expect, test } from '@playwright/test';
+import { waitForStreamedSpan } from '@sentry-internal/test-utils';
+
+// There is no instrumentation yet. This app exists so later pull requests add instrumentation and its
+// tests together, rather than also introducing a new CI surface.
+test('the app boots under the Sentry --import entry', async ({ page }) => {
+  await page.goto('/');
+
+  await expect(page.locator('#home')).toBeVisible();
+});
+
+test('Sentry.init from the v3 subpath reports a server span', async ({ baseURL }) => {
+  // Names are still URL based. This only proves the subpath resolves and the SDK is live.
+  const spanPromise = waitForStreamedSpan('remix-v3', span => span.is_segment === true);
+
+  await fetch(`${baseURL}/`);
+
+  const span = await spanPromise;
+  expect(span.attributes?.['http.request.method']?.value).toBe('GET');
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-v3/tsconfig.json b/dev-packages/e2e-tests/test-applications/remix-v3/tsconfig.json
new file mode 100644
index 000000000000..0c60cc275fbb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/remix-v3/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "strict": true,
+    "lib": ["ES2024", "DOM", "DOM.Iterable"],
+    "types": ["node"],
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "target": "ESNext",
+    "allowImportingTsExtensions": true,
+    "rewriteRelativeImportExtensions": true,
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "skipLibCheck": true,
+    "jsx": "react-jsx",
+    "jsxImportSource": "remix/ui",
+    "noEmit": true
+  },
+  "exclude": ["tests"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-2/package.json b/dev-packages/e2e-tests/test-applications/solidstart-2/package.json
index 32ba083c62c3..58c2b2b37c00 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart-2/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart-2/package.json
@@ -34,8 +34,7 @@
     "vitest": "^1.5.0"
   },
   "volta": {
-    "extends": "../../package.json",
-    "node": "24.15.0"
+    "extends": "../../package.json"
   },
   "engines": {
     "node": ">=24"
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-static/package.json b/dev-packages/e2e-tests/test-applications/solidstart-static/package.json
index 9aaf9e1de0ce..1077b195acb6 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart-static/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart-static/package.json
@@ -34,6 +34,7 @@
     "vitest": "^3.2.7"
   },
   "volta": {
+    "node": "20.19.5",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/package.json b/dev-packages/e2e-tests/test-applications/solidstart/package.json
index 5fa6f2bdb1ca..ed907f5c5a47 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart/package.json
@@ -36,6 +36,7 @@
     "vitest": "^3.2.7"
   },
   "volta": {
+    "node": "20.19.5",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json
index c14f48ab84db..aadd142baf49 100644
--- a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json
+++ b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json
@@ -31,7 +31,6 @@
     "wrangler": "^4.61.0"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/package.json b/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/package.json
index 18b2fd3d1d5e..5cf6accf0cd1 100644
--- a/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/package.json
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react-cloudflare/package.json
@@ -35,7 +35,6 @@
     "wrangler": "^4.68.1"
   },
   "volta": {
-    "node": "24.15.0",
     "extends": "../../package.json"
   },
   "sentryTest": {
diff --git a/dev-packages/e2e-tests/test-applications/tsx-express/package.json b/dev-packages/e2e-tests/test-applications/tsx-express/package.json
index cb25a8631317..77277c1e9394 100644
--- a/dev-packages/e2e-tests/test-applications/tsx-express/package.json
+++ b/dev-packages/e2e-tests/test-applications/tsx-express/package.json
@@ -30,6 +30,7 @@
     "@types/qs": "6.9.17"
   },
   "volta": {
+    "node": "20.19.5",
     "extends": "../../package.json"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/vue-3/package.json b/dev-packages/e2e-tests/test-applications/vue-3/package.json
index e87d8ce706b1..c05e9581f155 100644
--- a/dev-packages/e2e-tests/test-applications/vue-3/package.json
+++ b/dev-packages/e2e-tests/test-applications/vue-3/package.json
@@ -18,7 +18,10 @@
     "test:build-no-options-api": "pnpm install && VUE_OPTIONS_API=false pnpm build",
     "test:assert-no-options-api": "VUE_OPTIONS_API=false pnpm test:assert",
     "test:install-canary": "pnpm add vue@$(git ls-remote --tags --sort='v:refname' https://github.com/vuejs/core.git | tail -n1 | awk -F'/' '{print $NF}')",
-    "test:print-version": "node -p \"'Vue version: ' + require('vue/package.json').version\""
+    "test:print-version": "node -p \"'Vue version: ' + require('vue/package.json').version\"",
+    "test:build-vue-router-5": "pnpm install && pnpm add vue-router@5 && pnpm build",
+    "test:assert-vue-router-5": "pnpm test:print-version && pnpm test:print-router-version && playwright test",
+    "test:print-router-version": "node -p \"'Vue Router version: ' + require('vue-router/package.json').version\""
   },
   "dependencies": {
     "@sentry/vue": "file:../../packed/sentry-vue-packed.tgz",
@@ -48,6 +51,11 @@
       {
         "build-command": "pnpm test:build-latest",
         "label": "vue-3 (latest)"
+      },
+      {
+        "build-command": "pnpm test:build-vue-router-5",
+        "assert-command": "pnpm test:assert-vue-router-5",
+        "label": "vue-3 (vue-router 5)"
       }
     ],
     "optionalVariants": [
diff --git a/dev-packages/node-integration-tests/README.md b/dev-packages/node-integration-tests/README.md
index b2d8db2124d1..e8e9aedf5620 100644
--- a/dev-packages/node-integration-tests/README.md
+++ b/dev-packages/node-integration-tests/README.md
@@ -34,6 +34,13 @@ Nock interceptors are internally used to capture envelope requests by `getEnvelo
 be used inside the test cases to intercept requests but should be removed before the test ends, as not to cause
 flakiness.
 
+## Other Runtimes
+
+`dev-packages/bun-integration-tests` and `dev-packages/deno-integration-tests` run every suite of this package on Bun
+and Deno as well. When you add a suite, check that it passes on both. If it cannot, add it to
+`node-suites/excludes.ts` of the runtime's package with the reason, or skip the single tests that fail with
+`test.skipIf(RUNTIME === 'bun')` or `test.skipIf(RUNTIME === 'deno')`.
+
 ## Running Tests Locally
 
 Tests can be run locally with:
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 31054913628e..cadbb4cc7cee 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -108,7 +108,7 @@
   },
   "devDependencies": {
     "@opentelemetry/instrumentation-http": "0.220.0",
-    "@sentry/conventions": "0.23.0",
+    "@sentry/conventions": "0.24.0",
     "@sentry-internal/test-utils": "11.0.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
diff --git a/dev-packages/node-integration-tests/suites/consola/test.ts b/dev-packages/node-integration-tests/suites/consola/test.ts
index aee250967e64..1afcd97cb025 100644
--- a/dev-packages/node-integration-tests/suites/consola/test.ts
+++ b/dev-packages/node-integration-tests/suites/consola/test.ts
@@ -1,5 +1,6 @@
 import { afterAll, describe, expect } from 'vitest';
 import { cleanupChildProcesses, createCjsTests } from '../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../utils';
 
 describe('consola integration', () => {
   afterAll(() => {
@@ -22,7 +23,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'info', type: 'string' },
@@ -39,7 +40,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'error', type: 'string' },
@@ -56,7 +57,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'warn', type: 'string' },
@@ -89,7 +90,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'info', type: 'string' },
@@ -106,7 +107,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'error', type: 'string' },
@@ -123,7 +124,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'warn', type: 'string' },
@@ -141,7 +142,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'success', type: 'string' },
@@ -158,7 +159,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'fail', type: 'string' },
@@ -175,7 +176,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'ready', type: 'string' },
@@ -192,7 +193,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'start', type: 'string' },
@@ -209,7 +210,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'box', type: 'string' },
@@ -226,7 +227,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'verbose', type: 'string' },
@@ -242,7 +243,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'debug', type: 'string' },
@@ -259,7 +260,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'trace', type: 'string' },
@@ -291,7 +292,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'info', type: 'string' },
@@ -308,7 +309,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'debug', type: 'string' },
@@ -352,7 +353,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.tag': { value: 'api', type: 'string' },
@@ -370,7 +371,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.tag': { value: 'api', type: 'string' },
@@ -404,7 +405,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'warn', type: 'string' },
@@ -422,7 +423,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'error', type: 'string' },
@@ -454,7 +455,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'fatal', type: 'string' },
@@ -471,7 +472,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'warn', type: 'string' },
@@ -488,7 +489,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'info', type: 'string' },
@@ -520,7 +521,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'info', type: 'string' },
@@ -539,7 +540,7 @@ describe('consola integration', () => {
                   'sentry.origin': { value: 'auto.log.consola', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   'consola.type': { value: 'info', type: 'string' },
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
index 63683b9ab7fd..8873d746159a 100644
--- a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
@@ -2,6 +2,7 @@ import { mkdirSync, rmdirSync, unlinkSync, writeFileSync } from 'fs';
 import * as path from 'path';
 import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { RUNTIME } from '../../../utils';
 
 const EXPECTED_LOCAL_VARIABLES_EVENT = {
   exception: {
@@ -79,14 +80,15 @@ module.exports = { out_of_app_function };`,
       .completed();
   });
 
-  test('Should include local variables when enabled', async () => {
+  // Bun and Deno: the error events have no local variables.
+  test.skipIf(RUNTIME !== 'node')('Should include local variables when enabled', async () => {
     await createRunner(__dirname, 'local-variables.js')
       .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
       .start()
       .completed();
   });
 
-  test('Should include local variables when instrumenting via --import', async () => {
+  test.skipIf(RUNTIME !== 'node')('Should include local variables when instrumenting via --import', async () => {
     const instrumentPath = path.resolve(__dirname, 'local-variables-instrument.cjs');
 
     await createRunner(__dirname, 'local-variables-no-sentry.js')
@@ -96,7 +98,7 @@ module.exports = { out_of_app_function };`,
       .completed();
   });
 
-  test('Should include local variables with ESM', async () => {
+  test.skipIf(RUNTIME !== 'node')('Should include local variables with ESM', async () => {
     await createRunner(__dirname, 'local-variables-caught.mjs')
       .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
       .start()
@@ -107,36 +109,39 @@ module.exports = { out_of_app_function };`,
     await createRunner(__dirname, 'deny-inspector.mjs').ensureNoErrorOutput().start().completed();
   });
 
-  test('Should retain original local variables when error is re-thrown', async () => {
+  test.skipIf(RUNTIME !== 'node')('Should retain original local variables when error is re-thrown', async () => {
     await createRunner(__dirname, 'local-variables-rethrow.js')
       .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
       .start()
       .completed();
   });
 
-  test('Includes local variables for caught exceptions when enabled', async () => {
+  test.skipIf(RUNTIME !== 'node')('Includes local variables for caught exceptions when enabled', async () => {
     await createRunner(__dirname, 'local-variables-caught.js')
       .expect({ event: EXPECTED_LOCAL_VARIABLES_EVENT })
       .start()
       .completed();
   });
 
-  test('Filters local variables by name via dataCollection.stackFrameVariables', async () => {
-    await createRunner(__dirname, 'local-variables-filtered.js')
-      .expect({
-        event: event => {
-          const frame = event.exception?.values?.[0]?.stacktrace?.frames?.find(frame => frame.function === 'one');
-
-          expect(frame?.vars).toEqual({
-            name: 'some name',
-            keepVar: 'keep me',
-            secretVar: '[Filtered]',
-          });
-        },
-      })
-      .start()
-      .completed();
-  });
+  test.skipIf(RUNTIME !== 'node')(
+    'Filters local variables by name via dataCollection.stackFrameVariables',
+    async () => {
+      await createRunner(__dirname, 'local-variables-filtered.js')
+        .expect({
+          event: event => {
+            const frame = event.exception?.values?.[0]?.stacktrace?.frames?.find(frame => frame.function === 'one');
+
+            expect(frame?.vars).toEqual({
+              name: 'some name',
+              keepVar: 'keep me',
+              secretVar: '[Filtered]',
+            });
+          },
+        })
+        .start()
+        .completed();
+    },
+  );
 
   test('Does not attach local variables when dataCollection.stackFrameVariables is false', async () => {
     await createRunner(__dirname, 'local-variables-disabled.js')
@@ -151,7 +156,7 @@ module.exports = { out_of_app_function };`,
       .completed();
   });
 
-  test('Should handle different function name formats', async () => {
+  test.skipIf(RUNTIME !== 'node')('Should handle different function name formats', async () => {
     await createRunner(__dirname, 'local-variables-name-matching.js')
       .expect({
         event: {
@@ -177,30 +182,33 @@ module.exports = { out_of_app_function };`,
       .completed();
   });
 
-  test('adds local variables to out of app frames when includeOutOfAppFrames is true', async () => {
-    await createRunner(__dirname, 'local-variables-out-of-app.js')
-      .expect({
-        event: event => {
-          const frames = event.exception?.values?.[0]?.stacktrace?.frames || [];
-
-          const inAppFrame = frames.find(frame => frame.function === 'in_app_function');
-          const outOfAppFrame = frames.find(frame => frame.function === 'out_of_app_function');
-
-          expect(inAppFrame?.vars).toEqual({ inAppVar: 'in app value' });
-          expect(inAppFrame?.in_app).toEqual(true);
-
-          expect(outOfAppFrame?.vars).toEqual({
-            outOfAppVar: 'out of app value modified value',
-            passedArg: 'in app value modified value',
-          });
-          expect(outOfAppFrame?.in_app).toEqual(false);
-        },
-      })
-      .start()
-      .completed();
-  });
+  test.skipIf(RUNTIME !== 'node')(
+    'adds local variables to out of app frames when includeOutOfAppFrames is true',
+    async () => {
+      await createRunner(__dirname, 'local-variables-out-of-app.js')
+        .expect({
+          event: event => {
+            const frames = event.exception?.values?.[0]?.stacktrace?.frames || [];
+
+            const inAppFrame = frames.find(frame => frame.function === 'in_app_function');
+            const outOfAppFrame = frames.find(frame => frame.function === 'out_of_app_function');
+
+            expect(inAppFrame?.vars).toEqual({ inAppVar: 'in app value' });
+            expect(inAppFrame?.in_app).toEqual(true);
+
+            expect(outOfAppFrame?.vars).toEqual({
+              outOfAppVar: 'out of app value modified value',
+              passedArg: 'in app value modified value',
+            });
+            expect(outOfAppFrame?.in_app).toEqual(false);
+          },
+        })
+        .start()
+        .completed();
+    },
+  );
 
-  test('does not add local variables to out of app frames by default', async () => {
+  test.skipIf(RUNTIME !== 'node')('does not add local variables to out of app frames by default', async () => {
     await createRunner(__dirname, 'local-variables-out-of-app-default.js')
       .expect({
         event: event => {
diff --git a/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/test.ts b/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/test.ts
index 55e22ba46558..ef52edf7059d 100644
--- a/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/OnUncaughtException/test.ts
@@ -2,6 +2,7 @@ import * as childProcess from 'child_process';
 import * as path from 'path';
 import { describe, expect, test } from 'vitest';
 import { createRunner } from '../../../utils/runner';
+import { RUNTIME } from '../../../utils';
 
 describe('OnUncaughtException integration', () => {
   test('should close process on uncaught error with no additional listeners registered', () =>
@@ -122,7 +123,8 @@ describe('OnUncaughtException integration', () => {
       .completed();
   });
 
-  describe('Worker thread error handling', () => {
+  // Bun and Deno: the worker thread errors are not handled as on Node.
+  describe.skipIf(RUNTIME !== 'node')('Worker thread error handling', () => {
     test.each(['mjs', 'js'])('should not interfere with worker thread error handling ".%s"', async extension => {
       const runner = createRunner(__dirname, `worker-thread/caught-worker.${extension}`)
         .withFlags('--import', path.join(__dirname, `worker-thread/instrument.${extension}`))
diff --git a/dev-packages/node-integration-tests/suites/public-api/logger/test.ts b/dev-packages/node-integration-tests/suites/public-api/logger/test.ts
index d81b602e0527..f02c1fc2d384 100644
--- a/dev-packages/node-integration-tests/suites/public-api/logger/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/logger/test.ts
@@ -1,6 +1,7 @@
 import type { SerializedLog } from '@sentry/core';
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../../utils';
 
 const commonAttributes: SerializedLog['attributes'] = {
   'sentry.environment': {
@@ -13,7 +14,7 @@ const commonAttributes: SerializedLog['attributes'] = {
   },
   'sentry.sdk.name': {
     type: 'string',
-    value: 'sentry.javascript.node',
+    value: EXPECTED_SDK_NAME,
   },
   'sentry.sdk.version': {
     type: 'string',
diff --git a/dev-packages/node-integration-tests/suites/public-api/logs/test.ts b/dev-packages/node-integration-tests/suites/public-api/logs/test.ts
index 8afc4402475d..cbbb6d309ce7 100644
--- a/dev-packages/node-integration-tests/suites/public-api/logs/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/logs/test.ts
@@ -1,5 +1,6 @@
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../../utils';
 
 describe('logger public API', () => {
   afterAll(() => {
@@ -21,7 +22,7 @@ describe('logger public API', () => {
                   },
                   'sentry.sdk.name': {
                     type: 'string',
-                    value: 'sentry.javascript.node',
+                    value: EXPECTED_SDK_NAME,
                   },
                   'sentry.sdk.version': {
                     type: 'string',
@@ -62,7 +63,7 @@ describe('logger public API', () => {
                   },
                   'sentry.sdk.name': {
                     type: 'string',
-                    value: 'sentry.javascript.node',
+                    value: EXPECTED_SDK_NAME,
                   },
                   'sentry.sdk.version': {
                     type: 'string',
@@ -103,7 +104,7 @@ describe('logger public API', () => {
                   },
                   'sentry.sdk.name': {
                     type: 'string',
-                    value: 'sentry.javascript.node',
+                    value: EXPECTED_SDK_NAME,
                   },
                   'sentry.sdk.version': {
                     type: 'string',
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts
index dfb3094f1bb9..05dc9da2ae0a 100644
--- a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts
@@ -1,5 +1,6 @@
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../../../utils';
 
 describe('metrics server.address', () => {
   afterAll(() => {
@@ -23,7 +24,7 @@ describe('metrics server.address', () => {
                 'server.address': { value: 'mi-servidor.com', type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
               },
             },
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts
index 86eb295e0c5d..4b59653855aa 100644
--- a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts
@@ -1,5 +1,6 @@
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../../../utils';
 
 describe('metrics server.address', () => {
   afterAll(() => {
@@ -23,7 +24,7 @@ describe('metrics server.address', () => {
                 'server.address': { value: expect.any(String), type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                 'sentry.timestamp.sequence': { value: expect.any(Number), type: 'integer' },
               },
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/test.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/test.ts
index 9b266552b052..1e4db38e3f3c 100644
--- a/dev-packages/node-integration-tests/suites/public-api/metrics/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/test.ts
@@ -1,5 +1,6 @@
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../../utils';
 
 describe('metrics', () => {
   afterAll(() => {
@@ -22,7 +23,7 @@ describe('metrics', () => {
                 endpoint: { value: '/api/test', type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
               },
             },
@@ -37,7 +38,7 @@ describe('metrics', () => {
                 server: { value: 'test-1', type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
               },
             },
@@ -52,7 +53,7 @@ describe('metrics', () => {
                 priority: { value: 'high', type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
               },
             },
@@ -66,7 +67,7 @@ describe('metrics', () => {
                 operation: { value: 'test', type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
               },
             },
@@ -83,7 +84,7 @@ describe('metrics', () => {
                 'user.name': { value: 'testuser', type: 'string' },
                 'sentry.release': { value: '1.0.0', type: 'string' },
                 'sentry.environment': { value: 'test', type: 'string' },
-                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                 'sentry.sdk.version': { value: expect.any(String), type: 'string' },
               },
             },
@@ -121,7 +122,7 @@ describe('metrics', () => {
                 },
                 'sentry.sdk.name': {
                   type: 'string',
-                  value: 'sentry.javascript.node',
+                  value: EXPECTED_SDK_NAME,
                 },
                 'sentry.sdk.version': {
                   type: 'string',
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts
index 2b90612ed505..0cc15ce97173 100644
--- a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts
@@ -3,6 +3,7 @@ import * as childProcess from 'child_process';
 import * as path from 'path';
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+import { RUNTIME } from '../../../utils';
 
 describe('onUnhandledRejectionIntegration', () => {
   afterAll(() => {
@@ -141,7 +142,8 @@ test rejection`);
       .completed();
   });
 
-  test('handles unhandled rejection in spans', async () => {
+  // Bun: the error event arrives before the transaction, or has a different span id.
+  test.skipIf(RUNTIME === 'bun')('handles unhandled rejection in spans', async () => {
     let transactionEvent: Event | undefined;
     let errorEvent: Event | undefined;
 
@@ -168,7 +170,7 @@ test rejection`);
     expect(transactionEvent!.contexts!.trace!.span_id).toBe(errorEvent!.contexts!.trace!.span_id);
   });
 
-  test('handles unhandled rejection in spans that are ended early', async () => {
+  test.skipIf(RUNTIME === 'bun')('handles unhandled rejection in spans that are ended early', async () => {
     let transactionEvent: Event | undefined;
     let errorEvent: Event | undefined;
 
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts
index 3aef47e9c9ba..1d2bd3cd8bfc 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage-streamed/test.ts
@@ -17,6 +17,7 @@ import {
 } from '@sentry/conventions/attributes';
 import { expect, test } from 'vitest';
 import { createRunner } from '../../../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../../../utils';
 
 test('sends a streamed span envelope with correct envelope header', async () => {
   await createRunner(__dirname, 'scenario.ts')
@@ -24,7 +25,7 @@ test('sends a streamed span envelope with correct envelope header', async () =>
       span: {
         sent_at: expect.any(String),
         sdk: {
-          name: 'sentry.javascript.node',
+          name: EXPECTED_SDK_NAME,
           version: SDK_VERSION,
         },
         trace: expect.objectContaining({
@@ -63,7 +64,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
               type: 'string',
               value: 'test-child',
             },
-            [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' },
+            [SENTRY_SDK_NAME]: { type: 'string', value: EXPECTED_SDK_NAME },
             [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
             [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
             [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' },
@@ -87,7 +88,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
           attributes: {
             [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' },
             'sentry.is_localhost': { type: 'boolean', value: false },
-            [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' },
+            [SENTRY_SDK_NAME]: { type: 'string', value: EXPECTED_SDK_NAME },
             [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
             [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
             [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' },
@@ -124,7 +125,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
           attributes: {
             [SENTRY_TRACE_LIFECYCLE]: { type: 'string', value: 'stream' },
             'sentry.is_localhost': { type: 'boolean', value: false },
-            [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' },
+            [SENTRY_SDK_NAME]: { type: 'string', value: EXPECTED_SDK_NAME },
             [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
             [SENTRY_SEGMENT_ID]: { type: 'string', value: segmentSpanId },
             [SENTRY_SEGMENT_NAME]: { type: 'string', value: 'test-span' },
@@ -147,7 +148,7 @@ test('sends a streamed span envelope with correct spans for a manually started s
           'sentry.is_localhost': { type: 'boolean', value: false },
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: { type: 'string', value: 'test' },
           [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: { type: 'integer', value: 1 },
-          [SENTRY_SDK_NAME]: { type: 'string', value: 'sentry.javascript.node' },
+          [SENTRY_SDK_NAME]: { type: 'string', value: EXPECTED_SDK_NAME },
           [SENTRY_SDK_VERSION]: { type: 'string', value: SDK_VERSION },
           [SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS]: {
             type: 'array',
diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
index 301f5520f553..fade84b952a4 100644
--- a/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/test.ts
@@ -49,8 +49,9 @@ describeWithDockerCompose('amqplib auto-instrumentation', { workingDirectory: [_
   });
 
   describe.each([
+    ['v0', {}],
     ['v1', { amqplib: '^1.0.0' }],
-    ['v2', {}],
+    ['v2', { amqplib: '^2.0.0' }],
   ])('%s', (_version, additionalDependencies) => {
     createEsmAndCjsTests(
       __dirname,
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts
index 254aa9adc579..5890e9c365cf 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   tracePropagationTargets: [/\/v0/, 'v1'],
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
index 131c5b208239..6c568715f905 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
@@ -3,7 +3,7 @@ import { createRunner } from '../../../../utils/runner';
 
 test('envelope header for error event during active unsampled span is correct', async () => {
   await createRunner(__dirname, 'scenario.ts')
-    .ignore('transaction')
+    .ignore('span')
     .expectHeader({
       event: {
         trace: {
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts
index 020b687d2e22..b45aed2e5572 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   tracePropagationTargets: [/\/v0/, 'v1'],
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
index 4b103c7e7d79..cd00e51ea958 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
@@ -3,7 +3,7 @@ import { createRunner } from '../../../../utils/runner';
 
 test('envelope header for error event during active span is correct', async () => {
   await createRunner(__dirname, 'scenario.ts')
-    .ignore('transaction')
+    .ignore('span')
     .expectHeader({
       event: {
         trace: {
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts
index 16d7d686b2f1..e87cf53b8c80 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   tracePropagationTargets: [/\/v0/, 'v1'],
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js
index 9d1af464ce56..6f7ecfa269f0 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/server.js
@@ -2,7 +2,6 @@ const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 const Sentry = require('@sentry/node');
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   // disable attaching headers to /test/* endpoints
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts
index 63db6ff4e820..cdb264095446 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/sampleRate-propagation/test.ts
@@ -8,11 +8,12 @@ describe('tracesSampleRate propagation', () => {
 
   const traceId = '12345678123456781234567812345678';
 
-  test('uses sample rate from incoming baggage header in trace envelope item', async () => {
+  test('uses the incoming sample rate in the streamed span envelope header', async () => {
     const runner = createRunner(__dirname, 'server.js')
       .expectHeader({
-        transaction: {
+        span: {
           trace: {
+            public_key: 'public',
             sample_rate: '0.05',
             sampled: 'true',
             trace_id: traceId,
@@ -22,10 +23,10 @@ describe('tracesSampleRate propagation', () => {
         },
       })
       .start();
-    runner.makeRequest('get', '/test', {
+    await runner.makeRequest('get', '/test', {
       headers: {
         'sentry-trace': `${traceId}-1234567812345678-1`,
-        baggage: `sentry-sample_rate=0.05,sentry-trace_id=${traceId},sentry-sampled=true,sentry-transaction=myTransaction,sentry-sample_rand=0.42`,
+        baggage: `sentry-public_key=public,sentry-sample_rate=0.05,sentry-trace_id=${traceId},sentry-sampled=true,sentry-transaction=myTransaction,sentry-sample_rand=0.42`,
       },
     });
     await runner.completed();
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts
index 87f2a025a57c..4d67fee0a0d2 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts
@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/node';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   tracePropagationTargets: [/\/v0/, 'v1'],
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
index 9798194b0c1c..63883ec44577 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
@@ -1,10 +1,10 @@
 import { expect, test } from 'vitest';
 import { createRunner } from '../../../../utils/runner';
 
-test('envelope header for transaction event of route correct', async () => {
+test('includes the route name in the streamed span envelope header', async () => {
   await createRunner(__dirname, 'scenario.ts')
     .expectHeader({
-      transaction: {
+      span: {
         trace: {
           trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts
index 093856dd1d12..69b76f248555 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts
@@ -3,7 +3,6 @@ import * as Sentry from '@sentry/node';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   tracePropagationTargets: [/\/v0/, 'v1'],
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
index 7b6b07191c44..c448336148a1 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
@@ -1,10 +1,10 @@
 import { expect, test } from 'vitest';
 import { createRunner } from '../../../../utils/runner';
 
-test('envelope header for transaction event with source=url correct', async () => {
+test('omits the URL-sourced name from the streamed span envelope header', async () => {
   await createRunner(__dirname, 'scenario.ts')
     .expectHeader({
-      transaction: {
+      span: {
         trace: {
           trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts
index f8e208bd56d7..05b2e5d48de2 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/node';
 import { loggingTransport } from '@sentry-internal/node-integration-tests';
 
 Sentry.init({
-  traceLifecycle: 'static',
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0',
   tracePropagationTargets: [/\/v0/, 'v1'],
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts
index 24276f57f212..8b7cdfbf8a18 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts
@@ -1,10 +1,10 @@
 import { expect, test } from 'vitest';
 import { createRunner } from '../../../../utils/runner';
 
-test('envelope header for transaction event is correct', async () => {
+test('envelope header for streamed spans is correct', async () => {
   await createRunner(__dirname, 'scenario.ts')
     .expectHeader({
-      transaction: {
+      span: {
         trace: {
           trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
diff --git a/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts b/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
index 80e6b9c25b33..6f51960996fa 100644
--- a/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
@@ -199,7 +199,13 @@ describe('Google GenAI integration', () => {
             expect(nonStreamingToolsSpan!.attributes[GEN_AI_OPERATION_NAME].value).toBe('generate_content');
             expect(nonStreamingToolsSpan!.attributes[GEN_AI_INPUT_MESSAGES]).toBeDefined();
             expect(nonStreamingToolsSpan!.attributes[GEN_AI_RESPONSE_TEXT]).toBeDefined();
-            expect(nonStreamingToolsSpan!.attributes[GEN_AI_RESPONSE_TOOL_CALLS]).toBeDefined();
+            expect(JSON.parse(nonStreamingToolsSpan!.attributes[GEN_AI_RESPONSE_TOOL_CALLS].value as string)).toEqual([
+              {
+                id: 'call_light_control_1',
+                name: 'controlLight',
+                args: { brightness: 0.3, colorTemperature: 'warm' },
+              },
+            ]);
             expect(nonStreamingToolsSpan!.attributes[GEN_AI_OUTPUT_MESSAGES].value).toBe(
               JSON.stringify([
                 {
@@ -231,7 +237,13 @@ describe('Google GenAI integration', () => {
             expect(streamingToolsSpan!.attributes[GEN_AI_OPERATION_NAME].value).toBe('generate_content');
             expect(streamingToolsSpan!.attributes[GEN_AI_INPUT_MESSAGES]).toBeDefined();
             expect(streamingToolsSpan!.attributes[GEN_AI_RESPONSE_TEXT]).toBeDefined();
-            expect(streamingToolsSpan!.attributes[GEN_AI_RESPONSE_TOOL_CALLS]).toBeDefined();
+            expect(JSON.parse(streamingToolsSpan!.attributes[GEN_AI_RESPONSE_TOOL_CALLS].value as string)).toEqual([
+              {
+                id: 'call_light_stream_1',
+                name: 'controlLight',
+                args: { brightness: 0.5, colorTemperature: 'cool' },
+              },
+            ]);
             // The text arrives either side of the tool call, so it stays two parts.
             expect(streamingToolsSpan!.attributes[GEN_AI_OUTPUT_MESSAGES].value).toBe(
               JSON.stringify([
diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
index 76c62fdf7bd3..afd5cbe927a6 100644
--- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
@@ -2,6 +2,7 @@ import { createTestServer } from '@sentry-internal/test-utils';
 import { URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
 import { afterAll, describe, expect, test } from 'vitest';
 import { cleanupChildProcesses, createEsmAndCjsTests, createRunner } from '../../../utils/runner';
+import { RUNTIME } from '../../../utils';
 
 function getCommonHttpRequestHeaders(): Record<string, unknown> {
   return {
@@ -173,7 +174,8 @@ describe('httpIntegration', () => {
       });
     });
 
-    describe('custom server.emit', () => {
+    // Deno: the requests sometimes get a 500 response when `server.emit` is overwritten.
+    describe.skipIf(RUNTIME === 'deno')('custom server.emit', () => {
       createEsmAndCjsTests(
         __dirname,
         'scenario-overwrite-server-emit.mjs',
diff --git a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts
index ac7e950b58cb..5aa058ff4d7c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/ignoreSpans-streamed/continued-trace-segment/test.ts
@@ -1,5 +1,6 @@
 import { createTestServer } from '@sentry-internal/test-utils';
 import { afterAll, describe, expect } from 'vitest';
+import { RUNTIME } from '../../../../utils';
 import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';
 
 describe('ignoring a continued server segment (streaming)', () => {
@@ -40,7 +41,10 @@ describe('ignoring a continued server segment (streaming)', () => {
     };
 
     test('propagates a negative sampling decision to outgoing fetch requests', () => testPropagation('/ignored'));
-    test('propagates a negative sampling decision to outgoing node:http requests', () =>
-      testPropagation('/ignored-http'));
+    // Bun 1.3.14 does not instrument outgoing `node:http` requests.
+    // See https://github.com/getsentry/sentry-javascript/issues/23881
+    test.skipIf(RUNTIME === 'bun')('propagates a negative sampling decision to outgoing node:http requests', () =>
+      testPropagation('/ignored-http'),
+    );
   });
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/instrument.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/instrument.mjs
rename to dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/instrument.mjs
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/scenario-start-v2.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/scenario-start-v2.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/scenario-start-v2.mjs
rename to dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/scenario-start-v2.mjs
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/scenario-v1.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/scenario-v1.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/scenario-v1.mjs
rename to dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/scenario-v1.mjs
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/scenario.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/scenario.mjs
rename to dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/scenario.mjs
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/test.ts b/dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/test.ts
similarity index 97%
rename from dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/test.ts
rename to dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/test.ts
index d53f5756a4b6..ecf2f6e2ef7c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/mcp-server-streamed/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/manual-instrumentation/test.ts
@@ -1,6 +1,6 @@
 import type { SerializedStreamedSpanContainer } from '@sentry/core';
 import { afterAll, describe, expect } from 'vitest';
-import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';
 
 function mcpSpans(container: SerializedStreamedSpanContainer): SerializedStreamedSpanContainer['items'] {
   return container.items.filter(item => item.attributes['sentry.op']?.value === 'mcp.server');
@@ -20,7 +20,7 @@ function assertInitializeSpan(container: SerializedStreamedSpanContainer): void
   expect(initializeSpan.attributes['test.mcp.initialize_spans_started']).toEqual({ type: 'integer', value: 1 });
 }
 
-describe('MCP server spans (streamed)', () => {
+describe('MCP server spans (streamed, manual instrumentation)', () => {
   afterAll(() => {
     cleanupChildProcesses();
   });
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/instrument.mjs
new file mode 100644
index 000000000000..46a27dd03b74
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/instrument.mjs
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/scenario.mjs
new file mode 100644
index 000000000000..03b2198132f2
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/scenario.mjs
@@ -0,0 +1,28 @@
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
+import { McpServer, ResourceTemplate } from '@modelcontextprotocol/sdk/server/mcp.js';
+
+// Intentionally NOT wrapped with `wrapMcpServerWithSentry`: the `mcpServer` integration
+// auto-instruments the `McpServer` constructor via orchestrion, so spans must appear anyway.
+const server = new McpServer({ name: 'Echo', version: '1.0.0' });
+
+server.registerResource('echo', new ResourceTemplate('echo://{message}', { list: undefined }), {}, async uri => ({
+  contents: [{ uri: uri.href, text: 'Resource echo' }],
+}));
+
+server.registerTool('echo', {}, async () => ({ content: [{ type: 'text', text: 'Tool echo' }] }));
+
+async function run() {
+  const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+  const client = new Client({ name: 'test-client', version: '1.0.0' });
+
+  await Promise.all([server.connect(serverTransport), client.connect(clientTransport)]);
+
+  await client.readResource({ uri: 'echo://foobar' });
+  await client.callTool({ name: 'echo', arguments: {} });
+
+  await client.close();
+  await server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/test.ts b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/test.ts
new file mode 100644
index 000000000000..178858873426
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v1/test.ts
@@ -0,0 +1,79 @@
+import type { SerializedStreamedSpanContainer } from '@sentry/core';
+import { afterAll, describe, expect } from 'vitest';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';
+
+function mcpSpan(
+  container: SerializedStreamedSpanContainer,
+  method: string,
+): SerializedStreamedSpanContainer['items'][number] {
+  const span = container.items.find(
+    item =>
+      item.attributes['sentry.op']?.value === 'mcp.server' && item.attributes['mcp.method.name']?.value === method,
+  );
+  // Throwing here makes the (unordered) runner treat this container as "not the one" and wait for
+  // the next — streaming batches several segments per container, so the target may be elsewhere.
+  expect(span, `expected an mcp.server span for ${method}`).toBeDefined();
+  return span!;
+}
+
+// The `McpServer` is never manually wrapped — these assertions only pass if the `mcpServer`
+// integration auto-instrumented the constructor of the legacy (`@modelcontextprotocol/sdk` v1) SDK.
+// Each span type is asserted in its own runner so batched span containers can't consume an envelope
+// another assertion still needs.
+describe('MCP server spans (streamed, auto-instrumentation, v1)', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario.mjs',
+    'instrument.mjs',
+    (createTestRunner, test) => {
+      test('auto-instruments the initialize handshake', async () => {
+        await createTestRunner()
+          .unordered()
+          .expect({
+            span: container => {
+              const initialize = mcpSpan(container, 'initialize');
+              expect(initialize.name).toBe('initialize');
+              expect(initialize.attributes['sentry.origin']).toEqual({
+                type: 'string',
+                value: 'auto.function.mcp_server',
+              });
+            },
+          })
+          .start()
+          .completed();
+      });
+
+      test('auto-instruments a resource read', async () => {
+        await createTestRunner()
+          .unordered()
+          .expect({
+            span: container => {
+              const resource = mcpSpan(container, 'resources/read');
+              expect(resource.name).toBe('resources/read');
+              expect(resource.attributes['mcp.resource.uri']?.value).toBe('echo://foobar');
+            },
+          })
+          .start()
+          .completed();
+      });
+
+      test('auto-instruments a tool call', async () => {
+        await createTestRunner()
+          .unordered()
+          .expect({
+            span: container => {
+              const tool = mcpSpan(container, 'tools/call');
+              expect(tool.name).toBe('tools/call echo');
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    { additionalDependencies: { '@modelcontextprotocol/sdk': '1.30.0' } },
+  );
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/instrument.mjs
new file mode 100644
index 000000000000..46a27dd03b74
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/instrument.mjs
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/scenario.mjs
new file mode 100644
index 000000000000..8abcb9b54ac4
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/scenario.mjs
@@ -0,0 +1,27 @@
+import { Client } from '@modelcontextprotocol/client';
+import { InMemoryTransport, McpServer, ResourceTemplate } from '@modelcontextprotocol/server';
+
+// Intentionally NOT wrapped with `wrapMcpServerWithSentry`: the `mcpServer` integration
+// auto-instruments the `McpServer` constructor via orchestrion, so spans must appear anyway.
+const server = new McpServer({ name: 'Echo', version: '1.0.0' });
+
+server.registerResource('echo', new ResourceTemplate('echo://{message}', { list: undefined }), {}, async uri => ({
+  contents: [{ uri: uri.href, text: 'Resource echo' }],
+}));
+
+server.registerTool('echo', {}, async () => ({ content: [{ type: 'text', text: 'Tool echo' }] }));
+
+async function run() {
+  const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair();
+  const client = new Client({ name: 'test-client', version: '1.0.0' });
+
+  await Promise.all([server.connect(serverTransport), client.connect(clientTransport)]);
+
+  await client.readResource({ uri: 'echo://foobar' });
+  await client.callTool({ name: 'echo', arguments: {} });
+
+  await client.close();
+  await server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/test.ts b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/test.ts
new file mode 100644
index 000000000000..2b1a56785f5b
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/mcp-server/v2/test.ts
@@ -0,0 +1,72 @@
+import type { SerializedStreamedSpanContainer } from '@sentry/core';
+import { afterAll, describe, expect } from 'vitest';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';
+
+function mcpSpan(
+  container: SerializedStreamedSpanContainer,
+  method: string,
+): SerializedStreamedSpanContainer['items'][number] {
+  const span = container.items.find(
+    item =>
+      item.attributes['sentry.op']?.value === 'mcp.server' && item.attributes['mcp.method.name']?.value === method,
+  );
+  // Throwing here makes the (unordered) runner treat this container as "not the one" and wait for
+  // the next — streaming batches several segments per container, so the target may be elsewhere.
+  expect(span, `expected an mcp.server span for ${method}`).toBeDefined();
+  return span!;
+}
+
+// The `McpServer` is never manually wrapped — these assertions only pass if the `mcpServer`
+// integration auto-instrumented the constructor. Each span type is asserted in its own runner so
+// batched span containers can't consume an envelope another assertion still needs.
+describe('MCP server spans (streamed, auto-instrumentation, v2)', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createTestRunner, test) => {
+    test('auto-instruments the initialize handshake', async () => {
+      await createTestRunner()
+        .unordered()
+        .expect({
+          span: container => {
+            const initialize = mcpSpan(container, 'initialize');
+            expect(initialize.name).toBe('initialize');
+            expect(initialize.attributes['sentry.origin']).toEqual({
+              type: 'string',
+              value: 'auto.function.mcp_server',
+            });
+          },
+        })
+        .start()
+        .completed();
+    });
+
+    test('auto-instruments a resource read', async () => {
+      await createTestRunner()
+        .unordered()
+        .expect({
+          span: container => {
+            const resource = mcpSpan(container, 'resources/read');
+            expect(resource.name).toBe('resources/read');
+            expect(resource.attributes['mcp.resource.uri']?.value).toBe('echo://foobar');
+          },
+        })
+        .start()
+        .completed();
+    });
+
+    test('auto-instruments a tool call', async () => {
+      await createTestRunner()
+        .unordered()
+        .expect({
+          span: container => {
+            const tool = mcpSpan(container, 'tools/call');
+            expect(tool.name).toBe('tools/call echo');
+          },
+        })
+        .start()
+        .completed();
+    });
+  });
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/no-parent-span-client-report/test.ts b/dev-packages/node-integration-tests/suites/tracing/no-parent-span-client-report/test.ts
index 4ad1b3150f2c..e0b7c43abb1d 100644
--- a/dev-packages/node-integration-tests/suites/tracing/no-parent-span-client-report/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/no-parent-span-client-report/test.ts
@@ -1,4 +1,5 @@
 import { afterAll, describe, expect } from 'vitest';
+import { RUNTIME } from '../../../utils';
 import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
 
 describe('no_parent_span client report', () => {
@@ -7,24 +8,29 @@ describe('no_parent_span client report', () => {
   });
 
   createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
-    test('records no_parent_span outcome for an outgoing http request without a local parent', async () => {
-      const runner = createRunner()
-        .unignore('client_report')
-        .expect({
-          client_report: report => {
-            expect(report.discarded_events).toEqual([
-              {
-                category: 'span',
-                quantity: 1,
-                reason: 'no_parent_span',
-              },
-            ]);
-          },
-        })
-        .start();
+    // Bun 1.3.14 does not instrument outgoing `node:http` requests.
+    // See https://github.com/getsentry/sentry-javascript/issues/23881
+    test.skipIf(RUNTIME === 'bun')(
+      'records no_parent_span outcome for an outgoing http request without a local parent',
+      async () => {
+        const runner = createRunner()
+          .unignore('client_report')
+          .expect({
+            client_report: report => {
+              expect(report.discarded_events).toEqual([
+                {
+                  category: 'span',
+                  quantity: 1,
+                  reason: 'no_parent_span',
+                },
+              ]);
+            },
+          })
+          .start();
 
-      await runner.completed();
-    });
+        await runner.completed();
+      },
+    );
   });
 
   createEsmAndCjsTests(__dirname, 'scenario-fetch.mjs', 'instrument.mjs', (createRunner, test) => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
index 4b166d7a38d2..0a2be19dbc3f 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
@@ -322,6 +322,16 @@ describe('OpenAI integration', () => {
               type: 'string',
               value: 'auto.ai.openai',
             });
+
+            // GenAI inputs and outputs must never be recorded when `dataCollection.genAI` disables them.
+            // Asserting over every span in the envelope catches attributes leaking onto
+            // spans which are not individually inspected above.
+            for (const span of container.items) {
+              expect(span.attributes[GEN_AI_INPUT_MESSAGES]).toBeUndefined();
+              expect(span.attributes[GEN_AI_SYSTEM_INSTRUCTIONS]).toBeUndefined();
+              expect(span.attributes[GEN_AI_RESPONSE_TEXT]).toBeUndefined();
+              expect(span.attributes[GEN_AI_EMBEDDINGS_INPUT]).toBeUndefined();
+            }
           },
         })
         .start()
@@ -845,6 +855,16 @@ describe('OpenAI integration', () => {
               type: 'integer',
               value: 10,
             });
+
+            // GenAI inputs and outputs must never be recorded when `dataCollection.genAI` disables them.
+            // Asserting over every span in the envelope catches attributes leaking onto
+            // spans which are not individually inspected above.
+            for (const span of container.items) {
+              expect(span.attributes[GEN_AI_INPUT_MESSAGES]).toBeUndefined();
+              expect(span.attributes[GEN_AI_SYSTEM_INSTRUCTIONS]).toBeUndefined();
+              expect(span.attributes[GEN_AI_RESPONSE_TEXT]).toBeUndefined();
+              expect(span.attributes[GEN_AI_EMBEDDINGS_INPUT]).toBeUndefined();
+            }
           },
         })
         .start()
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts b/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts
index 645fe2ff8d12..92a48d809282 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/postgres-streamed/test.ts
@@ -227,7 +227,8 @@ describeWithDockerCompose('postgres auto instrumentation (streamed)', { workingD
     });
   });
 
-  conditionalTest({ max: 25 })('pg-native', () => {
+  // Deno: with a module load hook installed, Deno compiles a native addon (`libpq`) as JavaScript.
+  conditionalTest({ max: 25, skipRuntimes: ['deno'] })('pg-native', () => {
     createEsmAndCjsTests(
       __dirname,
       'scenario-native.mjs',
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgres/test.ts b/dev-packages/node-integration-tests/suites/tracing/postgres/test.ts
index ce96a147a315..304af1aaffb0 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgres/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/postgres/test.ts
@@ -276,7 +276,8 @@ describeWithDockerCompose('postgres auto instrumentation', { workingDirectory: [
     });
   });
 
-  conditionalTest({ max: 25 })('pg-native', () => {
+  // Deno: with a module load hook installed, Deno compiles a native addon (`libpq`) as JavaScript.
+  conditionalTest({ max: 25, skipRuntimes: ['deno'] })('pg-native', () => {
     const EXPECTED_TRANSACTION = {
       transaction: 'Test Transaction',
       spans: expect.arrayContaining([
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts b/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts
index 7e99d58dedff..d893e5200004 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts
@@ -488,7 +488,9 @@ describeWithDockerCompose('postgresjs auto instrumentation', { workingDirectory:
 
     createEsmAndCjsTests(__dirname, 'scenario-unsafe.mjs', 'instrument.mjs', (createTestRunner, test) => {
       test('should instrument sql.unsafe() queries', { timeout: 90_000 }, async () => {
-        await createTestRunner().expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
+        // The last query fails on purpose, and its unhandled rejection also sends an error event, which can
+        // arrive before the transaction.
+        await createTestRunner().ignore('event').expect({ transaction: EXPECTED_TRANSACTION }).start().completed();
       });
     });
   });
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/docker-compose.yml b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/docker-compose.yml
new file mode 100644
index 000000000000..9acf7180d21c
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3.9'
+
+services:
+  db:
+    # Prisma 8 requires PostgreSQL 15 or newer.
+    image: postgres:16
+    restart: always
+    ports:
+      - '5436:5432'
+    environment:
+      POSTGRES_USER: prisma
+      POSTGRES_PASSWORD: prisma
+      POSTGRES_DB: tests
+    # Dumped from `prisma-cli db init`; the Prisma 8 CLI needs Node 22.18+, so it isn't run at test time.
+    volumes:
+      - ./prisma/init.sql:/docker-entrypoint-initdb.d/init.sql:ro
+    healthcheck:
+      test: ['CMD-SHELL', 'pg_isready -U prisma -d tests']
+      interval: 2s
+      timeout: 3s
+      retries: 30
+      start_period: 5s
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/instrument.mjs
new file mode 100644
index 000000000000..46a27dd03b74
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/instrument.mjs
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/contract.json b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/contract.json
new file mode 100644
index 000000000000..3b9090e28776
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/contract.json
@@ -0,0 +1,132 @@
+{
+  "schemaVersion": "1",
+  "targetFamily": "sql",
+  "target": "postgres",
+  "profileHash": "3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2",
+  "roots": {
+    "user": {
+      "model": "User",
+      "namespace": "public"
+    }
+  },
+  "domain": {
+    "namespaces": {
+      "public": {
+        "models": {
+          "User": {
+            "fields": {
+              "email": {
+                "nullable": false,
+                "type": {
+                  "codecId": "pg/text@1",
+                  "kind": "scalar"
+                }
+              },
+              "id": {
+                "nullable": false,
+                "type": {
+                  "codecId": "pg/int4@1",
+                  "kind": "scalar"
+                }
+              },
+              "name": {
+                "nullable": true,
+                "type": {
+                  "codecId": "pg/text@1",
+                  "kind": "scalar"
+                }
+              }
+            },
+            "relations": {},
+            "storage": {
+              "fields": {
+                "email": {
+                  "column": "email"
+                },
+                "id": {
+                  "column": "id"
+                },
+                "name": {
+                  "column": "name"
+                }
+              },
+              "namespaceId": "public",
+              "table": "user"
+            }
+          }
+        }
+      }
+    }
+  },
+  "storage": {
+    "namespaces": {
+      "public": {
+        "entries": {
+          "table": {
+            "user": {
+              "columns": {
+                "email": {
+                  "codecId": "pg/text@1",
+                  "nativeType": "text",
+                  "nullable": false
+                },
+                "id": {
+                  "codecId": "pg/int4@1",
+                  "default": {
+                    "expression": "autoincrement()",
+                    "kind": "function"
+                  },
+                  "nativeType": "int4",
+                  "nullable": false
+                },
+                "name": {
+                  "codecId": "pg/text@1",
+                  "nativeType": "text",
+                  "nullable": true
+                }
+              },
+              "foreignKeys": [],
+              "indexes": [],
+              "primaryKey": {
+                "columns": ["id"]
+              },
+              "uniques": [
+                {
+                  "columns": ["email"]
+                }
+              ]
+            }
+          }
+        },
+        "id": "public",
+        "kind": "postgres-schema"
+      }
+    },
+    "storageHash": "f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5"
+  },
+  "capabilities": {
+    "postgres": {
+      "distinctOn": true,
+      "jsonAgg": true,
+      "lateral": true,
+      "limit": true,
+      "orderBy": true,
+      "returning": true
+    },
+    "sql": {
+      "checkConstraint": true,
+      "defaultInInsert": true,
+      "enums": true,
+      "lateral": true,
+      "returning": true,
+      "scalarList": true
+    }
+  },
+  "extensions": {},
+  "meta": {},
+  "_generated": {
+    "warning": "⚠️  GENERATED FILE - DO NOT EDIT",
+    "message": "This file is automatically generated by \"prisma contract emit\".",
+    "regenerate": "To regenerate, run: prisma contract emit"
+  }
+}
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/contract.prisma b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/contract.prisma
new file mode 100644
index 000000000000..11706f4db019
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/contract.prisma
@@ -0,0 +1,9 @@
+// use prisma-next
+
+// Regenerate `contract.json` with `prisma-cli contract emit` and `init.sql` from `prisma-cli db init` (Node 22.18+).
+// No `DateTime` column: Prisma 8 decodes timestamps into `Temporal`, global only on Node 26.
+model User {
+  id    Int     @id @default(autoincrement())
+  email String  @unique
+  name  String?
+}
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/init.sql b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/init.sql
new file mode 100644
index 000000000000..655d447ca485
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/prisma/init.sql
@@ -0,0 +1,64 @@
+CREATE SCHEMA prisma_contract;
+CREATE TABLE prisma_contract.contract (
+    core_hash text NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    contract_json jsonb NOT NULL
+);
+CREATE TABLE prisma_contract.ledger (
+    id bigint NOT NULL,
+    created_at timestamp with time zone DEFAULT now() NOT NULL,
+    space text NOT NULL,
+    migration_name text NOT NULL,
+    migration_hash text NOT NULL,
+    origin_core_hash text,
+    origin_profile_hash text,
+    destination_core_hash text NOT NULL,
+    destination_profile_hash text,
+    operations jsonb NOT NULL
+);
+CREATE SEQUENCE prisma_contract.ledger_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE prisma_contract.ledger_id_seq OWNED BY prisma_contract.ledger.id;
+CREATE TABLE prisma_contract.marker (
+    space text DEFAULT 'app'::text NOT NULL,
+    core_hash text NOT NULL,
+    profile_hash text NOT NULL,
+    contract_json jsonb,
+    canonical_version integer,
+    updated_at timestamp with time zone DEFAULT now() NOT NULL,
+    app_tag text,
+    meta jsonb DEFAULT '{}'::jsonb NOT NULL,
+    invariants text[] DEFAULT '{}'::text[] NOT NULL
+);
+CREATE TABLE public."user" (
+    email text NOT NULL,
+    id integer NOT NULL,
+    name text
+);
+CREATE SEQUENCE public.user_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+ALTER SEQUENCE public.user_id_seq OWNED BY public."user".id;
+ALTER TABLE ONLY prisma_contract.ledger ALTER COLUMN id SET DEFAULT nextval('prisma_contract.ledger_id_seq'::regclass);
+ALTER TABLE ONLY public."user" ALTER COLUMN id SET DEFAULT nextval('public.user_id_seq'::regclass);
+INSERT INTO prisma_contract.contract VALUES ('f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', '2026-09-09 09:15:28.369559+00', '{"meta": {}, "roots": {"user": {"model": "User", "namespace": "public"}}, "domain": {"namespaces": {"public": {"models": {"User": {"fields": {"id": {"type": {"kind": "scalar", "codecId": "pg/int4@1"}, "nullable": false}, "name": {"type": {"kind": "scalar", "codecId": "pg/text@1"}, "nullable": true}, "email": {"type": {"kind": "scalar", "codecId": "pg/text@1"}, "nullable": false}}, "storage": {"table": "user", "fields": {"id": {"column": "id"}, "name": {"column": "name"}, "email": {"column": "email"}}, "namespaceId": "public"}, "relations": {}}}}}}, "target": "postgres", "storage": {"namespaces": {"public": {"id": "public", "entries": {"table": {"user": {"columns": {"id": {"codecId": "pg/int4@1", "default": {"kind": "function", "expression": "autoincrement()"}, "nullable": false, "nativeType": "int4"}, "name": {"codecId": "pg/text@1", "nullable": true, "nativeType": "text"}, "email": {"codecId": "pg/text@1", "nullable": false, "nativeType": "text"}}, "indexes": [], "uniques": [{"columns": ["email"]}], "primaryKey": {"columns": ["id"]}, "foreignKeys": []}}}}}, "storageHash": "f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5"}, "extensions": {}, "profileHash": "3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2", "capabilities": {"sql": {"enums": true, "lateral": true, "returning": true, "scalarList": true, "checkConstraint": true, "defaultInInsert": true}, "postgres": {"limit": true, "jsonAgg": true, "lateral": true, "orderBy": true, "returning": true, "distinctOn": true}}, "targetFamily": "sql"}');
+INSERT INTO prisma_contract.ledger VALUES (1, '2026-09-09 09:15:28.369559+00', 'app', '', 'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', '', NULL, 'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', NULL, '[{"id": "table.user", "label": "Create table \"user\"", "target": {"id": "postgres", "details": {"name": "user", "schema": "public", "objectType": "table"}}, "execute": [{"sql": "CREATE TABLE \"public\".\"user\" (\n  \"email\" text NOT NULL,\n  \"id\" SERIAL NOT NULL,\n  \"name\" text,\n  PRIMARY KEY (\"id\")\n)", "params": [], "description": "create table \"user\""}], "summary": "Creates table \"user\"", "precheck": [{"sql": "SELECT (to_regclass($1)) IS NULL AS \"result\"", "params": ["\"public\".\"user\""], "description": "ensure table \"user\" does not exist"}], "postcheck": [{"sql": "SELECT (to_regclass($1)) IS NOT NULL AS \"result\"", "params": ["\"public\".\"user\""], "description": "verify table \"user\" exists"}], "operationClass": "additive"}, {"id": "unique.user.user_email_key", "label": "Add unique constraint on \"user\" (email)", "target": {"id": "postgres", "details": {"name": "user_email_key", "table": "user", "schema": "public", "objectType": "unique"}}, "execute": [{"sql": "ALTER TABLE \"public\".\"user\" ADD CONSTRAINT \"user_email_key\" UNIQUE (\"email\")", "description": "add unique constraint \"user_email_key\""}], "precheck": [{"sql": "SELECT NOT EXISTS (SELECT 1 AS \"one\" FROM \"pg_constraint\" AS \"c\" INNER JOIN \"pg_namespace\" AS \"n\" ON \"n\".\"oid\" = \"c\".\"connamespace\" WHERE (\"c\".\"conname\" = $1 AND \"n\".\"nspname\" = $2 AND \"c\".\"conrelid\" = to_regclass($3))) AS \"result\"", "params": ["user_email_key", "public", "\"public\".\"user\""], "description": "ensure constraint \"user_email_key\" does not exist"}], "postcheck": [{"sql": "SELECT EXISTS (SELECT 1 AS \"one\" FROM \"pg_constraint\" AS \"c\" INNER JOIN \"pg_namespace\" AS \"n\" ON \"n\".\"oid\" = \"c\".\"connamespace\" WHERE (\"c\".\"conname\" = $1 AND \"n\".\"nspname\" = $2 AND \"c\".\"conrelid\" = to_regclass($3))) AS \"result\"", "params": ["user_email_key", "public", "\"public\".\"user\""], "description": "verify constraint \"user_email_key\" exists"}], "operationClass": "additive"}]');
+INSERT INTO prisma_contract.marker VALUES ('app', 'f4e1954fd8bed87828d13c3f1a02164dc9796ef1af76ed6f98184c01263169c5', '3916f444a8a17ad749191acf9e08dad97d1a327b88c2f1d45d12f240296aa8b2', NULL, NULL, '2026-09-09 09:15:28.369559+00', NULL, '{}', '{}');
+ALTER TABLE ONLY prisma_contract.contract
+    ADD CONSTRAINT contract_pkey PRIMARY KEY (core_hash);
+ALTER TABLE ONLY prisma_contract.ledger
+    ADD CONSTRAINT ledger_pkey PRIMARY KEY (id);
+ALTER TABLE ONLY prisma_contract.marker
+    ADD CONSTRAINT marker_pkey PRIMARY KEY (space);
+ALTER TABLE ONLY public."user"
+    ADD CONSTRAINT user_email_key UNIQUE (email);
+ALTER TABLE ONLY public."user"
+    ADD CONSTRAINT user_pkey PRIMARY KEY (id);
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/scenario.mjs
new file mode 100644
index 000000000000..a588cda77b05
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/scenario.mjs
@@ -0,0 +1,36 @@
+// ESM-only package: the CJS variant gets the namespace from `require(esm)`, so the factory is read off `default`.
+import * as prismaPostgres from '@prisma/orm-postgres/runtime';
+import * as Sentry from '@sentry/node';
+import { randomBytes } from 'crypto';
+import contractJson from './prisma/contract.json' with { type: 'json' };
+
+const url = 'postgresql://prisma:prisma@localhost:5436/tests';
+
+async function run() {
+  const db = prismaPostgres.default({ contractJson, url });
+
+  await Sentry.startSpan(
+    {
+      name: 'Test Transaction',
+      op: 'transaction',
+    },
+    async () => {
+      // With `require(esm)` the module-injection notice arrives on a later tick, so a call in the same
+      // tick as the require would run before the SDK subscribes to the channels.
+      await new Promise(resolve => setImmediate(resolve));
+
+      await db.orm.public.User.create({
+        name: 'Tilda',
+        email: `tilda_${randomBytes(4).toString('hex')}@sentry.io`,
+      });
+
+      await db.orm.public.User.all();
+
+      await db.orm.public.User.where(user => user.email.like('%sentry.io')).delete();
+    },
+  );
+
+  await db.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/test.ts b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/test.ts
new file mode 100644
index 000000000000..0604374c83d6
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/prisma-orm-v8/test.ts
@@ -0,0 +1,132 @@
+import type { SerializedStreamedSpan, SerializedStreamedSpanContainer } from '@sentry/core';
+import { afterAll, describe, expect } from 'vitest';
+import { conditionalTest } from '../../../utils';
+import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';
+
+afterAll(() => {
+  cleanupChildProcesses();
+});
+
+function getSegment(container: SerializedStreamedSpanContainer): SerializedStreamedSpan {
+  const segment = container.items.find(item => item.is_segment);
+  expect(segment?.name).toBe('Test Transaction');
+  return segment!;
+}
+
+function getQuerySpans(container: SerializedStreamedSpanContainer): SerializedStreamedSpan[] {
+  const querySpans = container.items.filter(
+    item => item.attributes['sentry.origin']?.value === 'auto.db.postgres' && item.attributes['db.query.text']?.value,
+  );
+  expect(querySpans.map(span => span.name)).toEqual(
+    expect.arrayContaining(['INSERT "public"."user"', 'SELECT "public"."user"', 'DELETE "public"."user"']),
+  );
+  querySpans.forEach(span => {
+    expect(span.attributes['sentry.op']?.value).toBe('db');
+    expect(span.attributes['db.system.name']?.value).toBe('postgresql');
+  });
+  return querySpans;
+}
+
+function getOperationSpans(container: SerializedStreamedSpanContainer): SerializedStreamedSpan[] {
+  return container.items.filter(item => item.attributes['sentry.origin']?.value === 'auto.db.prisma');
+}
+
+// Prisma 8 has no tracing surface: the operation spans come from the orchestrion channels the runtime hook
+// injects, and the `pg` spans underneath stand in for v7's `db_query` spans.
+describe('Prisma ORM v8 Tests', () => {
+  describeWithDockerCompose('Prisma ORM v8', { workingDirectory: [__dirname] }, () => {
+    createEsmAndCjsTests(
+      __dirname,
+      'scenario.mjs',
+      'instrument.mjs',
+      (createRunner, test, mode) => {
+        const testInstrumentedOperations = (): void => {
+          test('should instrument Prisma ORM operations and nest their queries', { timeout: 75_000 }, async () => {
+            await createRunner()
+              .unordered()
+              .expect({
+                span: container => {
+                  const segment = getSegment(container);
+                  const querySpans = getQuerySpans(container);
+                  const operationSpans = getOperationSpans(container);
+
+                  expect(operationSpans.map(span => span.name)).toEqual([
+                    'prisma:client:operation',
+                    'prisma:client:operation',
+                    'prisma:client:operation',
+                  ]);
+                  expect(operationSpans.map(span => span.attributes['method']?.value)).toEqual([
+                    'create',
+                    'all',
+                    'delete',
+                  ]);
+                  operationSpans.forEach(span => {
+                    const method = span.attributes['method']?.value;
+                    expect(span.parent_span_id).toBe(segment.span_id);
+                    expect(span.attributes).toMatchObject({
+                      'sentry.origin': { value: 'auto.db.prisma', type: 'string' },
+                      'sentry.op': { value: 'db', type: 'string' },
+                      'db.operation.name': { value: method, type: 'string' },
+                      'db.collection.name': { value: 'user', type: 'string' },
+                      model: { value: 'User', type: 'string' },
+                      name: { value: `User.${method}`, type: 'string' },
+                    });
+                  });
+
+                  const queriesByOperation = (method: string): unknown[] => {
+                    const operation = operationSpans.find(span => span.attributes['method']?.value === method);
+                    return querySpans
+                      .filter(span => span.parent_span_id === operation?.span_id)
+                      .map(span => span.attributes['db.query.text']?.value);
+                  };
+                  expect(queriesByOperation('create')).toEqual(
+                    expect.arrayContaining([expect.stringMatching(/^INSERT INTO "public"\."user" /)]),
+                  );
+                  expect(queriesByOperation('all')).toEqual([
+                    expect.stringMatching(/^SELECT .* FROM "public"\."user"$/),
+                  ]);
+                  expect(queriesByOperation('delete')).toEqual(
+                    expect.arrayContaining([expect.stringMatching(/^DELETE FROM "public"\."user" /)]),
+                  );
+                  expect(querySpans.filter(span => span.parent_span_id === segment.span_id)).toEqual([]);
+                },
+              })
+              .start()
+              .completed();
+          });
+        };
+
+        if (mode === 'esm') {
+          testInstrumentedOperations();
+          return;
+        }
+
+        // The CJS scenario loads the ESM-only package via `require(esm)`, which Node's module hooks only see
+        // from Node 22 on; on Node 20 the ORM terminals load uninstrumented.
+        conditionalTest({ min: 22 })('with require(esm) reaching the module hooks', testInstrumentedOperations);
+
+        conditionalTest({ max: 21 })('with require(esm) bypassing the module hooks', () => {
+          test('should keep the pg spans on the transaction', { timeout: 75_000 }, async () => {
+            await createRunner()
+              .unordered()
+              .expect({
+                span: container => {
+                  const segment = getSegment(container);
+                  expect(getOperationSpans(container)).toEqual([]);
+                  getQuerySpans(container).forEach(span => expect(span.parent_span_id).toBe(segment.span_id));
+                },
+              })
+              .start()
+              .completed();
+          });
+        });
+      },
+      {
+        additionalDependencies: {
+          '@prisma/orm-postgres': '8.0.0-rc.8',
+        },
+        copyPaths: ['prisma'],
+      },
+    );
+  });
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/traceparent/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/traceparent/test.ts
index b8c3f8946f94..1367c3ed3a07 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/traceparent/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/traceparent/test.ts
@@ -1,5 +1,6 @@
 import { createTestServer } from '@sentry-internal/test-utils';
 import { describe, expect } from 'vitest';
+import { RUNTIME } from '../../../../utils';
 import { createEsmAndCjsTests } from '../../../../utils/runner';
 
 describe('outgoing traceparent', () => {
@@ -39,7 +40,9 @@ describe('outgoing traceparent', () => {
   });
 
   createEsmAndCjsTests(__dirname, 'scenario-http.mjs', 'instrument.mjs', (createRunner, test) => {
-    test('outgoing http requests should get traceparent headers', async () => {
+    // Bun 1.3.14 does not instrument outgoing `node:http` requests.
+    // See https://github.com/getsentry/sentry-javascript/issues/23881
+    test.skipIf(RUNTIME === 'bun')('outgoing http requests should get traceparent headers', async () => {
       expect.assertions(5);
 
       const [SERVER_URL, closeTestServer] = await createTestServer()
diff --git a/dev-packages/node-integration-tests/suites/tracing/tedious/test.ts b/dev-packages/node-integration-tests/suites/tracing/tedious/test.ts
index 9e9d6b7e3291..eb5c81a0a49d 100644
--- a/dev-packages/node-integration-tests/suites/tracing/tedious/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/tedious/test.ts
@@ -1,4 +1,5 @@
 import { afterAll, expect } from 'vitest';
+import { conditionalTest } from '../../../utils';
 import { cleanupChildProcesses, createEsmAndCjsTests, describeWithDockerCompose } from '../../../utils/runner';
 
 describeWithDockerCompose('tedious auto instrumentation', { workingDirectory: [__dirname] }, () => {
@@ -92,6 +93,46 @@ describeWithDockerCompose('tedious auto instrumentation', { workingDirectory: [_
     });
   });
 
+  // tedious 20 requires Node >= 22.
+  conditionalTest({ min: 22 })('tedious v20', () => {
+    createEsmAndCjsTests(
+      __dirname,
+      'scenario.mjs',
+      'instrument-span-streaming.mjs',
+      (createTestRunner, test) => {
+        test('should auto-instrument `tedious` package', async () => {
+          await createTestRunner()
+            .expect({
+              span: container => {
+                const dbSpans = container.items.filter(item => item.attributes['sentry.origin']?.value === ORIGIN);
+
+                expect(dbSpans.map(span => span.name)).toEqual(
+                  expect.arrayContaining([
+                    'SELECT',
+                    'callProcedure [dbo].[test_proced]',
+                    'INSERT [dbo].[test_prepared]',
+                    'execBulkLoad test_bulk',
+                    'SELECT [dbo].[test_bulk]',
+                  ]),
+                );
+                expect(dbSpans.find(span => span.name === 'select')?.status).toBe('error');
+                expect(dbSpans[0]?.attributes).toMatchObject({
+                  'db.system.name': { value: 'mssql' },
+                  'db.namespace': { value: 'master' },
+                  'db.user': { value: 'sa' },
+                  'server.address': { value: '127.0.0.1' },
+                  'server.port': { value: 1433 },
+                });
+              },
+            })
+            .start()
+            .completed();
+        });
+      },
+      { additionalDependencies: { tedious: '^20' } },
+    );
+  });
+
   createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument-span-streaming.mjs', (createTestRunner, test) => {
     test('should name spans after the query summary with span streaming', async () => {
       await createTestRunner()
diff --git a/dev-packages/node-integration-tests/suites/tracing/tracer-start-active-span-error/test.ts b/dev-packages/node-integration-tests/suites/tracing/tracer-start-active-span-error/test.ts
index 64809c28aa24..c315cf866900 100644
--- a/dev-packages/node-integration-tests/suites/tracing/tracer-start-active-span-error/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/tracer-start-active-span-error/test.ts
@@ -16,6 +16,9 @@ describe('tracer.startActiveSpan errors', () => {
     // `catch` inside the callback.
     test('does NOT mark span errored when uncaught error escapes raw tracer.startActiveSpan callback', async () => {
       await createRunner()
+        // The rejection is captured as an error event, which can reach the transport before the
+        // transaction.
+        .ignore('event')
         .expect({
           transaction: {
             transaction: 'test span name',
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-manual-no-recording.mjs b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-manual-no-recording.mjs
new file mode 100644
index 000000000000..605a0ca368f2
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-manual-no-recording.mjs
@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+  dataCollection: { genAI: { inputs: false, outputs: false } },
+  // `instrumentTypeSafeClient` is the manual path for runtimes without the orchestrion hook.
+  // Drop the automatic integration so the scenario exercises it alone.
+  integrations: integrations => integrations.filter(integration => integration.name !== 'TypeSafe'),
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-manual.mjs b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-manual.mjs
new file mode 100644
index 000000000000..b405a672e86c
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-manual.mjs
@@ -0,0 +1,12 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+  // `instrumentTypeSafeClient` is the manual path for runtimes without the orchestrion hook.
+  // Drop the automatic integration so the scenario exercises it alone.
+  integrations: integrations => integrations.filter(integration => integration.name !== 'TypeSafe'),
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-no-recording.mjs b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-no-recording.mjs
new file mode 100644
index 000000000000..ed7a6cfe9f0a
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument-no-recording.mjs
@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+  dataCollection: { genAI: { inputs: false, outputs: false } },
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument.mjs
new file mode 100644
index 000000000000..46a27dd03b74
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/instrument.mjs
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/scenario-manual.mjs b/dev-packages/node-integration-tests/suites/tracing/typesafe/scenario-manual.mjs
new file mode 100644
index 000000000000..30dcd790a49d
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/scenario-manual.mjs
@@ -0,0 +1,87 @@
+import * as Sentry from '@sentry/node';
+import { choice, noul, score, TypeSafeClient } from '@typesafe-ai/sdk';
+import express from 'express';
+
+function startMockServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/systemone', (req, res) => {
+    if (req.body.model === 'error-model') {
+      res.status(400).json({ error: 'Unknown model' });
+      return;
+    }
+
+    res.json({
+      model: 'jev-1.13.0',
+      answers: {
+        authIssue: { type: 'noul', noul: 0.98 },
+        department: {
+          type: 'choice',
+          choice: 'billing',
+          confidence: 0.28,
+          probabilities: { billing: 0.64, technical: 0.36 },
+        },
+        urgency: {
+          type: 'score',
+          score: 1.58,
+          confidence: 0.9,
+          legend: { 0: 'low', 1: 'medium', 2: 'high' },
+          probabilities: { 0: 0, 1: 0.42, 2: 0.58 },
+        },
+      },
+      usage: { input_tokens: 275, output_tokens: 20 },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockServer();
+  const client = Sentry.instrumentTypeSafeClient(
+    new TypeSafeClient({
+      apiKey: 'mock-api-key',
+      baseURL: `http://localhost:${server.address().port}`,
+      retry: { maxRetries: 0 },
+    }),
+  );
+  const state = 'I cannot log in, and I also want a refund for last month.';
+  const questions = {
+    authIssue: noul('Is there a login problem?'),
+    department: choice('Which team should handle this?', {
+      billing: 'Charges and refunds',
+      technical: 'Bugs and outages',
+    }),
+    urgency: score('How urgent is this ticket?', ['low', 'medium', 'high']),
+  };
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    await client.systemOne({ state, questions });
+
+    // The instrumentation must not read the body the caller gets from `asResponse()`.
+    const response = await client.systemOne({ model: 'jev-1.13', state, questions }).asResponse();
+    await response.json();
+
+    try {
+      await client.systemOne({ model: 'error-model', state, questions });
+    } catch {
+      // expected
+    }
+
+    // The SDK rejects empty questions with a `TypeSafeError` before sending the request.
+    try {
+      await client.systemOne({ model: 'validation-error', state, questions: {} });
+    } catch {
+      // expected
+    }
+  });
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/typesafe/scenario.mjs
new file mode 100644
index 000000000000..694a9fd97d59
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/scenario.mjs
@@ -0,0 +1,85 @@
+import * as Sentry from '@sentry/node';
+import { choice, noul, score, TypeSafeClient } from '@typesafe-ai/sdk';
+import express from 'express';
+
+function startMockServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/systemone', (req, res) => {
+    if (req.body.model === 'error-model') {
+      res.status(400).json({ error: 'Unknown model' });
+      return;
+    }
+
+    res.json({
+      model: 'jev-1.13.0',
+      answers: {
+        authIssue: { type: 'noul', noul: 0.98 },
+        department: {
+          type: 'choice',
+          choice: 'billing',
+          confidence: 0.28,
+          probabilities: { billing: 0.64, technical: 0.36 },
+        },
+        urgency: {
+          type: 'score',
+          score: 1.58,
+          confidence: 0.9,
+          legend: { 0: 'low', 1: 'medium', 2: 'high' },
+          probabilities: { 0: 0, 1: 0.42, 2: 0.58 },
+        },
+      },
+      usage: { input_tokens: 275, output_tokens: 20 },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockServer();
+  const client = new TypeSafeClient({
+    apiKey: 'mock-api-key',
+    baseURL: `http://localhost:${server.address().port}`,
+    retry: { maxRetries: 0 },
+  });
+  const state = 'I cannot log in, and I also want a refund for last month.';
+  const questions = {
+    authIssue: noul('Is there a login problem?'),
+    department: choice('Which team should handle this?', {
+      billing: 'Charges and refunds',
+      technical: 'Bugs and outages',
+    }),
+    urgency: score('How urgent is this ticket?', ['low', 'medium', 'high']),
+  };
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    await client.systemOne({ state, questions });
+
+    // The instrumentation must not read the body the caller gets from `asResponse()`.
+    const response = await client.systemOne({ model: 'jev-1.13', state, questions }).asResponse();
+    await response.json();
+
+    try {
+      await client.systemOne({ model: 'error-model', state, questions });
+    } catch {
+      // expected
+    }
+
+    // The SDK rejects empty questions with a `TypeSafeError` before sending the request.
+    try {
+      await client.systemOne({ model: 'validation-error', state, questions: {} });
+    } catch {
+      // expected
+    }
+  });
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/typesafe/test.ts b/dev-packages/node-integration-tests/suites/tracing/typesafe/test.ts
new file mode 100644
index 000000000000..e5feb8919745
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/typesafe/test.ts
@@ -0,0 +1,161 @@
+import {
+  GEN_AI_INPUT_MESSAGES,
+  GEN_AI_OPERATION_NAME,
+  GEN_AI_OUTPUT_MESSAGES,
+  GEN_AI_PROVIDER_NAME,
+  GEN_AI_REQUEST_MODEL,
+  GEN_AI_RESPONSE_MODEL,
+  GEN_AI_USAGE_INPUT_TOKENS,
+  GEN_AI_USAGE_OUTPUT_TOKENS,
+  GEN_AI_USAGE_TOTAL_TOKENS,
+  SENTRY_OP,
+  SENTRY_ORIGIN,
+} from '@sentry/conventions/attributes';
+import { afterAll, describe, expect } from 'vitest';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
+
+describe('TypeSafe integration', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  describe.each([
+    ['automatic', 'scenario.mjs', 'instrument.mjs', 'instrument-no-recording.mjs'],
+    ['manual', 'scenario-manual.mjs', 'instrument-manual.mjs', 'instrument-manual-no-recording.mjs'],
+  ])('%s instrumentation', (_, scenarioFile, instrumentFile, noRecordingInstrumentFile) => {
+    createEsmAndCjsTests(
+      __dirname,
+      scenarioFile,
+      instrumentFile,
+      (createRunner, test) => {
+        test('creates evaluate spans for systemOne', async () => {
+          await createRunner()
+            .unordered()
+            .expect({
+              span: container => {
+                const evaluateSpans = container.items.filter(
+                  span => span.attributes[SENTRY_OP]?.value === 'gen_ai.evaluate',
+                );
+                expect(evaluateSpans).toHaveLength(4);
+                for (const span of evaluateSpans) {
+                  expect(span.attributes[SENTRY_ORIGIN]?.value).toBe('auto.ai.typesafe');
+                  expect(span.attributes[GEN_AI_OPERATION_NAME]?.value).toBe('evaluate');
+                  expect(span.attributes[GEN_AI_PROVIDER_NAME]?.value).toBe('typesafe');
+                }
+
+                const defaultModelSpan = evaluateSpans.find(span => span.name === 'evaluate jev-latest')!;
+                expect(defaultModelSpan).toBeDefined();
+                expect(defaultModelSpan.status).toBe('ok');
+                expect(defaultModelSpan.attributes[GEN_AI_REQUEST_MODEL]?.value).toBe('jev-latest');
+                expect(defaultModelSpan.attributes[GEN_AI_RESPONSE_MODEL]?.value).toBe('jev-1.13.0');
+                expect(defaultModelSpan.attributes[GEN_AI_USAGE_INPUT_TOKENS]?.value).toBe(275);
+                expect(defaultModelSpan.attributes[GEN_AI_USAGE_OUTPUT_TOKENS]?.value).toBe(20);
+                expect(defaultModelSpan.attributes[GEN_AI_USAGE_TOTAL_TOKENS]?.value).toBe(295);
+                expect(JSON.parse(defaultModelSpan.attributes[GEN_AI_INPUT_MESSAGES]?.value as string)).toEqual([
+                  {
+                    type: 'evaluation',
+                    state: 'I cannot log in, and I also want a refund for last month.',
+                    questions: {
+                      authIssue: { type: 'noul', instructions: 'Is there a login problem?' },
+                      department: {
+                        type: 'choice',
+                        instructions: 'Which team should handle this?',
+                        criteria: { billing: 'Charges and refunds', technical: 'Bugs and outages' },
+                      },
+                      urgency: {
+                        type: 'score',
+                        instructions: 'How urgent is this ticket?',
+                        criteria: ['low', 'medium', 'high'],
+                      },
+                    },
+                  },
+                ]);
+                expect(JSON.parse(defaultModelSpan.attributes[GEN_AI_OUTPUT_MESSAGES]?.value as string)).toEqual([
+                  {
+                    type: 'evaluation',
+                    answers: {
+                      authIssue: { type: 'noul', noul: 0.98 },
+                      department: {
+                        type: 'choice',
+                        choice: 'billing',
+                        confidence: 0.28,
+                        probabilities: { billing: 0.64, technical: 0.36 },
+                      },
+                      urgency: {
+                        type: 'score',
+                        score: 1.58,
+                        confidence: 0.9,
+                        legend: { 0: 'low', 1: 'medium', 2: 'high' },
+                        probabilities: { 0: 0, 1: 0.42, 2: 0.58 },
+                      },
+                    },
+                  },
+                ]);
+
+                const asResponseSpan = evaluateSpans.find(span => span.name === 'evaluate jev-1.13')!;
+                expect(asResponseSpan).toBeDefined();
+                expect(asResponseSpan.status).toBe('ok');
+                expect(asResponseSpan.attributes[GEN_AI_RESPONSE_MODEL]?.value).toBe('jev-1.13.0');
+
+                const errorSpan = evaluateSpans.find(span => span.name === 'evaluate error-model')!;
+                expect(errorSpan).toBeDefined();
+                expect(errorSpan.status).toBe('error');
+                expect(errorSpan.attributes[GEN_AI_RESPONSE_MODEL]).toBeUndefined();
+                expect(errorSpan.attributes[GEN_AI_OUTPUT_MESSAGES]).toBeUndefined();
+
+                const validationErrorSpan = evaluateSpans.find(span => span.name === 'evaluate validation-error')!;
+                expect(validationErrorSpan).toBeDefined();
+                expect(validationErrorSpan.status).toBe('error');
+                expect(validationErrorSpan.attributes[GEN_AI_OUTPUT_MESSAGES]).toBeUndefined();
+              },
+            })
+            .start()
+            .completed();
+        });
+      },
+      {
+        additionalDependencies: {
+          '@typesafe-ai/sdk': '^0.6.0',
+        },
+      },
+    );
+
+    createEsmAndCjsTests(
+      __dirname,
+      scenarioFile,
+      noRecordingInstrumentFile,
+      (createRunner, test) => {
+        test('does not record inputs or outputs when recording is off', async () => {
+          await createRunner()
+            .unordered()
+            .expect({
+              span: container => {
+                const evaluateSpans = container.items.filter(
+                  span => span.attributes[SENTRY_OP]?.value === 'gen_ai.evaluate',
+                );
+                expect(evaluateSpans).toHaveLength(4);
+                expect(evaluateSpans.filter(span => span.status === 'error')).toHaveLength(2);
+                for (const span of evaluateSpans) {
+                  expect(span.attributes[GEN_AI_INPUT_MESSAGES]).toBeUndefined();
+                  expect(span.attributes[GEN_AI_OUTPUT_MESSAGES]).toBeUndefined();
+                  // State, questions and answers must not come back through another attribute (e.g. an error message).
+                  // Only the attributes are checked (timestamps could match a number), and `probabilities` only
+                  // occurs in answers.
+                  expect(JSON.stringify(span.attributes)).not.toMatch(
+                    /cannot log in|Charges and refunds|probabilities/,
+                  );
+                }
+              },
+            })
+            .start()
+            .completed();
+        });
+      },
+      {
+        additionalDependencies: {
+          '@typesafe-ai/sdk': '^0.6.0',
+        },
+      },
+    );
+  });
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/instrument-evaluate-no-recording.mjs b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/instrument-evaluate-no-recording.mjs
new file mode 100644
index 000000000000..cc192fb89834
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/instrument-evaluate-no-recording.mjs
@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  dataCollection: { genAI: { inputs: false, outputs: false } },
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/instrument-evaluate.mjs b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/instrument-evaluate.mjs
new file mode 100644
index 000000000000..852786895514
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/instrument-evaluate.mjs
@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  dataCollection: {},
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/scenario-evaluate.mjs b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/scenario-evaluate.mjs
new file mode 100644
index 000000000000..42fc5ead26c7
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/scenario-evaluate.mjs
@@ -0,0 +1,43 @@
+import * as Sentry from '@sentry/node';
+import { experimental_evaluate } from 'ai';
+import { Experimental_EvaluationMockModelV4 } from 'ai/test';
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    await experimental_evaluate({
+      model: new Experimental_EvaluationMockModelV4({
+        provider: 'gateway',
+        modelId: 'typesafe-ai/jev',
+        doEvaluate: async () => ({
+          answers: {
+            authIssue: { type: 'boolean', probability: 0.97 },
+            department: {
+              type: 'choice',
+              choice: 'billing',
+              probabilities: { billing: 0.64, technical: 0.36 },
+            },
+            wantsRefund: { type: 'boolean', probability: 0.99 },
+            urgency: { type: 'score', score: 1.8, probabilities: { 0: 0, 1: 0.2, 2: 0.8 } },
+          },
+          usage: { inputTokens: 275, outputTokens: 20 },
+          // What the AI SDK TypeSafe provider returns: answer confidence moves into provider metadata.
+          providerMetadata: { typesafe: { confidence: { department: 0.28 } } },
+          warnings: [],
+        }),
+      }),
+      state: 'I cannot log in, and I also want a refund for last month.',
+      questions: {
+        authIssue: { type: 'boolean', instructions: 'Is there a login problem?' },
+        department: {
+          type: 'choice',
+          instructions: 'Which team should handle this?',
+          criteria: { billing: 'Charges and refunds', technical: 'Bugs and outages' },
+        },
+        wantsRefund: { type: 'boolean', instructions: 'Is a refund requested?' },
+        urgency: { type: 'score', instructions: 'How urgent is this ticket?', criteria: ['low', 'medium', 'high'] },
+      },
+    });
+  });
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/test.ts
index 2468f974af55..f8a26a410833 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v6_v7/test.ts
@@ -4,6 +4,7 @@ import {
   GEN_AI_CONVERSATION_ID,
   GEN_AI_EMBEDDINGS_INPUT,
   GEN_AI_INPUT_MESSAGES,
+  GEN_AI_OPERATION_NAME,
   GEN_AI_OUTPUT_MESSAGES,
   GEN_AI_PROVIDER_NAME,
   GEN_AI_REQUEST_MODEL,
@@ -997,3 +998,116 @@ describe.each(matrix)('Vercel AI integration (version %s)', (version, vercelAiVe
     },
   );
 });
+
+describe('Vercel AI integration experimental_evaluate', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  createEsmTests(
+    __dirname,
+    'scenario-evaluate.mjs',
+    'instrument-evaluate.mjs',
+    (createRunner, test) => {
+      test('creates an evaluate span', async () => {
+        await createRunner()
+          .unordered()
+          .expect({
+            span: container => {
+              const evaluateSpan = container.items.find(
+                span => span.attributes['sentry.op']?.value === 'gen_ai.evaluate',
+              )!;
+              expect(evaluateSpan).toBeDefined();
+              expect(evaluateSpan.name).toBe('evaluate typesafe-ai/jev');
+              expect(evaluateSpan.status).toBe('ok');
+              expect(evaluateSpan.attributes['sentry.origin']?.value).toBe('auto.vercelai.channel');
+              expect(evaluateSpan.attributes[GEN_AI_OPERATION_NAME]?.value).toBe('evaluate');
+              expect(evaluateSpan.attributes[GEN_AI_PROVIDER_NAME]?.value).toBe('gateway');
+              expect(evaluateSpan.attributes[GEN_AI_REQUEST_MODEL]?.value).toBe('typesafe-ai/jev');
+              expect(evaluateSpan.attributes[GEN_AI_RESPONSE_MODEL]?.value).toBe('typesafe-ai/jev');
+              expect(evaluateSpan.attributes[GEN_AI_USAGE_INPUT_TOKENS]?.value).toBe(275);
+              expect(evaluateSpan.attributes[GEN_AI_USAGE_OUTPUT_TOKENS]?.value).toBe(20);
+              expect(evaluateSpan.attributes[GEN_AI_USAGE_TOTAL_TOKENS]?.value).toBe(295);
+              expect(JSON.parse(evaluateSpan.attributes[GEN_AI_INPUT_MESSAGES]?.value as string)).toEqual([
+                {
+                  type: 'evaluation',
+                  state: 'I cannot log in, and I also want a refund for last month.',
+                  questions: {
+                    authIssue: { type: 'boolean', instructions: 'Is there a login problem?' },
+                    department: {
+                      type: 'choice',
+                      instructions: 'Which team should handle this?',
+                      criteria: { billing: 'Charges and refunds', technical: 'Bugs and outages' },
+                    },
+                    wantsRefund: { type: 'boolean', instructions: 'Is a refund requested?' },
+                    urgency: {
+                      type: 'score',
+                      instructions: 'How urgent is this ticket?',
+                      criteria: ['low', 'medium', 'high'],
+                    },
+                  },
+                },
+              ]);
+              expect(JSON.parse(evaluateSpan.attributes[GEN_AI_OUTPUT_MESSAGES]?.value as string)).toEqual([
+                {
+                  type: 'evaluation',
+                  answers: {
+                    authIssue: { type: 'boolean', probability: 0.97 },
+                    department: {
+                      type: 'choice',
+                      choice: 'billing',
+                      probabilities: { billing: 0.64, technical: 0.36 },
+                      confidence: 0.28,
+                    },
+                    wantsRefund: { type: 'boolean', probability: 0.99 },
+                    urgency: { type: 'score', score: 1.8, probabilities: { 0: 0, 1: 0.2, 2: 0.8 } },
+                  },
+                },
+              ]);
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        ai: '^7.0.111',
+      },
+    },
+  );
+
+  createEsmTests(
+    __dirname,
+    'scenario-evaluate.mjs',
+    'instrument-evaluate-no-recording.mjs',
+    (createRunner, test) => {
+      test('does not record inputs or outputs when recording is off', async () => {
+        await createRunner()
+          .unordered()
+          .expect({
+            span: container => {
+              const evaluateSpan = container.items.find(
+                span => span.attributes['sentry.op']?.value === 'gen_ai.evaluate',
+              )!;
+              expect(evaluateSpan).toBeDefined();
+              expect(evaluateSpan.attributes[GEN_AI_INPUT_MESSAGES]).toBeUndefined();
+              expect(evaluateSpan.attributes[GEN_AI_OUTPUT_MESSAGES]).toBeUndefined();
+              // State, questions and answers must not come back through another attribute. Only the attributes
+              // are checked (timestamps could match a number), and `probabilities` only occurs in answers.
+              expect(JSON.stringify(evaluateSpan.attributes)).not.toMatch(
+                /cannot log in|Charges and refunds|probabilities/,
+              );
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        ai: '^7.0.111',
+      },
+    },
+  );
+});
diff --git a/dev-packages/node-integration-tests/suites/winston/test.ts b/dev-packages/node-integration-tests/suites/winston/test.ts
index 2555a4eddb03..b36e128497de 100644
--- a/dev-packages/node-integration-tests/suites/winston/test.ts
+++ b/dev-packages/node-integration-tests/suites/winston/test.ts
@@ -1,5 +1,6 @@
 import { afterAll, describe, expect } from 'vitest';
 import { cleanupChildProcesses, createCjsTests } from '../../utils/runner';
+import { EXPECTED_SDK_NAME } from '../../utils';
 
 describe('winston integration', () => {
   afterAll(() => {
@@ -22,7 +23,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -37,7 +38,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -66,7 +67,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -81,7 +82,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -96,7 +97,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -111,7 +112,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -140,7 +141,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -155,7 +156,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -170,7 +171,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -205,7 +206,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -220,7 +221,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -235,7 +236,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                   foo: { value: 'bar', type: 'string' },
@@ -267,7 +268,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -282,7 +283,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -298,7 +299,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -334,7 +335,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -349,7 +350,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -365,7 +366,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -380,7 +381,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
@@ -395,7 +396,7 @@ describe('winston integration', () => {
                   'sentry.origin': { value: 'auto.log.winston', type: 'string' },
                   'sentry.release': { value: '1.0.0', type: 'string' },
                   'sentry.environment': { value: 'test', type: 'string' },
-                  'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                  'sentry.sdk.name': { value: EXPECTED_SDK_NAME, type: 'string' },
                   'sentry.sdk.version': { value: expect.any(String), type: 'string' },
                   'server.address': { value: expect.any(String), type: 'string' },
                 },
diff --git a/dev-packages/node-integration-tests/utils/assertions.ts b/dev-packages/node-integration-tests/utils/assertions.ts
index b6c45ebc043c..cf1c289e05a6 100644
--- a/dev-packages/node-integration-tests/utils/assertions.ts
+++ b/dev-packages/node-integration-tests/utils/assertions.ts
@@ -12,6 +12,7 @@ import type {
 } from '@sentry/core';
 import { SDK_VERSION } from '@sentry/core';
 import { expect } from 'vitest';
+import { EXPECTED_SDK_NAME } from './index';
 
 export type DeepPartial<T> = T extends object
   ? {
@@ -108,7 +109,7 @@ export function assertEnvelopeHeader(actual: Envelope[0], expected: Partial<Enve
     event_id: expect.any(String),
     sent_at: expect.any(String),
     sdk: {
-      name: 'sentry.javascript.node',
+      name: EXPECTED_SDK_NAME,
       version: SDK_VERSION,
     },
     ...expected,
@@ -119,7 +120,7 @@ export function assertSpanEnvelopeHeader(actual: Envelope[0], expected: Partial<
   expect(actual).toEqual({
     sent_at: expect.any(String),
     sdk: {
-      name: 'sentry.javascript.node',
+      name: EXPECTED_SDK_NAME,
       version: SDK_VERSION,
     },
     ...expected,
diff --git a/dev-packages/node-integration-tests/utils/index.ts b/dev-packages/node-integration-tests/utils/index.ts
index 6825b51f9452..21fdff8fe8a8 100644
--- a/dev-packages/node-integration-tests/utils/index.ts
+++ b/dev-packages/node-integration-tests/utils/index.ts
@@ -5,6 +5,19 @@ import { describe } from 'vitest';
 
 export const NODE_VERSION = parseSemver(process.versions.node).major || 0;
 
+/**
+ * The runtime that runs the scenarios (`node`, `bun` or `deno`), from the `RUNTIME` env var.
+ * Tests use it in `test.skipIf` for behavior that a runtime does not support.
+ */
+export type Runtime = 'cloudflare' | 'node' | 'bun' | 'deno';
+export const RUNTIME = (process.env.RUNTIME || 'node') as Runtime;
+
+/**
+ * The `sdk.name` the scenarios send. It is `sentry.javascript.node`, unless a runtime package
+ * maps `@sentry/node` to its own SDK and sets the `EXPECTED_SDK_NAME` env var to that SDK's name.
+ */
+export const EXPECTED_SDK_NAME = process.env.EXPECTED_SDK_NAME || 'sentry.javascript.node';
+
 export type TestServerConfig = {
   url: string;
   server: http.Server;
@@ -29,15 +42,32 @@ export type DataCollectorOptions = {
 };
 
 /**
- * Returns`describe` or `describe.skip` depending on allowed major versions of Node.
+ * Returns`describe` or `describe.skip` depending on allowed major versions of Node and on the
+ * runtime that runs the scenarios.
+ *
+ * On Bun and Deno the version gate does not apply and the block always runs. A suite that the gate
+ * keeps off a Node version because it cannot run there must also be excluded for these runtimes,
+ * in `dev-packages/bun-integration-tests/node-suites/excludes.ts` and
+ * `dev-packages/deno-integration-tests/node-suites/excludes.ts`, or skipped with `skipRuntimes`.
  *
- * @param {{ min?: number; max?: number }} allowedVersion
+ * @param options.min Lowest Node major version that runs the block.
+ * @param options.max Highest Node major version that runs the block.
+ * @param options.skipRuntimes Runtimes that skip the block, for a block that cannot run there.
  */
-export function conditionalTest(allowedVersion: {
+export function conditionalTest(options: {
   min?: number;
   max?: number;
+  skipRuntimes?: Runtime[];
 }): typeof describe | typeof describe.skip {
-  return describe.skipIf(!matchesNodeVersion(allowedVersion));
+  if (options.skipRuntimes?.includes(RUNTIME)) {
+    return describe.skip;
+  }
+  // Vitest always runs on Node, so its Node version says nothing about Bun or Deno running the
+  // scenario. Those runtimes list the suites they cannot run in their own exclude lists.
+  if (RUNTIME !== 'node') {
+    return describe;
+  }
+  return describe.skipIf(!matchesNodeVersion(options));
 }
 
 function matchesNodeVersion({ min, max }: { min?: number; max?: number }): boolean {
diff --git a/dev-packages/node-integration-tests/utils/runner/createEsmAndCjsTests.ts b/dev-packages/node-integration-tests/utils/runner/createEsmAndCjsTests.ts
index d6fea21637cc..60b63507ff77 100644
--- a/dev-packages/node-integration-tests/utils/runner/createEsmAndCjsTests.ts
+++ b/dev-packages/node-integration-tests/utils/runner/createEsmAndCjsTests.ts
@@ -301,9 +301,10 @@ function convertEsmToCjs(content: string): string {
   let newContent = content;
 
   // Handle default imports: import x from 'y' -> const x = require('y')
+  // Import attributes (`with { type: 'json' }`) are dropped; `require` reads JSON natively.
   newContent = newContent.replace(
     // eslint-disable-next-line regexp/optimal-quantifier-concatenation, regexp/no-super-linear-backtracking
-    /import\s+([\w*{}\s,]+)\s+from\s+['"]([^'"]+)['"]/g,
+    /import\s+([\w*{}\s,]+)\s+from\s+['"]([^'"]+)['"](?:\s+with\s*\{[^}]*\})?/g,
     (_, imports: string, module: string) => {
       if (imports.includes('* as')) {
         // Handle namespace imports: import * as x from 'y' -> const x = require('y')
@@ -384,11 +385,15 @@ function wrapTestApi(
       return Reflect.apply(target, thisArg, args);
     },
 
-    get: (target, prop: 'only' | 'skip' | 'each' | 'for') => {
+    get: (target, prop: 'only' | 'skip' | 'each' | 'for' | 'runIf' | 'skipIf') => {
       if (prop === 'only' || prop === 'skip') {
         return wrapTestApi(target[prop], suffix);
       }
 
+      if (prop === 'runIf' || prop === 'skipIf') {
+        return (condition: boolean) => wrapTestApi((target as TestAPI)[prop](condition), suffix);
+      }
+
       if (prop === 'each' || prop === 'for') {
         return wrapTestEachApi(target[prop], suffix);
       }
diff --git a/dev-packages/node-integration-tests/utils/runner/createRunner.ts b/dev-packages/node-integration-tests/utils/runner/createRunner.ts
index bd237a36cae7..e737cfa4be8e 100644
--- a/dev-packages/node-integration-tests/utils/runner/createRunner.ts
+++ b/dev-packages/node-integration-tests/utils/runner/createRunner.ts
@@ -19,6 +19,7 @@ import { existsSync } from 'fs';
 import { tmpdir } from 'os';
 import { join } from 'path';
 import { inspect } from 'util';
+import { onTestFailed } from 'vitest';
 import type { DeepPartial } from './../assertions';
 import {
   assertEnvelopeHeader,
@@ -108,12 +109,36 @@ const NODE_MAJOR = Number(process.versions.node.split('.')[0]);
 const COMPILE_CACHE_ENV: Record<string, string> =
   NODE_MAJOR >= 22 ? { NODE_COMPILE_CACHE: join(tmpdir(), 'sentry-node-it-compile-cache') } : {};
 
+// The Bun and Deno packages run these suites from their own folder. Scenarios read the working
+// directory (e.g. `modulesIntegration` reads its `package.json`), so it is always this package.
+const PACKAGE_ROOT = join(__dirname, '..', '..');
+
 /** Node flags that preload a module before the entry point. */
 const PRELOAD_FLAGS = ['--import', '--require', '-r'];
 
+/**
+ * How long a scenario may take to report its server port. Bun and Deno start the SDK more slowly
+ * than Node, and under load they passed 10 seconds, which failed tests that were only slow.
+ */
+const PORT_TIMEOUT = process.env.RUNTIME && process.env.RUNTIME !== 'node' ? 30_000 : 10_000;
+
 /** tsx's CommonJS require hook, preloaded for `.ts` scenarios. */
 const TS_LOADER = 'tsx/cjs';
 
+type Runtime = 'node' | 'bun' | 'deno';
+
+/**
+ * The runtime that runs the scenario child process, from the `RUNTIME` env var (`node` when unset).
+ * The Bun and Deno integration test packages set it to run selected Node suites on their runtime.
+ */
+function getRuntime(): Runtime {
+  const runtime = process.env.RUNTIME || 'node';
+  if (runtime !== 'node' && runtime !== 'bun' && runtime !== 'deno') {
+    throw new Error(`Unsupported RUNTIME: ${runtime}`);
+  }
+  return runtime;
+}
+
 export const CLEANUP_STEPS = new Set<VoidFunction>();
 
 export function cleanupChildProcesses(): void {
@@ -257,7 +282,11 @@ export function createRunner(...paths: string[]) {
       let envelopeCount = 0;
       let scenarioServerPort: number | undefined;
       let hasExited = false;
+      let exitStatus: string | undefined;
       let child: ReturnType<typeof spawn> | undefined;
+      let spawnedAt: number | undefined;
+      let lastOutputAt: number | undefined;
+      let logsDumped = false;
 
       // Resolved the moment `complete()` runs, so `completed()` can await the result directly
       // instead of polling — see the comment on `waitForEvent`.
@@ -265,6 +294,14 @@ export function createRunner(...paths: string[]) {
       // Resolved once the scenario reports its server port, so `makeRequest` can await it directly.
       const portReady = createDeferred();
 
+      // Vitest stops a test at its own timeout before `completed()` gives up, so print the child
+      // output then too. `completed()` prints it for the failures it reports itself.
+      onTestFailed(() => {
+        if (!isComplete) {
+          dumpCapturedLogs();
+        }
+      });
+
       function complete(error?: Error): void {
         if (isComplete) {
           return;
@@ -272,10 +309,28 @@ export function createRunner(...paths: string[]) {
 
         isComplete = true;
         completeError = error || undefined;
-        child?.kill();
+        stopChild();
         completedDeferred.resolve();
       }
 
+      /**
+       * Sends `SIGTERM`, and `SIGKILL` if the child still runs 2 seconds later. A scenario (or the
+       * SDK, e.g. on Vercel) can listen for `SIGTERM`, and on Deno a signal listener keeps the
+       * process alive, so `SIGTERM` alone left such children running after the test run.
+       */
+      function stopChild(): void {
+        if (!child || hasExited) {
+          return;
+        }
+        child.kill();
+        const killTimer = setTimeout(() => {
+          if (!hasExited) {
+            child?.kill('SIGKILL');
+          }
+        }, 2_000);
+        killTimer.unref();
+      }
+
       /**
        * Print everything the child process wrote to stdout/stderr. Called when a test fails or
        * times out so the captured output is visible in CI logs. Skipped when `DEBUG` is set, since
@@ -284,12 +339,23 @@ export function createRunner(...paths: string[]) {
       function dumpCapturedLogs(): void {
         // Skip when the failure is expected (`test.fails` variants) — the output would just be noise.
         // In debug mode the same lines are already streamed live, so skip then too.
-        if (process.env.DEBUG || suppressErrorLogs) {
+        if (process.env.DEBUG || suppressErrorLogs || logsDumped) {
           return;
         }
 
+        logsDumped = true;
+        const now = Date.now();
+        const state = [
+          `runtime=${getRuntime()}`,
+          `pid=${child?.pid ?? 'none'}`,
+          hasExited ? `exited (${exitStatus})` : 'running',
+          `envelopes=${envelopeCount}/${expectedEnvelopeCount}`,
+          `ms since spawn=${spawnedAt ? now - spawnedAt : 'not spawned'}`,
+          `ms since last output=${lastOutputAt ? now - lastOutputAt : 'no output'}`,
+        ].join(', ');
+
         // eslint-disable-next-line no-console
-        console.log(`\n--- Captured child process output for ${testPath} ---`);
+        console.log(`\n--- Captured child process output for ${testPath} (${state}) ---`);
         if (logs.length === 0) {
           // eslint-disable-next-line no-console
           console.log('(no output captured)');
@@ -433,9 +499,11 @@ export function createRunner(...paths: string[]) {
           // requests to the fake DSN.
           const wantsAutoFlush =
             !ensureNoErrorOutput && (expectedEnvelopes.length > 0 || (expectedEnvelopeHeaders?.length ?? 0) > 0);
-          const childFlags = wantsAutoFlush ? [...buildAutoFlushFlags(flags, testPath), ...flags] : flags;
+          const runtime = getRuntime();
+          const childFlags = wantsAutoFlush ? [...buildAutoFlushFlags(flags, testPath, runtime), ...flags] : flags;
 
-          child = spawn('node', [...childFlags, testPath], { env });
+          child = spawn(runtime, buildRuntimeArgs(runtime, childFlags, testPath), { env, cwd: PACKAGE_ROOT });
+          spawnedAt = Date.now();
 
           child.on('error', e => {
             // eslint-disable-next-line no-console
@@ -443,11 +511,16 @@ export function createRunner(...paths: string[]) {
             complete(e);
           });
 
+          // Cleanup runs after the tests (and at process exit, where timers never fire), so there is no
+          // graceful stop to wait for.
           registerCleanupStep(() => {
-            child?.kill();
+            if (!hasExited) {
+              child?.kill('SIGKILL');
+            }
           });
 
           child.stderr?.on('data', (data: Buffer) => {
+            lastOutputAt = Date.now();
             const output = data.toString();
             logs.push(output.trim());
 
@@ -461,6 +534,7 @@ export function createRunner(...paths: string[]) {
 
           child.on('close', (code, signal) => {
             hasExited = true;
+            exitStatus = signal ? `signal ${signal}` : `code ${code ?? 'unknown'}`;
 
             if (ensureNoErrorOutput) {
               complete();
@@ -519,6 +593,7 @@ export function createRunner(...paths: string[]) {
 
           let buffer = Buffer.alloc(0);
           child.stdout?.on('data', (data: Buffer) => {
+            lastOutputAt = Date.now();
             // This is horribly memory inefficient but it's only for tests
             buffer = Buffer.concat([buffer, data]);
 
@@ -570,7 +645,7 @@ export function createRunner(...paths: string[]) {
           options: { headers?: Record<string, string>; data?: BodyInit; expectError?: boolean } = {},
         ): Promise<T | undefined> {
           try {
-            await waitForEvent(portReady.promise, 10_000, 'Timed out waiting for server port');
+            await waitForEvent(portReady.promise, PORT_TIMEOUT, 'Timed out waiting for server port');
           } catch (e) {
             complete(e as Error);
             return;
@@ -697,17 +772,68 @@ function getPreloadPaths(flags: readonly string[]): string[] {
  * The CJS loader stays on `--require`: any `--import` makes Node resolve the entry point
  * through the ESM loader, which rejects the `.ts` scenarios that `tsx/cjs` handles. Unlike
  * an instrument file it never calls `Sentry.init()`, so the loader thread is not a concern.
+ *
+ * Bun and Deno run `.ts` files natively as ES modules, so their `import` of the SDK resolves
+ * to the ESM build.
  */
-function buildAutoFlushFlags(existingFlags: readonly string[], testPath: string): string[] {
+function buildAutoFlushFlags(existingFlags: readonly string[], testPath: string, runtime: Runtime): string[] {
   const initPath =
     getPreloadPaths(existingFlags)
       .filter(path => path !== TS_LOADER)
       .at(-1) ?? testPath;
-  const isEsm = initPath.endsWith('.mjs') || !/\.[cm]?[jt]s$/.test(initPath);
+  const isEsm =
+    initPath.endsWith('.mjs') || (runtime !== 'node' && initPath.endsWith('.ts')) || !/\.[cm]?[jt]s$/.test(initPath);
 
   return isEsm ? ['--import', join(__dirname, 'auto-flush.mjs')] : ['--require', join(__dirname, 'auto-flush.cjs')];
 }
 
+/**
+ * Returns the arguments for the runtime binary. Bun and Deno get Node's preload flags as
+ * `--preload`, and no tsx loader. `RUNTIME_PRELOAD` is a module path that Bun and Deno preload
+ * before all other modules. Deno also gets all permissions and the import map from
+ * `DENO_IMPORT_MAP`. Any other Node flag throws, so a suite that needs one fails with a clear
+ * message instead of running with different behavior.
+ */
+function buildRuntimeArgs(runtime: Runtime, flags: readonly string[], testPath: string): string[] {
+  if (runtime === 'node') {
+    return [...flags, testPath];
+  }
+
+  const args: string[] = process.env.RUNTIME_PRELOAD ? ['--preload', process.env.RUNTIME_PRELOAD] : [];
+  for (let i = 0; i < flags.length; i++) {
+    const flag = flags[i] as string;
+    const [name, ...rest] = flag.split('=');
+
+    if (!PRELOAD_FLAGS.includes(name as string)) {
+      throw new Error(`Node flag "${flag}" has no ${runtime} equivalent in the test runner (${testPath})`);
+    }
+
+    const path = rest.length ? rest.join('=') : (flags[++i] as string);
+    if (path !== TS_LOADER) {
+      args.push('--preload', path);
+    }
+  }
+
+  if (runtime === 'bun') {
+    return [...args, testPath];
+  }
+
+  const importMap = process.env.DENO_IMPORT_MAP ? ['--import-map', process.env.DENO_IMPORT_MAP] : [];
+  // Deno loads a `.js` file as ESM unless its package.json has `"type": "commonjs"`, and this
+  // package sets no `"type"`, so the CJS scenarios need CommonJS detection.
+  // The workspace symlinks resolve the SDK packages outside `node_modules`, where Deno 2.8.3
+  // (the CI version) rejects Node builtins without the `node:` prefix (e.g. `url` in `@sentry/node`).
+  return [
+    'run',
+    '--allow-all',
+    '--unstable-detect-cjs',
+    '--unstable-bare-node-builtins',
+    ...importMap,
+    ...args,
+    testPath,
+  ];
+}
+
 function expectErrorEvent(item: Event, expected: ExpectedEvent): void {
   if (typeof expected === 'function') {
     expected(item);
diff --git a/package.json b/package.json
index a25b4dd72738..5fce1bf3ac5a 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "yalc:publish": "nx run-many -t yalc:publish"
   },
   "volta": {
-    "node": "20.19.5",
+    "node": "24.21.0",
     "yarn": "1.22.22",
     "pnpm": "9.15.9"
   },
@@ -133,7 +133,7 @@
     "nodemon": "^3.1.10",
     "npm-run-all2": "^6.2.0",
     "nx": "22.7.7",
-    "oxfmt": "^0.63.0",
+    "oxfmt": "^0.70.0",
     "oxlint": "^1.75.0",
     "oxlint-tsgolint": "7",
     "rimraf": "^5.0.10",
diff --git a/packages/angular/README.md b/packages/angular/README.md
index 8251d0b226f7..77ac7ab11ebf 100644
--- a/packages/angular/README.md
+++ b/packages/angular/README.md
@@ -10,219 +10,15 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/angular.svg)](https://www.npmjs.com/package/@sentry/angular)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/angular.svg)](https://www.npmjs.com/package/@sentry/angular)
 
-## Links
+The official Sentry SDK for monitoring Angular applications.
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/angular/)
+## Documentation
 
-## Angular Version Compatibility
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/angular/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/angular/configuration/)
+- [Angular-specific features](https://docs.sentry.io/platforms/javascript/guides/angular/features/)
 
-This SDK officially supports Angular 14 to 20.
+## Support
 
-If you're using an older Angular version please check the
-[compatibility table in the docs](https://docs.sentry.io/platforms/javascript/guides/angular/#angular-version-compatibility).
-
-If you're using an older version of Angular and experience problems with the Angular SDK, we recommend downgrading the
-SDK to version 7.x. Please note that we don't provide any support for Angular versions below 10.
-
-## General
-
-This package is a wrapper around `@sentry/browser`, with added functionality related to Angular. All methods available
-in `@sentry/browser` can be imported from `@sentry/angular`.
-
-To use this SDK, call `Sentry.init(options)` before you bootstrap your Angular application.
-
-```javascript
-import { bootstrapApplication } from '@angular/platform-browser';
-import { init } from '@sentry/angular';
-
-import { AppComponent } from './app/app.component';
-
-init({
-  dsn: '__DSN__',
-  // ...
-});
-
-bootstrapApplication(AppComponent, appConfig);
-```
-
-### ErrorHandler
-
-`@sentry/angular` exports a function to instantiate an ErrorHandler provider that will automatically send Javascript
-errors captured by the Angular's error handler.
-
-```ts
-import { ApplicationConfig, NgModule, ErrorHandler } from '@angular/core';
-import { createErrorHandler } from '@sentry/angular';
-
-export const appConfig: ApplicationConfig = {
-  providers: [
-    {
-      provide: ErrorHandler,
-      useValue: createErrorHandler({
-        showDialog: true,
-      }),
-    },
-  ],
-};
-
-// Or using an old module approach:
-@NgModule({
-  // ...
-  providers: [
-    {
-      provide: ErrorHandler,
-      useValue: createErrorHandler({
-        showDialog: true,
-      }),
-    },
-  ],
-  // ...
-})
-export class AppModule {}
-```
-
-Additionally, `createErrorHandler` accepts a set of options that allows you to configure its behavior. For more details
-see `ErrorHandlerOptions` interface in `src/errorhandler.ts`.
-
-### Tracing
-
-`@sentry/angular` exports a Trace Service, Directive and Decorators that leverage the tracing features to add
-Angular-related spans to transactions. If tracing is not enabled, this functionality will not work. The SDK's
-`TraceService` itself tracks route changes and durations, while directive and decorators are tracking components
-initializations.
-
-#### Install
-
-Registering a Trace Service is a 3-step process.
-
-1. Register and configure the `BrowserTracing` integration, including custom Angular routing instrumentation:
-
-```javascript
-import { init, browserTracingIntegration } from '@sentry/angular';
-
-init({
-  dsn: '__DSN__',
-  integrations: [browserTracingIntegration()],
-  tracePropagationTargets: ['localhost', 'https://yourserver.io/api'],
-  tracesSampleRate: 1,
-});
-```
-
-2. Inject the `TraceService` in the `APP_INITIALIZER`:
-
-```ts
-import { ApplicationConfig, APP_INITIALIZER, provideAppInitializer } from '@angular/core';
-
-export const appConfig: ApplicationConfig = {
-  providers: [
-    {
-      provide: APP_INITIALIZER,
-      useFactory: () => () => {},
-      deps: [TraceService],
-      multi: true,
-    },
-
-    // Starting with Angular 19, we can use `provideAppInitializer`
-    // instead of directly providing `APP_INITIALIZER` (deprecated):
-    provideAppInitializer(() => inject(TraceService)),
-  ],
-};
-
-// Or using an old module approach:
-@NgModule({
-  // ...
-  providers: [
-    {
-      provide: APP_INITIALIZER,
-      useFactory: () => () => {},
-      deps: [TraceService],
-      multi: true,
-    },
-
-    // Starting with Angular 19, we can use `provideAppInitializer`
-    // instead of directly providing `APP_INITIALIZER` (deprecated):
-    provideAppInitializer(() => inject(TraceService)),
-  ],
-  // ...
-})
-export class AppModule {}
-```
-
-#### Use
-
-To track Angular components as part of your transactions, you have 3 options.
-
-_TraceDirective:_ used to track a duration between `OnInit` and `AfterViewInit` lifecycle hooks in template:
-
-```ts
-import { TraceModule } from '@sentry/angular';
-
-@Component({
-  selector: 'some-component',
-  imports: [TraceModule],
-  // ...
-})
-export class SomeComponentThatUsesTraceDirective {}
-```
-
-Then, inside your component's template (keep in mind that the directive's name attribute is required):
-
-```html
-<app-header trace="header"></app-header>
-<articles-list trace="articles-list"></articles-list>
-<app-footer trace="footer"></app-footer>
-```
-
-_TraceClass:_ used to track a duration between `OnInit` and `AfterViewInit` lifecycle hooks in components:
-
-```javascript
-import { Component } from '@angular/core';
-import { TraceClass } from '@sentry/angular';
-
-@Component({
-  selector: 'layout-header',
-  templateUrl: './header.component.html',
-})
-@TraceClass()
-export class HeaderComponent {
-  // ...
-}
-```
-
-_TraceMethod:_ used to track a specific lifecycle hooks as point-in-time spans in components:
-
-```javascript
-import { Component, OnInit } from '@angular/core';
-import { TraceMethod } from '@sentry/angular';
-
-@Component({
-  selector: 'app-footer',
-  templateUrl: './footer.component.html',
-})
-export class FooterComponent implements OnInit {
-  @TraceMethod()
-  ngOnInit() {}
-}
-```
-
-You can also add your own custom spans via `startSpan()`. For example, if you'd like to track the duration of Angular
-boostraping process, you can do it as follows:
-
-```javascript
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { init, startSpan } from '@sentry/angular';
-
-import { AppModule } from './app/app.module';
-
-// ...
-startSpan(
-  {
-    name: 'platform-browser-dynamic',
-    op: 'ui.mount',
-  },
-  async () => {
-    await platformBrowserDynamic().bootstrapModule(AppModule);
-  },
-);
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 4c8785c43d4a..65159b67e13b 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -23,7 +23,7 @@
   "dependencies": {
     "@sentry/browser": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/README.md b/packages/astro/README.md
index c4994a685987..203680b44c58 100644
--- a/packages/astro/README.md
+++ b/packages/astro/README.md
@@ -10,137 +10,17 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/astro.svg)](https://www.npmjs.com/package/@sentry/astro)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/astro.svg)](https://www.npmjs.com/package/@sentry/astro)
 
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/astro/)
-
-## SDK Status
+The official Sentry SDK for monitoring Astro applications.
 
 This SDK is in Beta and not yet fully stable. If you have feedback or encounter any bugs, feel free to
 [open an issue](https://github.com/getsentry/sentry-javascript/issues/new/choose).
 
-## General
-
-This package is a wrapper around `@sentry/node` for the server and `@sentry/browser` for the client side.
-
-## Installation and Setup
-
-Install the Sentry Astro SDK with the `astro` CLI:
-
-```bash
-npx astro add @sentry/astro
-```
-
-### Build-time Configuration
-
-Register the Sentry integration in your `astro.config.mjs`. This is where you configure build-time options such as
-source maps upload (`org`, `project`, `authToken`). Runtime SDK options (`dsn`, `environment`, `tracesSampleRate`, Replay
-sample rates, and so on) belong in dedicated init files, not on `sentry()`.
-
-```javascript
-import { defineConfig } from 'astro/config';
-import sentry from '@sentry/astro';
-
-export default defineConfig({
-  integrations: [
-    sentry({
-      org: 'your-org-slug',
-      project: 'your-sentry-project-slug',
-      authToken: process.env.SENTRY_AUTH_TOKEN,
-    }),
-  ],
-});
-```
-
-Follow [this guide](https://docs.sentry.io/product/accounts/auth-tokens/#organization-auth-tokens) to create an auth
-token and add it to your environment variables:
-
-```bash
-SENTRY_AUTH_TOKEN="your-token"
-```
-
-### Runtime SDK Configuration
-
-If you do not add `sentry.client.config.ts` or `sentry.server.config.ts`, Sentry still initializes with default options
-and reads the DSN from `PUBLIC_SENTRY_DSN`. Add those files at the project root when you want to customize client or
-server options, and pass them to `Sentry.init()`.
-
-Set `PUBLIC_SENTRY_DSN` in your environment (for example in `.env`):
-
-```bash
-PUBLIC_SENTRY_DSN="__DSN__"
-```
-
-```javascript
-// sentry.client.config.ts
-import * as Sentry from '@sentry/astro';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-  integrations: [Sentry.replayIntegration()],
-  replaysSessionSampleRate: 0.1,
-  replaysOnErrorSampleRate: 1.0,
-});
-```
-
-```javascript
-// sentry.server.config.ts
-import * as Sentry from '@sentry/astro';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-});
-```
-
-### Server Instrumentation
-
-For Astro apps configured for (hybrid) Server Side Rendering (SSR), the Sentry integration will automatically add
-middleware to your server to instrument incoming requests.
-
-The Sentry middleware enhances the data collected by Sentry on the server side by:
-
-- Enabling distributed tracing between client and server
-- Collecting performance spans for incoming requests
-- Enhancing captured errors with additional information
-
-#### Disable Automatic Server Instrumentation
-
-You can opt out of using the automatic sentry server instrumentation in your `astro.config.mjs` file:
-
-```javascript
-import { defineConfig } from 'astro/config';
-import sentry from '@sentry/astro';
-
-export default defineConfig({
-  integrations: [
-    sentry({
-      autoInstrumentation: {
-        requestHandler: false,
-      },
-    }),
-  ],
-});
-```
-
-If you opt out but still want the middleware, add it manually to your `src/middleware.js` file:
-
-```javascript
-// src/middleware.js
-import { sequence } from 'astro:middleware';
-import * as Sentry from '@sentry/astro';
-
-export const onRequest = sequence(
-  Sentry.handleRequest(),
-  // Add your other handlers after Sentry.handleRequest()
-);
-```
+## Documentation
 
-## Configuration
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/astro/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/astro/configuration/)
 
-Check out our docs for configuring your SDK setup:
+## Support
 
-- [Getting Started](https://docs.sentry.io/platforms/javascript/guides/astro/)
-- [Manual Setup and Configuration](https://docs.sentry.io/platforms/javascript/guides/astro/manual-setup/)
-- [Source Maps Upload](https://docs.sentry.io/platforms/javascript/guides/astro/sourcemaps/)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 3e975ac7ac85..38ee7c8b5750 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -53,7 +53,7 @@
   "dependencies": {
     "@sentry/browser": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
     "@sentry/server-utils": "11.0.0",
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
index 8f765fc367f8..a791eac011a3 100644
--- a/packages/astro/src/index.server.ts
+++ b/packages/astro/src/index.server.ts
@@ -95,10 +95,12 @@ export {
   openAIIntegration,
   groqIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   langChainIntegration,
   langGraphIntegration,
   createFlueInstrumentation,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   parameterize,
   pinoIntegration,
@@ -161,6 +163,7 @@ export {
   supabaseIntegration,
   instrumentSupabaseClient,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/aws-serverless/README.md b/packages/aws-serverless/README.md
index 340e9d11263d..5f77ea674cbd 100644
--- a/packages/aws-serverless/README.md
+++ b/packages/aws-serverless/README.md
@@ -6,126 +6,14 @@
 
 # Official Sentry SDK for AWS Lambda
 
-## Links
+The official Sentry SDK for monitoring AWS Lambda functions.
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/aws-lambda)
+## Documentation
 
-## General
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/aws-lambda/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/aws-lambda/configuration/)
 
-This package is a wrapper around `@sentry/node`, with added functionality related to AWS Lambda. All
-methods available in `@sentry/node` can be imported from `@sentry/aws-serverless`.
+## Support
 
-### Automatic Setup
-
-To use this SDK with an automatic setup, set the following environment variables in your Lambda function configuration:
-
-```bash
-NODE_OPTIONS="--import @sentry/aws-serverless/awslambda-auto"
-SENTRY_DSN="__DSN__"
-# Add Tracing by setting tracesSampleRate and adding integration
-# Set tracesSampleRate to 1.0 to capture 100% of transactions
-# We recommend adjusting this value in production
-# Learn more at
-# https://docs.sentry.io/platforms/javascript/configuration/options/#traces-sample-rate
-SENTRY_TRACES_SAMPLE_RATE="1.0"
-```
-
-### Manual Setup
-
-Alternatively, to further customize the SDK setup, you can also manually initialize the SDK in your lambda function. The benefit of this installation method is that you can fully customize your Sentry SDK setup in a Sentry.init call.
-
-Create a new file, for example `instrument.js` to initialize the SDK:
-
-```js
-import * as Sentry from '@sentry/aws-serverless';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // Adds HTTP request headers and IP for users, for more info visit:
-  // https://docs.sentry.io/platforms/javascript/guides/aws-lambda/configuration/options/#dataCollection
-  dataCollection: { userInfo: true, httpHeaders: { request: true } },
-  // Add Tracing by setting tracesSampleRate and adding integration
-  // Set tracesSampleRate to 1.0 to capture 100% of transactions
-  // We recommend adjusting this value in production
-  // Learn more at
-  // https://docs.sentry.io/platforms/javascript/configuration/options/#traces-sample-rate
-  tracesSampleRate: 1.0,
-});
-```
-
-And then load the SDK before your function starts by importing the instrument.js file via a NODE_OPTIONS environment variable:
-
-```bash
-NODE_OPTIONS="--import ./instrument.js"
-```
-
-## Verify
-
-```js
-// async (recommended)
-export const handler = async (event, context) => {
-  throw new Error('oh, hello there!');
-};
-
-// sync
-export const handler = (event, context, callback) => {
-  throw new Error('oh, hello there!');
-};
-```
-
-## Container Image-based Lambda Functions
-
-When using container image-based Lambda functions (e.g., with [Lambda Web Adapter](https://github.com/awslabs/aws-lambda-web-adapter) for frameworks like SvelteKit, Next.js, or Remix), Lambda layers cannot be attached. Instead, you can install the Sentry Lambda extension directly into your Docker image. The extension tunnels Sentry events through a local proxy, improving event delivery reliability during Lambda freezes.
-
-### Setup
-
-1. Install `@sentry/aws-serverless` as a dependency — even if you use a different Sentry SDK in your application (e.g., `@sentry/sveltekit`), this package contains the extension files needed for the Docker image.
-
-2. Copy the extension files from the npm package into your Docker image:
-
-```dockerfile
-FROM public.ecr.aws/lambda/nodejs:22
-
-# Copy the Sentry Lambda extension
-RUN mkdir -p /opt/sentry-extension
-COPY node_modules/@sentry/aws-serverless/build/lambda-extension/sentry-extension /opt/extensions/sentry-extension
-COPY node_modules/@sentry/aws-serverless/build/lambda-extension/index.mjs /opt/sentry-extension/index.mjs
-RUN chmod +x /opt/extensions/sentry-extension /opt/sentry-extension/index.mjs
-
-# ... rest of your Dockerfile
-```
-
-3. Point your Sentry SDK at the extension using the `tunnel` option. The extension always listens on `http://localhost:9000/envelope` — this URL is fixed and must be used exactly as shown:
-
-```js
-import * as Sentry from '@sentry/aws-serverless';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tunnel: 'http://localhost:9000/envelope',
-});
-```
-
-This works with any Sentry SDK:
-
-```js
-import * as Sentry from '@sentry/sveltekit';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tunnel: 'http://localhost:9000/envelope',
-});
-```
-
-## Integrate Sentry using the Sentry Lambda layer
-
-Another much simpler way to integrate Sentry to your AWS Lambda function is to add the official layer.
-
-1. Choose Layers -> Add Layer.
-2. Specify an ARN: `arn:aws:lambda:us-west-1:943013980633:layer:SentryNodeServerlessSDKv10:19`. Get the latest ARN from the [docs](https://docs.sentry.io/platforms/javascript/guides/aws-lambda/install/layer).
-3. Go to Environment variables and add:
-   - `NODE_OPTIONS`: `--import @sentry/aws-serverless/awslambda-auto`.
-   - `SENTRY_DSN`: `your dsn`.
-   - `SENTRY_TRACES_SAMPLE_RATE`: a number between 0 and 1 representing the chance a transaction is sent to Sentry. For
-     more information, see
-     [docs](https://docs.sentry.io/platforms/javascript/guides/aws-lambda/configuration/options/#tracesSampleRate).
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 6625669ca9b2..83608c3b23fc 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -56,7 +56,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts
index c467d1b2266f..1687e2c16a10 100644
--- a/packages/aws-serverless/src/index.ts
+++ b/packages/aws-serverless/src/index.ts
@@ -63,9 +63,11 @@ export {
   openAIIntegration,
   groqIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   langChainIntegration,
   langGraphIntegration,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   createFlueInstrumentation,
   modulesIntegration,
@@ -144,6 +146,7 @@ export {
   supabaseIntegration,
   instrumentSupabaseClient,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/browser-utils/README.md b/packages/browser-utils/README.md
index 58b19de5d5a6..0e8f9a34a390 100644
--- a/packages/browser-utils/README.md
+++ b/packages/browser-utils/README.md
@@ -10,14 +10,17 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/browser-utils.svg)](https://www.npmjs.com/package/@sentry/browser-utils)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/browser-utils.svg)](https://www.npmjs.com/package/@sentry/browser-utils)
 
+Shared browser utilities used by Sentry’s JavaScript SDKs.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages. It is not part of the
 > public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on it directly.
 
-## Links
+## Documentation
 
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [JavaScript SDK documentation](https://docs.sentry.io/platforms/javascript/)
 
-## General
+## Support
 
-Common utilities used by the Sentry JavaScript SDKs.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index e667f915e909..127dfcf07e4b 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "web-vitals": "^6.1.1"
   },
   "scripts": {
diff --git a/packages/browser-utils/src/performance/interactions.ts b/packages/browser-utils/src/performance/interactions.ts
index 2be7d7a52272..7a3cc89a981d 100644
--- a/packages/browser-utils/src/performance/interactions.ts
+++ b/packages/browser-utils/src/performance/interactions.ts
@@ -1,4 +1,5 @@
 import {
+  BROWSER_WEB_VITAL_INP_TARGET,
   HTTP_ROUTE,
   ROUTER_NAVIGATION_ROUTE_ID,
   SENTRY_IDLE_SPAN_FINISH_REASON,
@@ -254,7 +255,7 @@ function trackInteractionsAsSpans(client: Client): void {
           attributes: {
             [SENTRY_OP]: UI_INTERACTION_CLICK,
             [SENTRY_ORIGIN]: 'auto.browser.interactions',
-            ...(selector && selector !== UNKNOWN_ELEMENT_NAME && { 'browser.web_vital.inp.target': selector }),
+            ...(selector && selector !== UNKNOWN_ELEMENT_NAME && { [BROWSER_WEB_VITAL_INP_TARGET]: selector }),
           },
         };
 
diff --git a/packages/browser-utils/src/web-vitals/spans.ts b/packages/browser-utils/src/web-vitals/spans.ts
index faa727642899..424180427141 100644
--- a/packages/browser-utils/src/web-vitals/spans.ts
+++ b/packages/browser-utils/src/web-vitals/spans.ts
@@ -30,7 +30,12 @@ import {
   addLcpInstrumentationHandler,
 } from '../instrumentation/performanceObserver';
 import type { LargestContentfulPaint, LayoutShift } from './emitSpan';
-import { BROWSER_NAVIGATION_TYPE, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
+import {
+  BROWSER_NAVIGATION_TYPE,
+  BROWSER_WEB_VITAL_INP_INTERACTION_TYPE,
+  BROWSER_WEB_VITAL_INP_TARGET,
+  UI_COMPONENT_NAME,
+} from '@sentry/conventions/attributes';
 import { _emitWebVitalSpan } from './emitSpan';
 import { isValidLcpMetric } from './lcp';
 import { listenForWebVitalReportEvents } from './reportEvents';
@@ -437,9 +442,8 @@ export function _sendInpSpan(
   // say whether there was an interaction to describe. These attributes can: they are only set for
   // what was actually observed. The name no longer holds the selector either, now that it is the
   // component name or the op's fallback under span streaming.
-  // TODO: use the `@sentry/conventions` constants once getsentry/sentry-conventions#641 is released.
-  selector && selector !== UNKNOWN_ELEMENT_NAME && (attributes['browser.web_vital.inp.target'] = selector);
-  entryInteractionType && (attributes['browser.web_vital.inp.interaction_type'] = entryInteractionType);
+  selector && selector !== UNKNOWN_ELEMENT_NAME && (attributes[BROWSER_WEB_VITAL_INP_TARGET] = selector);
+  entryInteractionType && (attributes[BROWSER_WEB_VITAL_INP_INTERACTION_TYPE] = entryInteractionType);
 
   if (componentName) {
     attributes[UI_COMPONENT_NAME] = componentName;
diff --git a/packages/browser/README.md b/packages/browser/README.md
index 91f3cde774d9..3d4c16df67dc 100644
--- a/packages/browser/README.md
+++ b/packages/browser/README.md
@@ -11,48 +11,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/browser.svg)](https://www.npmjs.com/package/@sentry/browser)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/browser.svg)](https://www.npmjs.com/package/@sentry/browser)
 
-## Links
+The official Sentry SDK for monitoring JavaScript applications in the browser.
 
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+## Documentation
 
-## Usage
+- [Getting started](https://docs.sentry.io/platforms/javascript/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/configuration/)
 
-To use this SDK, call `Sentry.init(options)` as early as possible after loading the page. This will initialize the SDK
-and hook into the environment. Note that you can turn off almost all side effects using the respective options.
+## Support
 
-```javascript
-import * as Sentry from '@sentry/browser';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // ...
-});
-```
-
-To set context information or send manual events, use the exported functions of `@sentry/browser`. Note that these
-functions will not perform any action before you have called `Sentry.init()`:
-
-```javascript
-import * as Sentry from '@sentry/browser';
-
-// Set user information, as well as tags and further extras
-Sentry.setExtra('battery', 0.7);
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: 'My Breadcrumb',
-  // ...
-});
-
-// Capture exceptions, messages or manual events
-Sentry.captureMessage('Hello, world!');
-Sentry.captureException(new Error('Good bye'));
-Sentry.captureEvent({
-  message: 'Manual',
-  stacktrace: [
-    // ...
-  ],
-});
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/browser/package.json b/packages/browser/package.json
index b96e6ee851aa..25829399515b 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@sentry/browser-utils": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/feedback": "11.0.0",
     "@sentry/replay": "11.0.0",
     "@sentry/replay-canvas": "11.0.0",
diff --git a/packages/browser/src/integrations/httpcontext.ts b/packages/browser/src/integrations/httpcontext.ts
index a00494c5a237..b90c9c44ae2e 100644
--- a/packages/browser/src/integrations/httpcontext.ts
+++ b/packages/browser/src/integrations/httpcontext.ts
@@ -1,7 +1,13 @@
 import { _INTERNAL_filterKeyValueData, defineIntegration, safeSetSpanJSONAttributes } from '@sentry/core';
 import { getHttpRequestData, WINDOW } from '../helpers';
 import { filterCollectedUrl } from '@sentry/core';
-import { HTTP_REQUEST_HEADER_KEY_BASE, SENTRY_OP, URL_FULL, USER_AGENT_ORIGINAL } from '@sentry/conventions/attributes';
+import {
+  HTTP_REQUEST_HEADER_KEY_BASE,
+  SENTRY_IS_LOCALHOST,
+  SENTRY_OP,
+  URL_FULL,
+  USER_AGENT_ORIGINAL,
+} from '@sentry/conventions/attributes';
 
 /**
  * Collects information about HTTP request headers and
@@ -61,7 +67,7 @@ export const httpContextIntegration = defineIntegration(() => {
         // Likewise for the "Filter out localhost events" feature. Deliberately inlined rather than
         // sharing the server-side helper, which costs bundle size for request headers and IPs that
         // don't exist here. Mirrors Relay's localhost filter (relay-filter/src/localhost.rs).
-        'sentry.is_localhost':
+        [SENTRY_IS_LOCALHOST]:
           protocol === 'file:' ||
           hostname === 'localhost' ||
           hostname === '127.0.0.1' ||
diff --git a/packages/browser/src/integrations/spotlight.ts b/packages/browser/src/integrations/spotlight.ts
index a5db70ce2e50..d4714ce1afbc 100644
--- a/packages/browser/src/integrations/spotlight.ts
+++ b/packages/browser/src/integrations/spotlight.ts
@@ -1,6 +1,7 @@
 import type { Client, Envelope, IntegrationFn } from '@sentry/core';
 import { debug, defineIntegration, serializeEnvelope } from '@sentry/core';
 import { getNativeImplementation } from '@sentry/browser-utils';
+import { BROWSER_WEB_VITAL_INP_TARGET } from '@sentry/conventions/attributes';
 import { UI_INTERACTION_CLICK } from '@sentry/conventions/op';
 import { DEBUG_BUILD } from '../debug-build';
 import type { WINDOW } from '../helpers';
@@ -17,7 +18,7 @@ export const INTEGRATION_NAME = 'SpotlightBrowser' as const;
 
 export const SPOTLIGHT_IGNORE_SPANS = [
   { op: UI_INTERACTION_CLICK, name: '#sentry-spotlight' },
-  { op: UI_INTERACTION_CLICK, attributes: { 'browser.web_vital.inp.target': '#sentry-spotlight' } },
+  { op: UI_INTERACTION_CLICK, attributes: { [BROWSER_WEB_VITAL_INP_TARGET]: '#sentry-spotlight' } },
 ];
 
 const _spotlightIntegration = ((options: Partial<SpotlightConnectionOptions> = {}) => {
diff --git a/packages/browser/src/report-dialog.ts b/packages/browser/src/report-dialog.ts
index 03255a7db91d..7abf68f5ea18 100644
--- a/packages/browser/src/report-dialog.ts
+++ b/packages/browser/src/report-dialog.ts
@@ -36,17 +36,30 @@ export function showReportDialog(options: ReportDialogOptions = {}): void {
     eventId: options.eventId || lastEventId(),
   };
 
+  const { onLoad, onClose, onError } = mergedOptions;
+
+  // The endpoint rejects requests without an event ID, and a failed script load hides the reason
+  if (!mergedOptions.eventId) {
+    DEBUG_BUILD && debug.error('[showReportDialog] No event ID');
+    onError?.(new Error('No event ID to show the report dialog for'));
+    return;
+  }
+
   const script = WINDOW.document.createElement('script');
   script.async = true;
   script.crossOrigin = 'anonymous';
   script.src = getReportDialogEndpoint(dsn, mergedOptions);
 
-  const { onLoad, onClose } = mergedOptions;
-
   if (onLoad) {
     script.onload = onLoad;
   }
 
+  if (onError) {
+    script.onerror = () => {
+      onError(new Error('Failed to load the report dialog script'));
+    };
+  }
+
   if (onClose) {
     const reportDialogClosedMessageHandler = (event: MessageEvent): void => {
       if (event.data === '__sentry_reportdialog_closed__') {
@@ -58,6 +71,10 @@ export function showReportDialog(options: ReportDialogOptions = {}): void {
       }
     };
     WINDOW.addEventListener('message', reportDialogClosedMessageHandler);
+    // A dialog that never loads never closes, so the listener would stay forever
+    script.addEventListener('error', () => {
+      WINDOW.removeEventListener('message', reportDialogClosedMessageHandler);
+    });
   }
 
   injectionPoint.appendChild(script);
diff --git a/packages/browser/test/index.test.ts b/packages/browser/test/index.test.ts
index 4a0986048cf1..e9836c90308b 100644
--- a/packages/browser/test/index.test.ts
+++ b/packages/browser/test/index.test.ts
@@ -97,7 +97,7 @@ describe('SentryBrowser', () => {
         getCurrentScope().setUser(EX_USER);
         setCurrentClient(client);
 
-        showReportDialog();
+        showReportDialog({ eventId: 'foobar' });
 
         expect(getReportDialogEndpoint).toHaveBeenCalledTimes(1);
         expect(getReportDialogEndpoint).toHaveBeenCalledWith(
@@ -136,7 +136,7 @@ describe('SentryBrowser', () => {
         setCurrentClient(client);
 
         const DIALOG_OPTION_USER = { email: 'option@example.com' };
-        showReportDialog({ user: DIALOG_OPTION_USER });
+        showReportDialog({ eventId: 'foobar', user: DIALOG_OPTION_USER });
 
         expect(getReportDialogEndpoint).toHaveBeenCalledTimes(1);
         expect(getReportDialogEndpoint).toHaveBeenCalledWith(
@@ -170,7 +170,7 @@ describe('SentryBrowser', () => {
       it('should call `onClose` when receiving `__sentry_reportdialog_closed__` MessageEvent', async () => {
         const onClose = vi.fn();
 
-        showReportDialog({ onClose });
+        showReportDialog({ eventId: 'foobar', onClose });
 
         await waitForPostMessage('__sentry_reportdialog_closed__');
         expect(onClose).toHaveBeenCalledTimes(1);
@@ -185,7 +185,7 @@ describe('SentryBrowser', () => {
           throw new Error();
         });
 
-        showReportDialog({ onClose });
+        showReportDialog({ eventId: 'foobar', onClose });
 
         await waitForPostMessage('__sentry_reportdialog_closed__');
         expect(onClose).toHaveBeenCalledTimes(1);
@@ -198,7 +198,7 @@ describe('SentryBrowser', () => {
       it('should not call `onClose` for other MessageEvents', async () => {
         const onClose = vi.fn();
 
-        showReportDialog({ onClose });
+        showReportDialog({ eventId: 'foobar', onClose });
 
         await waitForPostMessage('some_message');
         expect(onClose).not.toHaveBeenCalled();
@@ -206,6 +206,45 @@ describe('SentryBrowser', () => {
         await waitForPostMessage('__sentry_reportdialog_closed__');
         expect(onClose).toHaveBeenCalledTimes(1);
       });
+
+      it('should remove the `onClose` listener when the script fails to load', async () => {
+        const onClose = vi.fn();
+
+        showReportDialog({ eventId: 'foobar', onClose });
+
+        const script = WINDOW.document.head.lastElementChild as HTMLScriptElement;
+        script.dispatchEvent(new Event('error'));
+
+        await waitForPostMessage('__sentry_reportdialog_closed__');
+        expect(onClose).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('onError', () => {
+      it('should call `onError` when the script fails to load', () => {
+        const onError = vi.fn();
+
+        showReportDialog({ eventId: 'foobar', onError });
+
+        const script = WINDOW.document.head.lastElementChild as HTMLScriptElement;
+        script.dispatchEvent(new Event('error'));
+
+        expect(onError).toHaveBeenCalledTimes(1);
+        expect(onError).toHaveBeenCalledWith(new Error('Failed to load the report dialog script'));
+      });
+
+      it('should call `onError` and not inject the script without an event ID', () => {
+        const onError = vi.fn();
+        const appendChildSpy = vi.spyOn(WINDOW.document.head, 'appendChild');
+
+        showReportDialog({ onError });
+
+        expect(onError).toHaveBeenCalledTimes(1);
+        expect(onError).toHaveBeenCalledWith(new Error('No event ID to show the report dialog for'));
+        expect(appendChildSpy).not.toHaveBeenCalled();
+
+        appendChildSpy.mockRestore();
+      });
     });
   });
 
diff --git a/packages/browser/test/integrations/httpcontext.test.ts b/packages/browser/test/integrations/httpcontext.test.ts
index e02221301ea1..524c8742bf3a 100644
--- a/packages/browser/test/integrations/httpcontext.test.ts
+++ b/packages/browser/test/integrations/httpcontext.test.ts
@@ -8,20 +8,20 @@ const USER_AGENT =
   'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36';
 
 describe('httpContextIntegration', () => {
-  globalThis.navigator = {
+  vi.stubGlobal('navigator', {
     userAgent:
       'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
-  } as unknown as Navigator;
-  globalThis.location = {
+  } as unknown as Navigator);
+  vi.stubGlobal('location', {
     href: 'https://example.com',
-  } as unknown as Location;
-  globalThis.document = {
+  } as unknown as Location);
+  vi.stubGlobal('document', {
     referrer: 'https://example.com',
     addEventListener: vi.fn(),
     location: {
       href: 'https://example.com',
     },
-  } as unknown as Document;
+  } as unknown as Document);
 
   it("doesn't attach url.full to http.client segment spans", () => {
     const integration = httpContextIntegration();
diff --git a/packages/bun/.oxlintrc.json b/packages/bun/.oxlintrc.json
index ef16f327fffe..52d4c4ff8acf 100644
--- a/packages/bun/.oxlintrc.json
+++ b/packages/bun/.oxlintrc.json
@@ -14,7 +14,24 @@
     {
       "files": ["**/src/**"],
       "rules": {
-        "sdk/no-class-field-initializers": "off"
+        "sdk/no-class-field-initializers": "off",
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "node:diagnostics_channel",
+                "allowTypeImports": true,
+                "message": "Bun garbage-collects a channel that no code references, together with its subscribers. Use `subscribeDiagnosticsChannel` or `diagnosticsTracingChannel` from `@sentry/server-utils` instead. See https://github.com/oven-sh/bun/issues/43086"
+              },
+              {
+                "name": "diagnostics_channel",
+                "allowTypeImports": true,
+                "message": "Bun garbage-collects a channel that no code references, together with its subscribers. Use `subscribeDiagnosticsChannel` or `diagnosticsTracingChannel` from `@sentry/server-utils` instead. See https://github.com/oven-sh/bun/issues/43086"
+              }
+            ]
+          }
+        ]
       }
     }
   ]
diff --git a/packages/bun/README.md b/packages/bun/README.md
index 1867f5a0fef9..5e9c8df00672 100644
--- a/packages/bun/README.md
+++ b/packages/bun/README.md
@@ -10,52 +10,17 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/bun.svg)](https://www.npmjs.com/package/@sentry/bun)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/bun.svg)](https://www.npmjs.com/package/@sentry/bun)
 
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+The official Sentry SDK for monitoring Bun applications.
 
 The Sentry Bun SDK is in beta. Please help us improve the SDK by
 [reporting any issues or giving us feedback](https://github.com/getsentry/sentry-javascript/issues).
 
-## Usage
-
-To use this SDK, call `init(options)` as early as possible in the main entry module. This will initialize the SDK and
-hook into the environment. Note that you can turn off almost all side effects using the respective options.
-
-```javascript
-// CJS Syntax
-const Sentry = require('@sentry/bun');
-// ESM Syntax
-import * as Sentry from '@sentry/bun';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // ...
-});
-```
-
-To set context information or send manual events, use the exported functions of `@sentry/bun`. Note that these functions
-will not perform any action before you have called `init()`:
-
-```javascript
-// Set user information, as well as tags and further extras
-Sentry.setExtra('battery', 0.7);
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: 'My Breadcrumb',
-  // ...
-});
-
-// Capture exceptions, messages or manual events
-Sentry.captureMessage('Hello, world!');
-Sentry.captureException(new Error('Good bye'));
-Sentry.captureEvent({
-  message: 'Manual',
-  stacktrace: [
-    // ...
-  ],
-});
-```
+## Documentation
+
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/bun/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/bun/configuration/)
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/bun/package.json b/packages/bun/package.json
index 53e16d4524df..da0dbb2d6725 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-utils": "11.0.0"
   },
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
index 10aa2d422844..e4b5cd64f60b 100644
--- a/packages/bun/src/index.ts
+++ b/packages/bun/src/index.ts
@@ -85,9 +85,11 @@ export {
   openAIIntegration,
   groqIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   langChainIntegration,
   langGraphIntegration,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   createFlueInstrumentation,
   modulesIntegration,
@@ -161,6 +163,7 @@ export {
   supabaseIntegration,
   instrumentSupabaseClient,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/bun/src/integrations/bunserver.ts b/packages/bun/src/integrations/bunserver.ts
index a61f7dbf1a3f..11977876d040 100644
--- a/packages/bun/src/integrations/bunserver.ts
+++ b/packages/bun/src/integrations/bunserver.ts
@@ -21,8 +21,11 @@ import {
   filterCollectedUrl,
   filterCollectedUrlQuery,
 } from '@sentry/core';
-import type { ServeOptions } from 'bun';
+import type { Server, ServeOptions } from 'bun';
 import {
+  CLIENT_ADDRESS,
+  CLIENT_PORT,
+  NETWORK_PROTOCOL_NAME,
   SENTRY_OP,
   SENTRY_SEGMENT_NAME_SOURCE,
   URL_DOMAIN,
@@ -242,6 +245,24 @@ function wrapRequestHandler<T extends RouteHandler = RouteHandler>(
     const client = getClient();
     const dataCollection = client?.getDataCollectionOptions();
 
+    if (dataCollection?.userInfo) {
+      // `client.address` is the originating client, so a forwarding header wins over the socket, which
+      // behind a proxy holds the proxy's address.
+      const forwardedFor = request.headers.get('x-forwarded-for')?.split(',')[0]?.trim();
+      // Bun passes the `Server` as the second argument to both `fetch` and route handlers, except
+      // when the handler runs through `server.fetch()`.
+      const socketAddress = getRequestIP(args[1], request);
+      if (forwardedFor || socketAddress?.address) {
+        attributes[CLIENT_ADDRESS] = forwardedFor || socketAddress?.address;
+      }
+      if (socketAddress?.port) {
+        attributes[CLIENT_PORT] = socketAddress.port;
+      }
+    }
+
+    // describes the OSI application-layer protocol (http), not the scheme (might be https)
+    attributes[NETWORK_PROTOCOL_NAME] = 'http';
+
     if (dataCollection) {
       Object.assign(attributes, httpHeadersToSpanAttributes(request.headers.toJSON(), dataCollection));
     }
@@ -308,6 +329,18 @@ function wrapRequestHandler<T extends RouteHandler = RouteHandler>(
   });
 }
 
+function getRequestIP(server: unknown, request: Request): { address: string; port: number } | undefined {
+  if (typeof (server as Partial<Server> | undefined)?.requestIP !== 'function') {
+    return undefined;
+  }
+  try {
+    return (server as Server).requestIP(request) ?? undefined;
+  } catch {
+    // Defensive: never let a failed lookup break the user's handler.
+    return undefined;
+  }
+}
+
 function getSpanAttributesFromParsedUrl(
   parsedUrl: ReturnType<typeof parseStringToURLObject>,
   request: Request,
diff --git a/packages/bun/test/integrations/bunserver.test.ts b/packages/bun/test/integrations/bunserver.test.ts
index 27edcc0d88e3..d3ed401e095c 100644
--- a/packages/bun/test/integrations/bunserver.test.ts
+++ b/packages/bun/test/integrations/bunserver.test.ts
@@ -521,6 +521,148 @@ describe('Bun Serve Integration', () => {
   });
 
   describe('data collection', () => {
+    test('captures client address, port and protocol by default', async () => {
+      const server = Bun.serve({
+        async fetch(_req) {
+          return new Response('Bun!');
+        },
+        port,
+      });
+
+      await fetch(`http://localhost:${port}/`);
+
+      await server.stop();
+
+      expect(startSpanSpy).toHaveBeenCalledTimes(1);
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.objectContaining({
+            'client.address': expect.stringMatching(/^(127\.0\.0\.1|::1|::ffff:127\.0\.0\.1)$/),
+            'client.port': expect.any(Number),
+            'network.protocol.name': 'http',
+          }),
+        }),
+        expect.any(Function),
+      );
+    });
+
+    test('captures client address on route handlers', async () => {
+      const server = Bun.serve({
+        routes: {
+          '/users/:id': req => new Response(`User ${req.params.id}`),
+        },
+        port,
+      });
+
+      await fetch(`http://localhost:${port}/users/123`);
+
+      await server.stop();
+
+      expect(startSpanSpy).toHaveBeenCalledTimes(1);
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.objectContaining({
+            'client.address': expect.stringMatching(/^(127\.0\.0\.1|::1|::ffff:127\.0\.0\.1)$/),
+            'client.port': expect.any(Number),
+          }),
+        }),
+        expect.any(Function),
+      );
+    });
+
+    test('prefers the first x-forwarded-for address over the socket address', async () => {
+      const server = Bun.serve({
+        async fetch(_req) {
+          return new Response('Bun!');
+        },
+        port,
+      });
+
+      await fetch(`http://localhost:${port}/`, {
+        headers: { 'X-Forwarded-For': '203.0.113.7, 10.0.0.1' },
+      });
+
+      await server.stop();
+
+      expect(startSpanSpy).toHaveBeenCalledTimes(1);
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.objectContaining({
+            'client.address': '203.0.113.7',
+          }),
+        }),
+        expect.any(Function),
+      );
+    });
+
+    test('does not capture client address when userInfo collection is disabled', async () => {
+      setupClient({ dataCollection: { userInfo: false } });
+
+      const server = Bun.serve({
+        async fetch(_req) {
+          return new Response('Bun!');
+        },
+        port,
+      });
+
+      await fetch(`http://localhost:${port}/`, {
+        headers: { 'X-Forwarded-For': '203.0.113.7' },
+      });
+
+      await server.stop();
+
+      expect(startSpanSpy).toHaveBeenCalledTimes(1);
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.not.objectContaining({
+            'client.address': expect.anything(),
+            'client.port': expect.anything(),
+          }),
+        }),
+        expect.any(Function),
+      );
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.objectContaining({
+            'network.protocol.name': 'http',
+          }),
+        }),
+        expect.any(Function),
+      );
+    });
+
+    test('leaves client address unset when the handler gets no server', async () => {
+      const server = Bun.serve({
+        async fetch(_req) {
+          return new Response('Bun!');
+        },
+        port,
+      });
+
+      // `server.fetch()` calls the handler with the request only.
+      const response = await server.fetch(new Request(`http://localhost:${port}/`));
+
+      await server.stop();
+
+      expect(await response.text()).toBe('Bun!');
+      expect(startSpanSpy).toHaveBeenCalledTimes(1);
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.not.objectContaining({
+            'client.address': expect.anything(),
+            'client.port': expect.anything(),
+          }),
+        }),
+        expect.any(Function),
+      );
+      expect(startSpanSpy).toHaveBeenCalledWith(
+        expect.objectContaining({
+          attributes: expect.objectContaining({ 'network.protocol.name': 'http' }),
+        }),
+        expect.any(Function),
+      );
+    });
+
     test('keeps PII request headers when dataCollection enables full header collection', async () => {
       setupClient({ dataCollection: { httpHeaders: { request: true, response: true } } });
 
diff --git a/packages/bun/test/integrations/diagnosticsChannelGc.test.ts b/packages/bun/test/integrations/diagnosticsChannelGc.test.ts
new file mode 100644
index 000000000000..3034f4005493
--- /dev/null
+++ b/packages/bun/test/integrations/diagnosticsChannelGc.test.ts
@@ -0,0 +1,26 @@
+import { channel } from 'node:diagnostics_channel';
+import { describe, expect, test } from 'bun:test';
+import { init } from '../../src';
+
+const EXPRESS_HANDLE_START = 'tracing:orchestrion:express:handle:start';
+
+function nextTask(): Promise<void> {
+  return new Promise(resolve => setTimeout(resolve, 0));
+}
+
+describe('channel-based integrations', () => {
+  // Bun garbage-collects a diagnostics channel that no code references, together with its
+  // subscribers. A GC in the same task does not collect it, so the check runs in a later task.
+  // See https://github.com/oven-sh/bun/issues/43086
+  test('stay subscribed after a garbage collection', async () => {
+    init({ dsn: 'https://username@domain/123', tracesSampleRate: 1 });
+    await nextTask();
+
+    expect(channel(EXPRESS_HANDLE_START).hasSubscribers).toBe(true);
+
+    Bun.gc(true);
+    await nextTask();
+
+    expect(channel(EXPRESS_HANDLE_START).hasSubscribers).toBe(true);
+  });
+});
diff --git a/packages/bundler-plugins/README.md b/packages/bundler-plugins/README.md
index 9d316ee7e99a..e9387aab6f40 100644
--- a/packages/bundler-plugins/README.md
+++ b/packages/bundler-plugins/README.md
@@ -15,17 +15,11 @@ Check out the individual packages for more information and examples:
 - [esbuild](https://www.npmjs.com/package/@sentry/esbuild-plugin)
 - [Webpack](https://www.npmjs.com/package/@sentry/webpack-plugin)
 
-### Features
+## Documentation
 
-The Sentry bundler plugin package contains the following functionality:
+- [Uploading source maps](https://docs.sentry.io/platforms/javascript/sourcemaps/uploading/)
 
-- Sourcemap upload
-- Release creation in Sentry
-- Automatic release name discovery (based on CI environment - Vercel, AWS, Heroku, CircleCI, or current Git SHA)
-- Automatically associate errors with releases (Release injection)
+## Support
 
-### More information
-
-- [Sentry Documentation](https://docs.sentry.io/quickstart/)
-- [Sentry Discord](https://discord.gg/Ww9hbqr)
-- [Sentry Stackoverflow](http://stackoverflow.com/questions/tagged/sentry)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/bundler-plugins/package.json b/packages/bundler-plugins/package.json
index d11b2c1e8784..64cc612ddc2c 100644
--- a/packages/bundler-plugins/package.json
+++ b/packages/bundler-plugins/package.json
@@ -44,6 +44,11 @@
       "import": "./build/esm/core/index.js",
       "require": "./build/cjs/core/index.js"
     },
+    "./loader-utils": {
+      "types": "./build/types/loader-utils/index.d.ts",
+      "import": "./build/esm/loader-utils/index.js",
+      "require": "./build/cjs/loader-utils/index.js"
+    },
     "./babel-plugin": {
       "types": "./build/types/babel-plugin/index.d.ts",
       "import": "./build/esm/babel-plugin/index.js",
@@ -105,7 +110,6 @@
     }
   },
   "dependencies": {
-    "@babel/core": "^7.18.5",
     "@sentry/core": "11.0.0",
     "dotenv": "^17.4.2",
     "glob": "^13.0.6",
@@ -115,10 +119,14 @@
     "supports-color": "^8.1.1"
   },
   "peerDependencies": {
+    "@babel/core": "^7.18.5",
     "rollup": ">=3.2.0",
     "webpack": ">=5.1.0"
   },
   "peerDependenciesMeta": {
+    "@babel/core": {
+      "optional": true
+    },
     "rollup": {
       "optional": true
     },
@@ -127,6 +135,7 @@
     }
   },
   "devDependencies": {
+    "@babel/core": "^7.18.5",
     "@babel/preset-react": "^7.23.3",
     "@types/babel__core": "^7.20.5",
     "@types/node": "^18.6.3",
diff --git a/packages/bundler-plugins/rollup.npm.config.mjs b/packages/bundler-plugins/rollup.npm.config.mjs
index fe1cb44cbe76..65f39a6a8d22 100644
--- a/packages/bundler-plugins/rollup.npm.config.mjs
+++ b/packages/bundler-plugins/rollup.npm.config.mjs
@@ -4,6 +4,7 @@ export default makeNPMConfigVariants(
   makeBaseNPMConfig({
     entrypoints: [
       'src/core/index.ts',
+      'src/loader-utils/index.ts',
       'src/rollup/index.ts',
       'src/vite/index.ts',
       'src/esbuild/index.ts',
diff --git a/packages/bundler-plugins/src/core/component-annotate-hooks.ts b/packages/bundler-plugins/src/core/component-annotate-hooks.ts
new file mode 100644
index 000000000000..00898f9942cc
--- /dev/null
+++ b/packages/bundler-plugins/src/core/component-annotate-hooks.ts
@@ -0,0 +1,43 @@
+import { createOxcComponentNameAnnotateHooks, getOxcParseAstAsync } from './component-annotation-oxc';
+import type { ComponentAnnotationTransformMeta, ParseAstAsync } from './component-annotation-oxc-ast';
+import type { Logger } from './logger';
+
+const PARSER_UNAVAILABLE_MESSAGE =
+  'Could not load `oxc-parser` for this platform. React components will not be annotated.';
+
+// Module level, because the Turbopack loader creates new hooks for
+// every file.
+let warnedParserUnavailable = false;
+
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+export function createComponentNameAnnotateHooks(
+  ignoredComponents: string[],
+  injectIntoHtml: boolean,
+  options: { getParseAstAsync?: () => Promise<ParseAstAsync | null>; logger?: Logger } = {},
+) {
+  const hooks = createOxcComponentNameAnnotateHooks(
+    ignoredComponents,
+    async () => {
+      const parseAstAsync = (await options.getParseAstAsync?.()) ?? (await getOxcParseAstAsync());
+
+      if (!parseAstAsync && !warnedParserUnavailable) {
+        warnedParserUnavailable = true;
+        if (options.logger) {
+          options.logger.warn(PARSER_UNAVAILABLE_MESSAGE);
+        } else {
+          // eslint-disable-next-line no-console
+          console.warn(`[@sentry/bundler-plugins] ${PARSER_UNAVAILABLE_MESSAGE}`);
+        }
+      }
+
+      return parseAstAsync;
+    },
+    injectIntoHtml,
+  );
+
+  return {
+    transform(this: void, code: string, id: string, meta?: ComponentAnnotationTransformMeta) {
+      return hooks.transform(code, id, meta);
+    },
+  };
+}
diff --git a/packages/bundler-plugins/src/core/component-annotation-oxc-ast.ts b/packages/bundler-plugins/src/core/component-annotation-oxc-ast.ts
index e44234c7b1e0..d4bf47387ad7 100644
--- a/packages/bundler-plugins/src/core/component-annotation-oxc-ast.ts
+++ b/packages/bundler-plugins/src/core/component-annotation-oxc-ast.ts
@@ -59,13 +59,10 @@ export type ComponentAnnotationTransformMeta = {
   magicString?: MagicStringLike;
 };
 
-export type ComponentAnnotationTransformResult =
-  | {
-      code: string;
-      map?: SourceMap | string;
-    }
-  | null
-  | undefined;
+export type ComponentAnnotationTransformResult = {
+  code: string;
+  map?: SourceMap | string;
+} | null;
 
 export function isAstNode(value: unknown): value is AstNode {
   return isObjectLike(value) && typeof value.type === 'string';
diff --git a/packages/bundler-plugins/src/core/component-annotation-oxc-jsx.ts b/packages/bundler-plugins/src/core/component-annotation-oxc-jsx.ts
index 78fd40d99ae6..5e5c2cd4c638 100644
--- a/packages/bundler-plugins/src/core/component-annotation-oxc-jsx.ts
+++ b/packages/bundler-plugins/src/core/component-annotation-oxc-jsx.ts
@@ -16,6 +16,28 @@ import type {
 import { isAstNode, isObjectLike } from './component-annotation-oxc-ast';
 
 const UNKNOWN_ELEMENT_NAME = 'unknown';
+const REACT_NATIVE_ELEMENTS = new Set([
+  'Image',
+  'Text',
+  'View',
+  'ScrollView',
+  'TextInput',
+  'TouchableOpacity',
+  'TouchableHighlight',
+  'TouchableWithoutFeedback',
+  'FlatList',
+  'SectionList',
+  'ActivityIndicator',
+  'Button',
+  'Switch',
+  'Modal',
+  'SafeAreaView',
+  'StatusBar',
+  'KeyboardAvoidingView',
+  'RefreshControl',
+  'Picker',
+  'Slider',
+]);
 const WEB_ATTRIBUTE_NAMES = [WEB_ELEMENT_NAME, WEB_COMPONENT_NAME, WEB_SOURCE_FILE_NAME] as const;
 const WEB_ATTRIBUTE_NAME_SET = new Set<string>(WEB_ATTRIBUTE_NAMES);
 
@@ -140,20 +162,79 @@ export function addPendingAttributes(
     return;
   }
 
-  const insertion =
-    pendingInsertion ??
-    insertionsByOffset
-      .set(offset, {
-        offset,
-        attributeValues: new Map(),
-      })
-      .get(offset);
+  const insertion = getOrCreateInsertion(insertionsByOffset, offset);
 
   for (const [name, value] of attributes) {
-    insertion?.attributeValues.set(name, value);
+    insertion.attributeValues.set(name, value);
   }
 }
 
+/**
+ * Returns `true` when the element is an HTML element, because HTML mode only
+ * annotates the first HTML elements below a component root.
+ */
+export function addPendingHtmlAttribute(
+  code: string,
+  openingElement: JSXOpeningElementNode,
+  componentName: string,
+  ignoredComponents: string[],
+  fragmentContext: FragmentContext,
+  insertionsByOffset: Map<number, PendingInsertion>,
+): boolean {
+  if (isReactFragment(openingElement, fragmentContext)) {
+    return false;
+  }
+
+  const elementName = getJSXName(openingElement.name);
+
+  if (!isHtmlElement(elementName)) {
+    return false;
+  }
+
+  if (ignoredComponents.includes(componentName) || ignoredComponents.includes(elementName)) {
+    return true;
+  }
+
+  const offset = getInsertionOffset(code, openingElement);
+  if (offset === null) {
+    return true;
+  }
+
+  if (
+    getExistingAttributeNames(openingElement).has(WEB_COMPONENT_NAME) ||
+    insertionsByOffset.get(offset)?.attributeValues.has(WEB_COMPONENT_NAME)
+  ) {
+    return true;
+  }
+
+  getOrCreateInsertion(insertionsByOffset, offset).attributeValues.set(WEB_COMPONENT_NAME, componentName);
+
+  return true;
+}
+
+function isHtmlElement(elementName: string): boolean {
+  if (elementName === UNKNOWN_ELEMENT_NAME) {
+    return false;
+  }
+
+  if (elementName.charAt(0) === elementName.charAt(0).toLowerCase()) {
+    return true;
+  }
+
+  return REACT_NATIVE_ELEMENTS.has(elementName);
+}
+
+function getOrCreateInsertion(insertionsByOffset: Map<number, PendingInsertion>, offset: number): PendingInsertion {
+  let insertion = insertionsByOffset.get(offset);
+
+  if (!insertion) {
+    insertion = { offset, attributeValues: new Map() };
+    insertionsByOffset.set(offset, insertion);
+  }
+
+  return insertion;
+}
+
 export function toAttributeInsertions(insertionsByOffset: Map<number, PendingInsertion>): AttributeInsertion[] {
   return [...insertionsByOffset.values()].map(({ offset, attributeValues }) => ({
     offset,
@@ -181,7 +262,8 @@ function getOrderedAttributes(attributeValues: ReadonlyMap<string, string>): Com
 
   for (const name of WEB_ATTRIBUTE_NAMES) {
     const value = attributeValues.get(name);
-    if (value) {
+    // HTML mode writes an empty component name for anonymous classes.
+    if (value !== undefined) {
       attributes.push([name, value]);
     }
   }
diff --git a/packages/bundler-plugins/src/core/component-annotation-oxc-walk.ts b/packages/bundler-plugins/src/core/component-annotation-oxc-walk.ts
index 7425d145dd4e..9386b0489fda 100644
--- a/packages/bundler-plugins/src/core/component-annotation-oxc-walk.ts
+++ b/packages/bundler-plugins/src/core/component-annotation-oxc-walk.ts
@@ -1,6 +1,7 @@
 import type { AstNode, AttributeInsertion, FragmentContext, JSXRootNode } from './component-annotation-oxc-ast';
 import {
   addPendingAttributes,
+  addPendingHtmlAttribute,
   getStringName,
   isJSXElement,
   isJSXRoot,
@@ -16,6 +17,7 @@ export function collectOxcComponentAnnotationInsertions(
   ast: AstNode,
   ignoredComponents: string[],
   sourceFileName: string,
+  injectIntoHtml: boolean,
 ): AttributeInsertion[] {
   const fragmentContext = collectFragmentContext(ast);
   const components = collectComponentJSXRoots(ast);
@@ -23,13 +25,46 @@ export function collectOxcComponentAnnotationInsertions(
 
   for (const component of components) {
     for (const root of component.roots) {
-      processJSX(code, root, component.name, ignoredComponents, fragmentContext, sourceFileName, insertionsByOffset);
+      if (injectIntoHtml) {
+        processHtmlJSX(code, root, component.name, ignoredComponents, fragmentContext, insertionsByOffset);
+      } else {
+        processJSX(code, root, component.name, ignoredComponents, fragmentContext, sourceFileName, insertionsByOffset);
+      }
     }
   }
 
   return toAttributeInsertions(insertionsByOffset);
 }
 
+function processHtmlJSX(
+  code: string,
+  node: JSXRootNode,
+  componentName: string,
+  ignoredComponents: string[],
+  fragmentContext: FragmentContext,
+  insertionsByOffset: Map<number, { offset: number; attributeValues: Map<string, string> }>,
+): void {
+  if (
+    isJSXElement(node) &&
+    addPendingHtmlAttribute(
+      code,
+      node.openingElement,
+      componentName,
+      ignoredComponents,
+      fragmentContext,
+      insertionsByOffset,
+    )
+  ) {
+    return;
+  }
+
+  for (const child of node.children ?? []) {
+    if (isJSXRoot(child)) {
+      processHtmlJSX(code, child, componentName, ignoredComponents, fragmentContext, insertionsByOffset);
+    }
+  }
+}
+
 function getJSXRootsFromReturnArgument(argument: unknown): JSXRootNode[] {
   if (isJSXRoot(argument)) {
     return [argument];
diff --git a/packages/bundler-plugins/src/core/component-annotation-oxc.ts b/packages/bundler-plugins/src/core/component-annotation-oxc.ts
index 8bb27f8a7963..3efa49e929a4 100644
--- a/packages/bundler-plugins/src/core/component-annotation-oxc.ts
+++ b/packages/bundler-plugins/src/core/component-annotation-oxc.ts
@@ -43,7 +43,7 @@ export function getOxcParseAstAsync(): Promise<ParseAstAsync | null> {
   return oxcParseAstAsyncPromise;
 }
 
-// Keep this as a superset of JSX tag starts Babel can annotate, because a miss suppresses Babel fallback.
+// Keep this as a superset of all JSX tag starts, because a miss skips the file.
 const JSX_TAG_START_REGEXP = /<[$_\p{ID_Start}][$_\u200c\u200d\p{ID_Continue}.:-]*|<>/u;
 const JSX_FILE_REGEXP = /\.[jt]sx$/;
 
@@ -98,30 +98,18 @@ function getMagicString(
 
 async function annotateWithOxcParser(
   code: string,
-  id: string,
+  idWithoutQueryAndHash: string,
   ignoredComponents: string[],
   parseAstAsync: ParseAstAsync,
+  injectIntoHtml: boolean,
   meta?: ComponentAnnotationTransformMeta,
 ): Promise<ComponentAnnotationTransformResult> {
-  const idWithoutQueryAndHash = stripQueryAndHashFromPath(id);
-
-  if (
-    !idWithoutQueryAndHash ||
-    !isAnnotationFile(idWithoutQueryAndHash) ||
-    !shouldTryParse(code) ||
-    shouldSkipIncompatibleFile(idWithoutQueryAndHash)
-  ) {
-    return null;
-  }
-
   const ast = await parseAstAsync(code, {
     lang: idWithoutQueryAndHash.endsWith('.jsx') ? 'jsx' : 'tsx',
   });
 
-  // Fall through to the Babel fallback (return undefined, not null) when the parser yields an
-  // unexpected result, mirroring the catch path — null would suppress Babel and drop annotations.
   if (!isAstNode(ast)) {
-    return undefined;
+    return null;
   }
 
   const insertions = collectOxcComponentAnnotationInsertions(
@@ -129,6 +117,7 @@ async function annotateWithOxcParser(
     ast,
     ignoredComponents,
     path.basename(idWithoutQueryAndHash),
+    injectIntoHtml,
   );
 
   if (insertions.length === 0) {
@@ -147,8 +136,9 @@ async function annotateWithOxcParser(
 
   return {
     code: magicString.toString(),
+    // No `file`, because magic-string would then make `source` relative to it
+    // and drop the directory from `sources`.
     map: magicString.generateMap?.({
-      file: id,
       source: idWithoutQueryAndHash,
       includeContent: true,
       hires: true,
@@ -159,6 +149,7 @@ async function annotateWithOxcParser(
 export function createOxcComponentNameAnnotateHooks(
   ignoredComponents: string[],
   getParseAstAsync: () => Promise<ParseAstAsync | null>,
+  injectIntoHtml = false,
 ): {
   transform(
     code: string,
@@ -168,16 +159,35 @@ export function createOxcComponentNameAnnotateHooks(
 } {
   return {
     async transform(code, id, meta) {
+      const idWithoutQueryAndHash = stripQueryAndHashFromPath(id);
+
+      if (
+        !idWithoutQueryAndHash ||
+        !isAnnotationFile(idWithoutQueryAndHash) ||
+        !shouldTryParse(code) ||
+        shouldSkipIncompatibleFile(idWithoutQueryAndHash)
+      ) {
+        return null;
+      }
+
       try {
         const parseAstAsync = await getParseAstAsync();
 
         if (!parseAstAsync) {
-          return undefined;
+          return null;
         }
 
-        return await annotateWithOxcParser(code, id, ignoredComponents, parseAstAsync, meta);
+        return await annotateWithOxcParser(
+          code,
+          idWithoutQueryAndHash,
+          ignoredComponents,
+          parseAstAsync,
+          injectIntoHtml,
+          meta,
+        );
       } catch {
-        return undefined;
+        // Leave files the parser cannot read unchanged. The bundler reports the syntax error.
+        return null;
       }
     },
   };
diff --git a/packages/bundler-plugins/src/core/index.ts b/packages/bundler-plugins/src/core/index.ts
index 9c5008bf8587..fd645190fb51 100644
--- a/packages/bundler-plugins/src/core/index.ts
+++ b/packages/bundler-plugins/src/core/index.ts
@@ -1,34 +1,4 @@
-import { debug } from '@sentry/core';
 import { CodeInjection, containsOnlyImports, stripQueryAndHashFromPath } from './utils';
-import type { transformAsync as babelTransformAsync } from '@babel/core';
-import type componentNameAnnotatePlugin from '../babel-plugin';
-import type { experimentalComponentNameAnnotatePlugin } from '../babel-plugin';
-
-type BabelTransformAsync = typeof babelTransformAsync;
-type BabelParserPlugins = NonNullable<NonNullable<Parameters<BabelTransformAsync>[1]>['parserOpts']>['plugins'];
-type BabelAnnotationRuntime = {
-  transformAsync: BabelTransformAsync;
-  componentNameAnnotatePlugin: typeof componentNameAnnotatePlugin;
-  experimentalComponentNameAnnotatePlugin: typeof experimentalComponentNameAnnotatePlugin;
-};
-
-let babelAnnotationRuntimePromise: Promise<BabelAnnotationRuntime> | undefined;
-
-function loadBabelAnnotationRuntime(): Promise<BabelAnnotationRuntime> {
-  if (!babelAnnotationRuntimePromise) {
-    babelAnnotationRuntimePromise = Promise.all([import('@babel/core'), import('../babel-plugin')]).then(
-      ([babel, babelPlugin]) => {
-        return {
-          transformAsync: babel.transformAsync,
-          componentNameAnnotatePlugin: babelPlugin.default,
-          experimentalComponentNameAnnotatePlugin: babelPlugin.experimentalComponentNameAnnotatePlugin,
-        };
-      },
-    );
-  }
-
-  return babelAnnotationRuntimePromise;
-}
 
 /**
  * Checks if a file is a JavaScript file based on its extension.
@@ -70,61 +40,7 @@ export function shouldSkipCodeInjection(code: string, facadeModuleId: string | n
 export { globFiles } from './glob';
 export { getCodeInjectionPosition } from './get-code-injection-position';
 
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-export function createComponentNameAnnotateHooks(ignoredComponents: string[], injectIntoHtml: boolean) {
-  return {
-    async transform(this: void, code: string, id: string) {
-      // id may contain query and hash which will trip up our file extension logic below
-      const idWithoutQueryAndHash = stripQueryAndHashFromPath(id);
-
-      if (idWithoutQueryAndHash.match(/\\node_modules\\|\/node_modules\//)) {
-        return null;
-      }
-
-      // We will only apply this plugin on jsx and tsx files
-      if (!['.jsx', '.tsx'].some(ending => idWithoutQueryAndHash.endsWith(ending))) {
-        return null;
-      }
-
-      const parserPlugins: BabelParserPlugins = [];
-      if (idWithoutQueryAndHash.endsWith('.jsx')) {
-        parserPlugins.push('jsx');
-      } else if (idWithoutQueryAndHash.endsWith('.tsx')) {
-        parserPlugins.push('jsx', 'typescript');
-      }
-
-      const { transformAsync, componentNameAnnotatePlugin, experimentalComponentNameAnnotatePlugin } =
-        await loadBabelAnnotationRuntime();
-      const plugin = injectIntoHtml ? experimentalComponentNameAnnotatePlugin : componentNameAnnotatePlugin;
-
-      try {
-        const result = await transformAsync(code, {
-          plugins: [[plugin, { ignoredComponents }]],
-          filename: id,
-          sourceFileName: idWithoutQueryAndHash,
-          parserOpts: {
-            sourceType: 'module',
-            allowAwaitOutsideFunction: true,
-            plugins: parserPlugins,
-          },
-          generatorOpts: {
-            decoratorsBeforeExport: true,
-          },
-          sourceMaps: true,
-        });
-
-        return {
-          code: result?.code ?? code,
-          map: result?.map,
-        };
-      } catch (e) {
-        debug.error(`Failed to apply react annotate plugin`, e);
-      }
-
-      return { code };
-    },
-  };
-}
+export { createComponentNameAnnotateHooks } from './component-annotate-hooks';
 
 export function getDebugIdSnippet(debugId: string): CodeInjection {
   return new CodeInjection(
diff --git a/packages/bundler-plugins/src/loader-utils/index.ts b/packages/bundler-plugins/src/loader-utils/index.ts
new file mode 100644
index 000000000000..96fe7cd50bf0
--- /dev/null
+++ b/packages/bundler-plugins/src/loader-utils/index.ts
@@ -0,0 +1,4 @@
+// Internal to Sentry SDKs, not public API. Kept separate from `./core` so bundler loaders
+// don't pull in the build plugin manager and the `sentry` CLI.
+export { getCodeInjectionPosition } from '../core/get-code-injection-position';
+export { createComponentNameAnnotateHooks } from '../core/component-annotate-hooks';
diff --git a/packages/bundler-plugins/src/rollup/index.ts b/packages/bundler-plugins/src/rollup/index.ts
index 9b41176701d9..d9bbb517daad 100644
--- a/packages/bundler-plugins/src/rollup/index.ts
+++ b/packages/bundler-plugins/src/rollup/index.ts
@@ -15,10 +15,7 @@ import {
   stampDebugId,
   getCodeInjectionPosition,
 } from '../core';
-import type {
-  ComponentAnnotationTransformMeta,
-  ComponentAnnotationTransformResult,
-} from '../core/component-annotation-oxc';
+import type { ComponentAnnotationTransformMeta } from '../core/component-annotation-oxc';
 import type { SourceMap } from 'magic-string';
 import MagicString from 'magic-string';
 import * as path from 'node:path';
@@ -41,13 +38,6 @@ type ViteModule = {
 };
 
 type ViteParseAstAsync = NonNullable<ViteModule['parseAstAsync']>;
-type FastAnnotationHooks = {
-  transform(
-    code: string,
-    id: string,
-    meta?: ComponentAnnotationTransformMeta,
-  ): Promise<ComponentAnnotationTransformResult>;
-};
 
 let viteParseAstAsyncPromise: Promise<ViteParseAstAsync | null> | undefined;
 
@@ -166,33 +156,13 @@ export function _rollupPluginInternal(
     ? createComponentNameAnnotateHooks(
         options.reactComponentAnnotation?.ignoredComponents || [],
         !!options.reactComponentAnnotation?._experimentalInjectIntoHtml,
+        {
+          // Vite 8 already loads an oxc-based parser, so reuse it.
+          getParseAstAsync: buildTool === 'vite' && buildToolMajorVersion === '8' ? getViteParseAstAsync : undefined,
+          logger,
+        },
       )
     : undefined;
-  const transformFastAnnotations =
-    options.reactComponentAnnotation?.enabled && !options.reactComponentAnnotation?._experimentalInjectIntoHtml
-      ? (() => {
-          let fastAnnotationHooksPromise: Promise<FastAnnotationHooks> | undefined;
-
-          return {
-            transform(code: string, id: string, meta?: ComponentAnnotationTransformMeta) {
-              if (!fastAnnotationHooksPromise) {
-                fastAnnotationHooksPromise = import('../core/component-annotation-oxc').then(
-                  ({ createOxcComponentNameAnnotateHooks, getOxcParseAstAsync }) =>
-                    createOxcComponentNameAnnotateHooks(
-                      options.reactComponentAnnotation?.ignoredComponents || [],
-                      // Vite 8 already loads an oxc-based parser, so reuse it.
-                      buildTool === 'vite' && buildToolMajorVersion === '8'
-                        ? getViteParseAstAsync
-                        : getOxcParseAstAsync,
-                    ),
-                );
-              }
-
-              return fastAnnotationHooksPromise.then(hooks => hooks.transform(code, id, meta));
-            },
-          };
-        })()
-      : undefined;
 
   const transformReplace = Object.keys(replacementValues).length > 0;
   const shouldTransform = transformAnnotations || transformReplace;
@@ -210,21 +180,8 @@ export function _rollupPluginInternal(
   ): Promise<TransformResult> {
     // Component annotations are only in user code and boolean flag replacements are
     // only in Sentry code. If we successfully add annotations, we can return early.
-    let shouldRunBabelAnnotations = true;
-
-    if (transformFastAnnotations?.transform) {
-      const result = await transformFastAnnotations.transform(code, id, meta);
-      if (result) {
-        return result;
-      }
-
-      if (result === null) {
-        shouldRunBabelAnnotations = false;
-      }
-    }
-
-    if (shouldRunBabelAnnotations && transformAnnotations?.transform) {
-      const result = await transformAnnotations.transform(code, id);
+    if (transformAnnotations) {
+      const result = await transformAnnotations.transform(code, id, meta);
       if (result) {
         return result;
       }
diff --git a/packages/bundler-plugins/src/webpack/index.ts b/packages/bundler-plugins/src/webpack/index.ts
index 2adcd4ddc0b6..a86f81894821 100644
--- a/packages/bundler-plugins/src/webpack/index.ts
+++ b/packages/bundler-plugins/src/webpack/index.ts
@@ -223,6 +223,7 @@ function createSentryWebpackPlugin(userOptions: SentryWebpackPluginOptions = {})
     ? createComponentNameAnnotateHooks(
         options.reactComponentAnnotation?.ignoredComponents || [],
         !!options.reactComponentAnnotation?._experimentalInjectIntoHtml,
+        { logger },
       )
     : undefined;
 
diff --git a/packages/bundler-plugins/test/core/component-annotation-oxc.test.ts b/packages/bundler-plugins/test/core/component-annotation-oxc.test.ts
index 2529460dfa3f..c2c57bd07799 100644
--- a/packages/bundler-plugins/test/core/component-annotation-oxc.test.ts
+++ b/packages/bundler-plugins/test/core/component-annotation-oxc.test.ts
@@ -3,7 +3,7 @@ import { parse } from '@babel/parser';
 import MagicString from 'magic-string';
 import { describe, expect, it, vi } from 'vitest';
 
-import componentNameAnnotatePlugin from '../../src/babel-plugin';
+import componentNameAnnotatePlugin, { experimentalComponentNameAnnotatePlugin } from '../../src/babel-plugin';
 import {
   createOxcComponentNameAnnotateHooks,
   getOxcParseAstAsync,
@@ -61,12 +61,18 @@ function collectAnnotations(code: string, id: string): Annotation[] {
   return annotations;
 }
 
-async function annotateWithBabel(code: string, id: string, ignoredComponents: string[]): Promise<Annotation[]> {
+async function annotateWithBabel(
+  code: string,
+  id: string,
+  ignoredComponents: string[],
+  injectIntoHtml = false,
+): Promise<Annotation[]> {
+  const plugin = injectIntoHtml ? experimentalComponentNameAnnotatePlugin : componentNameAnnotatePlugin;
   const result = await transformAsync(code, {
     filename: id,
     configFile: false,
     babelrc: false,
-    plugins: [[componentNameAnnotatePlugin, { ignoredComponents }]],
+    plugins: [[plugin, { ignoredComponents }]],
     parserOpts: {
       sourceType: 'module',
       allowAwaitOutsideFunction: true,
@@ -87,8 +93,9 @@ async function annotateWithOxc(
   id: string,
   ignoredComponents: string[] = [],
   getParseAstAsync: () => Promise<ParseAstAsync | null> = async () => parseAstAsync,
+  injectIntoHtml = false,
 ): Promise<ComponentAnnotationTransformResult> {
-  const hooks = createOxcComponentNameAnnotateHooks(ignoredComponents, getParseAstAsync);
+  const hooks = createOxcComponentNameAnnotateHooks(ignoredComponents, getParseAstAsync, injectIntoHtml);
 
   return hooks.transform(code, id);
 }
@@ -304,6 +311,178 @@ export const List = <T,>(props: Props<T>) => {
       },
     ]);
   });
+
+  it.each([
+    [
+      'HTML roots',
+      '/src/html-root.jsx',
+      `export default function App() {
+  return (
+    <div>
+      <span>nested html</span>
+      <CustomCard />
+    </div>
+  );
+}`,
+      [],
+    ],
+    [
+      'component wrappers',
+      '/src/wrappers.jsx',
+      `const Page = () => (
+  <Layout.Root>
+    <Layout.Body>
+      <main>content</main>
+      <aside />
+    </Layout.Body>
+  </Layout.Root>
+);
+
+export default Page;`,
+      [],
+    ],
+    [
+      'fragment roots and aliases',
+      '/src/fragments.jsx',
+      `import React, { Fragment as ImportedFragment } from "react";
+
+export function FragmentComponent() {
+  return (
+    <>
+      <ImportedFragment>
+        <section />
+      </ImportedFragment>
+      <React.Fragment>
+        <p />
+      </React.Fragment>
+    </>
+  );
+}`,
+      [],
+    ],
+    [
+      'conditional returns',
+      '/src/conditional.jsx',
+      `export function ConditionalComponent({ maybeTrue }) {
+  return maybeTrue ? <div /> : <Wrapper><span /></Wrapper>;
+}`,
+      [],
+    ],
+    [
+      'class render methods with nested render helpers',
+      '/src/class-nested-helper.jsx',
+      `import React, { Component } from "react";
+
+export class ClassComponent extends Component {
+  render() {
+    const Helper = () => {
+      return <em />;
+    };
+
+    return <section>{Helper()}</section>;
+  }
+}`,
+      [],
+    ],
+    [
+      'anonymous default classes',
+      '/src/anonymous-class.jsx',
+      `import React from "react";
+
+export default class extends React.Component {
+  render() {
+    return <div />;
+  }
+}`,
+      [],
+    ],
+    [
+      'ignored component and element names',
+      '/src/ignored.jsx',
+      `export function IgnoredComponent() {
+  return <div />;
+}
+
+export function Navigation() {
+  return (
+    <Wrapper>
+      <nav>
+        <a />
+      </nav>
+    </Wrapper>
+  );
+}
+
+export function Header() {
+  return <header />;
+}`,
+      ['IgnoredComponent', 'nav'],
+    ],
+    [
+      'existing component attributes',
+      '/src/existing.jsx',
+      `export function Existing() {
+  return <div data-sentry-component="Custom" />;
+}
+
+export function Fresh() {
+  return <div />;
+}`,
+      [],
+    ],
+    [
+      'lowercase member expressions and identifiers',
+      '/src/lowercase.jsx',
+      `export const Motion = () => (
+  <motion.div>
+    <span />
+  </motion.div>
+);
+
+export const Underscore = () => <_foo />;
+
+export const Dollar = () => <$Foo />;`,
+      [],
+    ],
+    [
+      'React Native elements',
+      '/src/native.jsx',
+      `export const Native = () => (
+  <View>
+    <Text>hello</Text>
+  </View>
+);
+
+export const Card = () => (
+  <CardContainer>
+    <Image />
+  </CardContainer>
+);`,
+      [],
+    ],
+    [
+      'tsx files with TypeScript expressions',
+      '/src/typed.tsx',
+      `type Props<T> = { items?: T[] };
+
+export const List = <T,>(props: Props<T>) => {
+  const items = props.items!;
+  return (
+    <Table<T> rows={items as unknown[]}>
+      <tr />
+    </Table>
+  );
+};`,
+      [],
+    ],
+  ])('matches Babel HTML injection annotations for %s', async (_name, id, code, ignoredComponents) => {
+    const oxcResult = await annotateWithOxc(code, id, ignoredComponents, getParseAstAsync, true);
+
+    expect(oxcResult).toBeTruthy();
+    expect(collectAnnotations(oxcResult?.code.toString() ?? '', id)).toEqual(
+      await annotateWithBabel(code, id, ignoredComponents, true),
+    );
+  });
 });
 
 describe('createOxcComponentNameAnnotateHooks', () => {
@@ -321,25 +500,31 @@ describe('createOxcComponentNameAnnotateHooks', () => {
     expect(result?.code.toString()).toContain(`data-sentry-component="App"`);
   });
 
-  it('returns null without parsing when the file cannot contain annotations', async () => {
-    const parse = vi.fn(parseAstAsync);
-    const hooks = createOxcComponentNameAnnotateHooks([], async () => parse);
+  it('returns null without loading a parser when the file cannot contain annotations', async () => {
+    const getParseAstAsync = vi.fn(async () => parseAstAsync);
+    const hooks = createOxcComponentNameAnnotateHooks([], getParseAstAsync);
 
     await expect(hooks.transform('const value = 1;', '/src/app.js')).resolves.toBeNull();
-    expect(parse).not.toHaveBeenCalled();
+    expect(getParseAstAsync).not.toHaveBeenCalled();
+  });
+
+  it('returns null when the parser cannot be loaded', async () => {
+    const hooks = createOxcComponentNameAnnotateHooks([], async () => null);
+
+    await expect(hooks.transform('export const App = () => <Custom />;', '/src/app.jsx')).resolves.toBeNull();
   });
 
-  it('returns undefined when parsing fails so callers can fall back to Babel', async () => {
+  it('returns null when parsing fails', async () => {
     const hooks = createOxcComponentNameAnnotateHooks([], async () => {
       throw new Error('parser unavailable');
     });
 
-    await expect(hooks.transform('export const App = () => <Custom />;', '/src/app.jsx')).resolves.toBeUndefined();
+    await expect(hooks.transform('export const App = () => <Custom />;', '/src/app.jsx')).resolves.toBeNull();
   });
 
-  it('returns undefined when oxc-parser reports a syntax error so callers can fall back to Babel', async () => {
+  it('returns null when oxc-parser reports a syntax error', async () => {
     const hooks = createOxcComponentNameAnnotateHooks([], getOxcParseAstAsync);
 
-    await expect(hooks.transform('export const App = () => <Custom>;', '/src/app.tsx')).resolves.toBeUndefined();
+    await expect(hooks.transform('export const App = () => <Custom>;', '/src/app.tsx')).resolves.toBeNull();
   });
 });
diff --git a/packages/bundler-plugins/test/core/component-annotation-parser-unavailable.test.ts b/packages/bundler-plugins/test/core/component-annotation-parser-unavailable.test.ts
new file mode 100644
index 000000000000..fc60b926ddf9
--- /dev/null
+++ b/packages/bundler-plugins/test/core/component-annotation-parser-unavailable.test.ts
@@ -0,0 +1,47 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type * as ComponentAnnotation from '../../src/core/component-annotation-oxc';
+
+vi.mock('../../src/core/component-annotation-oxc', async importOriginal => {
+  return {
+    ...(await importOriginal<typeof ComponentAnnotation>()),
+    getOxcParseAstAsync: vi.fn(async () => null),
+  };
+});
+
+const MESSAGE = 'Could not load `oxc-parser` for this platform. React components will not be annotated.';
+
+describe('createComponentNameAnnotateHooks without a parser', () => {
+  beforeEach(() => {
+    vi.resetModules();
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  it('leaves files unchanged and warns once through the logger', async () => {
+    const { createComponentNameAnnotateHooks } = await import('../../src/core');
+    const logger = { info: vi.fn(), warn: vi.fn(), error: vi.fn(), debug: vi.fn() };
+    const { transform } = createComponentNameAnnotateHooks([], false, { logger });
+
+    await expect(transform('export const App = () => <div />;', '/src/app.jsx')).resolves.toBeNull();
+    await expect(transform('export const Other = () => <span />;', '/src/other.jsx')).resolves.toBeNull();
+
+    expect(logger.warn).toHaveBeenCalledTimes(1);
+    expect(logger.warn).toHaveBeenCalledWith(MESSAGE);
+  });
+
+  it('warns once through the console across hooks created without a logger', async () => {
+    const { createComponentNameAnnotateHooks } = await import('../../src/core');
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+    for (const id of ['/src/app.jsx', '/src/other.jsx']) {
+      const { transform } = createComponentNameAnnotateHooks([], false);
+      await expect(transform('export const App = () => <div />;', id)).resolves.toBeNull();
+    }
+
+    expect(warn).toHaveBeenCalledTimes(1);
+    expect(warn).toHaveBeenCalledWith(`[@sentry/bundler-plugins] ${MESSAGE}`);
+  });
+});
diff --git a/packages/bundler-plugins/test/core/index.test.ts b/packages/bundler-plugins/test/core/index.test.ts
index a3362759be60..ebbc4a26a8a8 100644
--- a/packages/bundler-plugins/test/core/index.test.ts
+++ b/packages/bundler-plugins/test/core/index.test.ts
@@ -1,6 +1,7 @@
 import { createComponentNameAnnotateHooks, getDebugIdSnippet } from '../../src/core';
+import { getOxcParseAstAsync } from '../../src/core/component-annotation-oxc';
 import { containsOnlyImports } from '../../src/core/utils';
-import { describe, it, expect } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
 
 describe('createComponentNameAnnotateHooks', () => {
   it.each([
@@ -12,7 +13,31 @@ describe('createComponentNameAnnotateHooks', () => {
 
     const result = await transform(code, id);
 
-    expect(result?.map?.sources).toEqual([id]);
+    expect(result?.map).toMatchObject({ sources: [id] });
+  });
+
+  it('uses the given parser', async () => {
+    const getParseAstAsync = vi.fn(getOxcParseAstAsync);
+    const { transform } = createComponentNameAnnotateHooks([], false, { getParseAstAsync });
+
+    const result = await transform('export const App = () => <div />;', '/src/app.jsx');
+
+    expect(getParseAstAsync).toHaveBeenCalled();
+    expect(result?.code).toContain('data-sentry-component="App"');
+  });
+
+  it('falls back to oxc-parser when the given parser is unavailable', async () => {
+    const { transform } = createComponentNameAnnotateHooks([], false, { getParseAstAsync: async () => null });
+
+    const result = await transform('export const App = () => <div />;', '/src/app.jsx');
+
+    expect(result?.code).toContain('data-sentry-component="App"');
+  });
+
+  it('leaves files with syntax errors unchanged', async () => {
+    const { transform } = createComponentNameAnnotateHooks([], false);
+
+    await expect(transform('export const App = () => <div>;', '/src/app.jsx')).resolves.toBeNull();
   });
 });
 
diff --git a/packages/bundler-plugins/test/loader-utils/index.test.ts b/packages/bundler-plugins/test/loader-utils/index.test.ts
new file mode 100644
index 000000000000..bcb61f5b992f
--- /dev/null
+++ b/packages/bundler-plugins/test/loader-utils/index.test.ts
@@ -0,0 +1,14 @@
+import { describe, expect, it, vi } from 'vitest';
+
+vi.mock('sentry', () => {
+  throw new Error('`loader-utils` must not import the `sentry` CLI');
+});
+
+describe('loader-utils', () => {
+  it('exports the loader helpers without loading the sentry CLI', async () => {
+    const loaderUtils = await import('../../src/loader-utils');
+
+    expect(loaderUtils.getCodeInjectionPosition).toBeInstanceOf(Function);
+    expect(loaderUtils.createComponentNameAnnotateHooks).toBeInstanceOf(Function);
+  });
+});
diff --git a/packages/bundler-plugins/test/rollup/public-api.test.ts b/packages/bundler-plugins/test/rollup/public-api.test.ts
index 2fec55901df9..53e5847cffe8 100644
--- a/packages/bundler-plugins/test/rollup/public-api.test.ts
+++ b/packages/bundler-plugins/test/rollup/public-api.test.ts
@@ -1,40 +1,21 @@
 import { _rollupPluginInternal, sentryRollupPlugin } from '../../src/rollup';
-import { createComponentNameAnnotateHooks } from '../../src/core';
 import type { Plugin, SourceMap } from 'rollup';
 import { runInNewContext } from 'node:vm';
+import type * as Core from '../../src/core';
 import { describe, it, expect, test, beforeEach, vi } from 'vitest';
 
-const {
-  babelCoreImportMock,
-  transformAsyncMock,
-  annotationTransformMock,
-  createOxcComponentNameAnnotateHooksMock,
-  getOxcParseAstAsyncMock,
-} = vi.hoisted(() => {
-  const annotationTransformMock = vi.fn(async () => ({ code: 'fast-path', map: null }));
-
+const { createComponentNameAnnotateHooksMock } = vi.hoisted(() => {
   return {
-    babelCoreImportMock: vi.fn(),
-    transformAsyncMock: vi.fn(async (code: string) => ({ code, map: null })),
-    annotationTransformMock,
-    createOxcComponentNameAnnotateHooksMock: vi.fn(() => ({
-      transform: annotationTransformMock,
+    createComponentNameAnnotateHooksMock: vi.fn(() => ({
+      transform: vi.fn(async () => ({ code: 'annotated', map: null })),
     })),
-    getOxcParseAstAsyncMock: vi.fn(),
-  };
-});
-
-vi.mock('@babel/core', () => {
-  babelCoreImportMock();
-  return {
-    transformAsync: transformAsyncMock,
   };
 });
 
-vi.mock('../../src/core/component-annotation-oxc', () => {
+vi.mock('../../src/core', async importOriginal => {
   return {
-    createOxcComponentNameAnnotateHooks: createOxcComponentNameAnnotateHooksMock,
-    getOxcParseAstAsync: getOxcParseAstAsyncMock,
+    ...(await importOriginal<typeof Core>()),
+    createComponentNameAnnotateHooks: createComponentNameAnnotateHooksMock,
   };
 });
 
@@ -53,22 +34,7 @@ test('Rollup plugin should exist', () => {
   expect(typeof sentryRollupPlugin).toBe('function');
 });
 
-test('component annotations only load Babel when the Babel transform runs', async () => {
-  expect(babelCoreImportMock).not.toHaveBeenCalled();
-
-  const hooks = createComponentNameAnnotateHooks([], false);
-
-  await hooks.transform('const x = 1;', '/src/plain.js');
-
-  expect(babelCoreImportMock).not.toHaveBeenCalled();
-
-  await hooks.transform('export function App() { return <div />; }', '/src/app.jsx');
-
-  expect(babelCoreImportMock).toHaveBeenCalledTimes(1);
-  expect(transformAsyncMock).toHaveBeenCalledTimes(1);
-});
-
-describe('annotation fast path', () => {
+describe('component annotation', () => {
   const code = 'export function App() { return <div />; }';
 
   beforeEach(() => {
@@ -78,46 +44,48 @@ describe('annotation fast path', () => {
   it.each<[string, 'rollup' | 'vite', string | undefined]>([
     ['Rollup', 'rollup', undefined],
     ['Vite 7', 'vite', '7'],
-  ])('uses the fast path with oxc-parser for %s', async (_name, buildTool, majorVersion) => {
+  ])('uses the default parser for %s', async (_name, buildTool, majorVersion) => {
     const plugin = _rollupPluginInternal(
       { release: { inject: false }, reactComponentAnnotation: { enabled: true } },
       buildTool,
       majorVersion,
     ) as Plugin;
 
-    await expect(runTransform(plugin, code, '/src/app.jsx')).resolves.toEqual({ code: 'fast-path', map: null });
+    await expect(runTransform(plugin, code, '/src/app.jsx')).resolves.toEqual({ code: 'annotated', map: null });
 
-    expect(createOxcComponentNameAnnotateHooksMock).toHaveBeenCalledWith([], getOxcParseAstAsyncMock);
-    expect(annotationTransformMock).toHaveBeenCalledTimes(1);
-    expect(transformAsyncMock).not.toHaveBeenCalled();
+    expect(createComponentNameAnnotateHooksMock).toHaveBeenCalledWith([], false, {
+      getParseAstAsync: undefined,
+      logger: expect.anything(),
+    });
   });
 
-  it("uses the fast path with Vite's parser for Vite 8", async () => {
+  it("uses Vite's parser for Vite 8", async () => {
     const plugin = _rollupPluginInternal(
       { release: { inject: false }, reactComponentAnnotation: { enabled: true } },
       'vite',
       '8',
     ) as Plugin;
 
-    await expect(runTransform(plugin, code, '/src/app.jsx')).resolves.toEqual({ code: 'fast-path', map: null });
+    await expect(runTransform(plugin, code, '/src/app.jsx')).resolves.toEqual({ code: 'annotated', map: null });
 
-    expect(createOxcComponentNameAnnotateHooksMock).toHaveBeenCalledWith([], expect.any(Function));
-    expect(createOxcComponentNameAnnotateHooksMock).not.toHaveBeenCalledWith([], getOxcParseAstAsyncMock);
-    expect(annotationTransformMock).toHaveBeenCalledTimes(1);
-    expect(transformAsyncMock).not.toHaveBeenCalled();
+    expect(createComponentNameAnnotateHooksMock).toHaveBeenCalledWith([], false, {
+      getParseAstAsync: expect.any(Function),
+      logger: expect.anything(),
+    });
   });
 
-  it('does not use the fast path when injecting into HTML', async () => {
+  it('passes the HTML injection option', async () => {
     const plugin = _rollupPluginInternal(
       { release: { inject: false }, reactComponentAnnotation: { enabled: true, _experimentalInjectIntoHtml: true } },
-      'vite',
-      '8',
+      'rollup',
     ) as Plugin;
 
     await runTransform(plugin, code, '/src/app.jsx');
 
-    expect(annotationTransformMock).not.toHaveBeenCalled();
-    expect(transformAsyncMock).toHaveBeenCalledTimes(1);
+    expect(createComponentNameAnnotateHooksMock).toHaveBeenCalledWith([], true, {
+      getParseAstAsync: undefined,
+      logger: expect.anything(),
+    });
   });
 });
 
diff --git a/packages/cloudflare/README.md b/packages/cloudflare/README.md
index 859c70567ac4..041324dc9d45 100644
--- a/packages/cloudflare/README.md
+++ b/packages/cloudflare/README.md
@@ -10,207 +10,15 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/cloudflare.svg)](https://www.npmjs.com/package/@sentry/cloudflare)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/cloudflare.svg)](https://www.npmjs.com/package/@sentry/cloudflare)
 
-## Links
+The official Sentry SDK for monitoring Cloudflare applications.
 
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+## Documentation
 
-## Install
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/cloudflare/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/cloudflare/configuration/)
+- [Cloudflare-specific features](https://docs.sentry.io/platforms/javascript/guides/cloudflare/features/)
 
-To get started, first install the `@sentry/cloudflare` package:
+## Support
 
-```bash
-npm install @sentry/cloudflare
-```
-
-Then set the `nodejs_compat` compatibility flag in your `wrangler.jsonc`/`wrangler.toml` config. This is because the SDK needs access to Node.js compatibility APIs to work correctly.
-
-```jsonc {tabTitle:JSON} {filename:wrangler.jsonc}
-{
-  "compatibility_flags": ["nodejs_compat"],
-}
-```
-
-```toml {tabTitle:Toml} {filename:wrangler.toml}
-compatibility_flags = ["nodejs_compat"]
-```
-
-## Setup (Cloudflare Pages)
-
-To use this SDK, add the `sentryPagesPlugin` as
-[middleware to your Cloudflare Pages application](https://developers.cloudflare.com/pages/functions/middleware/).
-
-We recommend adding a `functions/_middleware.js` for the middleware setup so that Sentry is initialized for your entire
-app.
-
-```javascript
-// functions/_middleware.js
-import * as Sentry from '@sentry/cloudflare';
-
-export const onRequest = Sentry.sentryPagesPlugin({
-  dsn: process.env.SENTRY_DSN,
-  // Set tracesSampleRate to 1.0 to capture 100% of spans for tracing.
-  tracesSampleRate: 1.0,
-});
-```
-
-If you need to to chain multiple middlewares, you can do so by exporting an array of middlewares. Make sure the Sentry
-middleware is the first one in the array.
-
-```javascript
-import * as Sentry from '@sentry/cloudflare';
-
-export const onRequest = [
-  // Make sure Sentry is the first middleware
-  Sentry.sentryPagesPlugin({
-    dsn: process.env.SENTRY_DSN,
-    tracesSampleRate: 1.0,
-  }),
-  // Add more middlewares here
-];
-```
-
-If you need to access the `context` object (for example to grab environmental variables), you can pass a function to
-`sentryPagesPlugin` that takes the `context` object as an argument and returns `init` options:
-
-```javascript
-export const onRequest = Sentry.sentryPagesPlugin(context => ({
-  dsn: context.env.SENTRY_DSN,
-  tracesSampleRate: 1.0,
-}));
-```
-
-If you do not have access to the `onRequest` middleware API, you can use the `wrapRequestHandler` API instead.
-
-Here is an example with SvelteKit:
-
-```javascript
-// hooks.server.js
-import * as Sentry from '@sentry/cloudflare';
-
-export const handle = ({ event, resolve }) => {
-  const requestHandlerOptions = {
-    options: {
-      dsn: event.platform.env.SENTRY_DSN,
-      tracesSampleRate: 1.0,
-    },
-    request: event.request,
-    context: event.platform.ctx,
-  };
-  return Sentry.wrapRequestHandler(requestHandlerOptions, () => resolve(event));
-};
-```
-
-## Setup (Cloudflare Workers)
-
-To use this SDK, wrap your handler with the `withSentry` function. This will initialize the SDK and hook into the
-environment. Note that you can turn off almost all side effects using the respective options.
-
-Currently only ESM handlers are supported.
-
-```javascript
-import * as Sentry from '@sentry/cloudflare';
-
-export default withSentry(
-  env => ({
-    dsn: env.SENTRY_DSN,
-    // Set tracesSampleRate to 1.0 to capture 100% of spans for tracing.
-    tracesSampleRate: 1.0,
-  }),
-  {
-    async fetch(request, env, ctx) {
-      return new Response('Hello World!');
-    },
-  } satisfies ExportedHandler<Env>,
-);
-```
-
-### Sourcemaps
-
-Configure uploading sourcemaps via the Sentry Wizard:
-
-```bash
-npx @sentry/wizard@latest -i sourcemaps
-```
-
-See more details in our [docs](https://docs.sentry.io/platforms/javascript/sourcemaps/).
-
-## Usage
-
-To set context information or send manual events, use the exported functions of `@sentry/cloudflare`. Note that these
-functions will require the usage of the Sentry helpers, either `withSentry` function for Cloudflare Workers or the
-`sentryPagesPlugin` middleware for Cloudflare Pages.
-
-```javascript
-import * as Sentry from '@sentry/cloudflare';
-
-// Set user information, as well as tags and further extras
-Sentry.setExtra('battery', 0.7);
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: 'My Breadcrumb',
-  // ...
-});
-
-// Capture exceptions, messages or manual events
-Sentry.captureMessage('Hello, world!');
-Sentry.captureException(new Error('Good bye'));
-Sentry.captureEvent({
-  message: 'Manual',
-  stacktrace: [
-    // ...
-  ],
-});
-```
-
-## Cloudflare D1 Instrumentation
-
-`withSentry()` automatically instruments all [Cloudflare D1](https://developers.cloudflare.com/d1/) bindings on `env`,
-Cloudflare's serverless SQL database. Just use the binding as usual:
-
-```javascript
-// env.DB is the D1 DB binding configured in your `wrangler.toml`
-await env.DB.prepare('SELECT * FROM table WHERE id = ?').bind(1).run();
-```
-
-## Cron Monitoring (Cloudflare Workers)
-
-[Sentry Crons](https://docs.sentry.io/product/crons/) allows you to monitor the uptime and performance of any scheduled,
-recurring job in your application.
-
-To instrument your cron triggers, use the `Sentry.withMonitor` API in your
-[`Scheduled` handler](https://developers.cloudflare.com/workers/runtime-apis/handlers/scheduled/).
-
-```js
-export default {
-  async scheduled(event, env, ctx) {
-    ctx.waitUntil(
-      Sentry.withMonitor('your-cron-name', () => {
-        return doSomeTaskOnASchedule();
-      }),
-    );
-  },
-};
-```
-
-You can also use supply a monitor config to upsert cron monitors with additional metadata:
-
-```js
-const monitorConfig = {
-  schedule: {
-    type: 'crontab',
-    value: '* * * * *',
-  },
-  checkinMargin: 2, // In minutes. Optional.
-  maxRuntime: 10, // In minutes. Optional.
-  timezone: 'America/Los_Angeles', // Optional.
-};
-
-export default {
-  async scheduled(event, env, ctx) {
-    Sentry.withMonitor('your-cron-name', () => doSomeTaskOnASchedule(), monitorConfig);
-  },
-};
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 916e836ef540..21ffbcc21ad4 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -53,7 +53,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/opentelemetry": "11.0.0",
     "@sentry/server-utils": "11.0.0",
diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
index acd492c06c15..2a6413cb2fdc 100644
--- a/packages/cloudflare/src/index.ts
+++ b/packages/cloudflare/src/index.ts
@@ -127,6 +127,7 @@ export {
   getOtlpTracesEndpoint,
   prismaIntegration,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/cloudflare/src/instrumentations/instrumentDurableObjectNamespace.ts b/packages/cloudflare/src/instrumentations/instrumentDurableObjectNamespace.ts
index cb3db118125a..3c61d730fb59 100644
--- a/packages/cloudflare/src/instrumentations/instrumentDurableObjectNamespace.ts
+++ b/packages/cloudflare/src/instrumentations/instrumentDurableObjectNamespace.ts
@@ -65,6 +65,10 @@ function instrumentDurableObjectStub(stub: DurableObjectStub, propagateRpcTrace:
         return instrumentFetcher((...args) => Reflect.apply(value, target, args));
       }
 
+      if (prop === 'connect' && typeof value === 'function') {
+        return (...args: unknown[]) => Reflect.apply(value, target, args);
+      }
+
       if (
         propagateRpcTrace &&
         typeof value === 'function' &&
diff --git a/packages/cloudflare/src/instrumentations/worker/instrumentEnv.ts b/packages/cloudflare/src/instrumentations/worker/instrumentEnv.ts
index 5f95320f657a..33b02b9bd74f 100644
--- a/packages/cloudflare/src/instrumentations/worker/instrumentEnv.ts
+++ b/packages/cloudflare/src/instrumentations/worker/instrumentEnv.ts
@@ -101,6 +101,10 @@ export function instrumentEnv<Env extends Record<string, unknown>>(env: Env, opt
               return instrumentFetcher((...args) => Reflect.apply(value, target, args));
             }
 
+            if (p === 'connect' && typeof value === 'function') {
+              return (...args: unknown[]) => Reflect.apply(value, target, args);
+            }
+
             if (
               propagateRpcTrace &&
               typeof value === 'function' &&
diff --git a/packages/cloudflare/src/request.ts b/packages/cloudflare/src/request.ts
index dadd4059fd5c..760398c38b73 100644
--- a/packages/cloudflare/src/request.ts
+++ b/packages/cloudflare/src/request.ts
@@ -20,3 +20,5 @@ export function wrapRequestHandler(
 ): Promise<Response> {
   return wrapRequestHandlerWithInit(wrapperOptions, handler, initBaseSdk);
 }
+
+export { httpServerIntegration } from './integrations/httpServer';
diff --git a/packages/cloudflare/src/vite/transform.ts b/packages/cloudflare/src/vite/transform.ts
index 5e06304ae6f8..1fdf647831c1 100644
--- a/packages/cloudflare/src/vite/transform.ts
+++ b/packages/cloudflare/src/vite/transform.ts
@@ -159,7 +159,7 @@ export function applyAutoInstrumentTransforms(
     needsImport: false,
     wrappedClasses: new Set<string>(),
     topLevelClasses,
-    renamedLocals: new Set<string>(),
+    wrappedLocals: new Map<string, string>(),
     classWrappers: ctx.classWrappers,
     agentClasses: ctx.agentClasses ?? new Set<string>(),
     workerEntrypointClasses: detectWorkerEntrypointClasses(ast),
@@ -217,10 +217,10 @@ interface TransformState {
    */
   topLevelClasses: Map<string, ClassDeclarationNode>;
   /**
-   * Local class names already renamed + wrapped, so two specifiers pointing at
-   * the same class don't produce duplicate bindings.
+   * Local class name → the binding holding its wrapper, so two exports of the same class share one
+   * wrapper and a default export of it can be re-pointed.
    */
-  renamedLocals: Set<string>;
+  wrappedLocals: Map<string, string>;
   /** Class name → wrapper kind, keyed by the *exported* name (from config). */
   classWrappers: Map<string, ClassWrapperKind>;
   /** Local class names detected as `agents` Agents (see {@link TransformContext.agentClasses}). */
@@ -348,11 +348,15 @@ function wrapDefaultExport(node: ExportDefaultNode, ctx: TransformContext, state
 
   // `export default Foo` where `Foo` is a local class already wrapped by a named
   // export (e.g. a self-bound WorkerEntrypoint also used as the default handler).
-  // Wrapping again would produce `withSentry(withSentry(...))`. The binding still
-  // points at the wrapped class, so the default export counts as auto-wrapped.
-  if (decl.type === 'Identifier' && state.renamedLocals.has((decl as IdentifierNode).name)) {
-    state.autoWrapped.add(DEFAULT_EXPORT);
-    return;
+  // Wrapping again would produce `withSentry(withSentry(...))`, so the default
+  // export is re-pointed at the wrapper binding the named export created.
+  if (decl.type === 'Identifier') {
+    const wrappedName = state.wrappedLocals.get((decl as IdentifierNode).name);
+    if (wrappedName) {
+      state.ms.overwrite(decl.start, decl.end, wrappedName);
+      state.autoWrapped.add(DEFAULT_EXPORT);
+      return;
+    }
   }
 
   // `export default <expr>` → `const __SENTRY_DEFAULT_EXPORT__ = <expr>`
@@ -417,36 +421,56 @@ function wrapInlineClassExport(
   if (!classId || !kind) return;
 
   const className = classId.name;
-  const renamedClass = `__SENTRY_ORIGINAL_${className}__`;
 
   // Strip the `export ` keyword
   state.ms.overwrite(exportNode.start, classDecl.start, '');
 
-  // Rename the class to avoid a duplicate binding
-  state.ms.overwrite(classId.start, classId.end, renamedClass);
-
-  // Insert the wrapped re-export after the class body
-  state.ms.appendLeft(
-    exportNode.end,
-    `\nexport const ${className} = __SENTRY__.${WRAPPER_METHODS[kind]}(${state.optionsFn}, ${renamedClass});\n`,
-  );
+  const wrappedName = wrapLocalClass(className, classDecl, kind, state);
+  state.ms.appendLeft(exportNode.end, `export { ${wrappedName} as ${className} };\n`);
 
   state.wrappedClasses.add(className);
   state.autoWrapped.add(className);
-  state.renamedLocals.add(className);
+}
+
+/**
+ * Wrap a class declared in this module and return the binding that holds the wrapper.
+ *
+ * The declaration is left exactly as written. Only the *export* has to become the wrapper, so the
+ * wrapper gets its own binding and the export is aliased to it, the same shape as the documented
+ * manual `instrument*WithSentry` pattern and the cross-module re-export path below. Renaming the
+ * declaration instead (`class __SENTRY_ORIGINAL_MyAgent__`) would also rename what the class reports
+ * as `Function.prototype.name`, which libraries read to identify the user's class: `@cloudflare/think`
+ * hands `this.constructor.name` to the AI SDK as the telemetry `functionId`, and that surfaced as a
+ * `gen_ai.invoke_agent __SENTRY_ORIGINAL_MyAgent__` span.
+ */
+function wrapLocalClass(
+  localName: string,
+  localClass: ClassDeclarationNode,
+  kind: ClassWrapperKind,
+  state: TransformState,
+): string {
+  const existing = state.wrappedLocals.get(localName);
+  if (existing) return existing;
+
+  const wrappedName = `__SENTRY_WRAPPED_${localName}__`;
+  state.wrappedLocals.set(localName, wrappedName);
+  state.ms.appendLeft(
+    localClass.end,
+    `\nconst ${wrappedName} = __SENTRY__.${WRAPPER_METHODS[kind]}(${state.optionsFn}, ${localName});\n`,
+  );
   state.needsImport = true;
+  return wrappedName;
 }
 
 /**
  * Wrap the configured classes an `export { ... }` statement names.
  *
- * A class *declared* in this module keeps the statement intact: the declaration is renamed and the
- * wrapper takes over its binding, so the untouched specifier now exports the wrapped class.
- *
- * A class that lives in **another** module — imported and re-exported, or re-exported directly — has
- * no local binding to overwrite (import bindings are immutable). Those specifiers are re-pointed at
- * a fresh wrapper binding instead, which means rebuilding the statement; specifiers this plugin has
- * no business touching are carried over verbatim.
+ * Each such specifier is re-pointed at a binding holding the wrapper, which means rebuilding the
+ * statement; specifiers this plugin has no business touching are carried over verbatim. For a class
+ * declared in this module the wrapper binding follows the declaration (see {@link wrapLocalClass}).
+ * A class that lives in **another** module — imported and re-exported, or re-exported directly — is
+ * first bound under a private name, since an import binding cannot be reassigned and the `from` form
+ * has no local binding at all.
  */
 function wrapSpecifierExports(node: ExportNamedNode, ctx: TransformContext, state: TransformState): void {
   const specifiers = node.specifiers ?? [];
@@ -459,7 +483,7 @@ function wrapSpecifierExports(node: ExportNamedNode, ctx: TransformContext, stat
   const kept: string[] = [];
 
   for (const specifier of specifiers) {
-    const pair = wrapCrossModuleSpecifier(specifier, sourceLiteral, ctx, state, prelude);
+    const pair = wrapSpecifier(specifier, sourceLiteral, ctx, state, prelude);
     if (pair) {
       wrappedPairs.push(pair);
     } else {
@@ -478,15 +502,14 @@ function wrapSpecifierExports(node: ExportNamedNode, ctx: TransformContext, stat
 }
 
 /**
- * Handle one export specifier, returning the `Wrapped as Exported` pair to emit when its class has
- * to be wrapped through a fresh binding — the cross-module case. The import/wrapper statements that
- * pair depends on are pushed onto `prelude`.
+ * Handle one export specifier, returning the `Wrapped as Exported` pair to emit for a class that
+ * gets wrapped. The import/wrapper statements a cross-module pair depends on are pushed onto
+ * `prelude`; a local class's wrapper binding is emitted after its declaration instead.
  *
  * Returns `undefined` when the specifier can stay exactly as written: it doesn't name a configured
- * class, its class is declared locally (wrapped in place via {@link wrapLocalClassExport}, which
- * takes over the binding the specifier already exports), or the binding is already hand-wrapped.
+ * class, or the binding is already hand-wrapped.
  */
-function wrapCrossModuleSpecifier(
+function wrapSpecifier(
   specifier: ExportSpecifierNode,
   sourceLiteral: string | undefined,
   ctx: TransformContext,
@@ -505,16 +528,14 @@ function wrapCrossModuleSpecifier(
 
   if (!exportedName || !localName || !kind) return undefined;
 
-  // Without a `from` clause the specifier points at a module-local binding, which may already be
-  // (or become) the wrapped class without touching the export statement itself.
+  // Without a `from` clause the specifier points at a module-local binding.
   if (!sourceLiteral) {
     const localClass = state.topLevelClasses.get(localName);
 
     if (localClass?.id) {
-      wrapLocalClassExport(localName, localClass, kind, ctx, state);
+      const wrappedName = wrapLocalClass(localName, localClass, kind, state);
       state.wrappedClasses.add(exportedName);
-      state.needsImport = true;
-      return undefined;
+      return `${wrappedName} as ${exportedName}`;
     }
 
     if (state.manuallyWrappedLocals.has(localName)) {
@@ -549,23 +570,3 @@ function wrapCrossModuleSpecifier(
 
   return `${wrappedName} as ${exportedName}`;
 }
-
-/** Rename a locally declared class and rebind its original name to the wrapper. */
-function wrapLocalClassExport(
-  localName: string,
-  localClass: ClassDeclarationNode,
-  kind: ClassWrapperKind,
-  ctx: TransformContext,
-  state: TransformState,
-): void {
-  const classId = localClass.id;
-  if (!classId || state.renamedLocals.has(localName)) return;
-  state.renamedLocals.add(localName);
-
-  const renamedClass = `__SENTRY_ORIGINAL_${localName}__`;
-  state.ms.overwrite(classId.start, classId.end, renamedClass);
-  state.ms.appendLeft(
-    localClass.end,
-    `\nconst ${localName} = __SENTRY__.${WRAPPER_METHODS[kind]}(${state.optionsFn}, ${renamedClass});\n`,
-  );
-}
diff --git a/packages/cloudflare/test/instrumentations/instrumentDurableObjectNamespace.test.ts b/packages/cloudflare/test/instrumentations/instrumentDurableObjectNamespace.test.ts
index d86c8081d0c2..a92d2a582d10 100644
--- a/packages/cloudflare/test/instrumentations/instrumentDurableObjectNamespace.test.ts
+++ b/packages/cloudflare/test/instrumentations/instrumentDurableObjectNamespace.test.ts
@@ -323,11 +323,31 @@ describe('instrumentDurableObjectNamespace', () => {
       const instrumented = instrumentDurableObjectNamespace(namespace, true);
 
       const stub = instrumented.get({ toString: () => 'id', equals: () => false } as any);
+      (stub as any).connect('127.0.0.1:9');
 
-      // connect and dup should be the original functions, not wrapped
-      expect((stub as any).connect).toBe(connectFn);
+      expect(connectFn).toHaveBeenCalledWith('127.0.0.1:9');
       expect((stub as any).dup).toBe(dupFn);
     });
+
+    it('calls connect with the underlying stub as `this`', () => {
+      const { namespace: originalNamespace } = createMockNamespace();
+      const rawStub = {
+        id: { toString: () => 'mock-id', equals: () => false, name: 'test' },
+        fetch: vi.fn(),
+        connect(this: unknown) {
+          if (this !== rawStub) {
+            throw new TypeError('Illegal invocation: function called with incorrect `this` reference.');
+          }
+          return 'socket';
+        },
+      };
+      const namespace = { ...originalNamespace, get: vi.fn().mockReturnValue(rawStub) };
+      const instrumented = instrumentDurableObjectNamespace(namespace);
+
+      const stub = instrumented.get({ toString: () => 'id', equals: () => false } as any);
+
+      expect((stub as any).connect('127.0.0.1:9')).toBe('socket');
+    });
   });
 
   describe('non-function properties', () => {
diff --git a/packages/cloudflare/test/instrumentations/instrumentEnv.test.ts b/packages/cloudflare/test/instrumentations/instrumentEnv.test.ts
index c23f9a2d607e..9219091d53bd 100644
--- a/packages/cloudflare/test/instrumentations/instrumentEnv.test.ts
+++ b/packages/cloudflare/test/instrumentations/instrumentEnv.test.ts
@@ -410,6 +410,30 @@ describe('instrumentEnv', () => {
       });
     });
 
+    it('calls JSRPC connect with the underlying binding as `this`', () => {
+      const jsrpcTarget = {
+        fetch: vi.fn(),
+        connect(this: unknown, _address: string) {
+          if (this !== jsrpcProxy) {
+            throw new TypeError('Illegal invocation: function called with incorrect `this` reference.');
+          }
+          return 'socket';
+        },
+      };
+      const jsrpcProxy = new Proxy(jsrpcTarget, {
+        get(target, prop) {
+          if (prop in target) {
+            return Reflect.get(target, prop);
+          }
+          return () => {};
+        },
+      });
+      const env = { SERVICE: jsrpcProxy };
+      const instrumented = instrumentEnv(env, { rpcTracePropagationBindings: [/.*/] });
+
+      expect(instrumented.SERVICE.connect('127.0.0.1:9')).toBe('socket');
+    });
+
     it('does not inject meta into JSRPC fetch calls', () => {
       vi.spyOn(SentryCore, 'getTraceData').mockReturnValue({
         'sentry-trace': 'abc-def-1',
diff --git a/packages/cloudflare/test/vite/autoInstrument.test.ts b/packages/cloudflare/test/vite/autoInstrument.test.ts
index 17bd5141eb4e..7303e667ee6c 100644
--- a/packages/cloudflare/test/vite/autoInstrument.test.ts
+++ b/packages/cloudflare/test/vite/autoInstrument.test.ts
@@ -155,10 +155,11 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       [
         "import * as __SENTRY__ from '@sentry/cloudflare';",
         "import { WorkerEntrypoint } from 'cloudflare:workers';",
-        'class __SENTRY_ORIGINAL_AdminEntry__ extends WorkerEntrypoint {',
+        'class AdminEntry extends WorkerEntrypoint {',
         '  fetch() { return new Response("admin"); }',
         '}',
-        'export const AdminEntry = __SENTRY__.withSentry(() => undefined, __SENTRY_ORIGINAL_AdminEntry__);',
+        'const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(() => undefined, AdminEntry);',
+        'export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };',
         '',
       ].join('\n'),
     );
@@ -181,7 +182,7 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
     const result = await plugin.transform.call({ parse: (c: string) => parseJS(c) }, code, join(dir, 'index.ts'));
 
     expect(result).toBeDefined();
-    expect(result.code).toContain('export const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
   });
 
   it('wraps a WorkerEntrypoint named via a services[].entrypoint self-binding (jsonc config)', async () => {
@@ -210,7 +211,7 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
     const result = await plugin.transform.call({ parse: (c: string) => parseJS(c) }, code, join(dir, 'index.ts'));
 
     expect(result).toBeDefined();
-    expect(result.code).toContain('export const BindingEntrypoint = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_BindingEntrypoint__ = __SENTRY__.withSentry(');
   });
 
   it('does not wrap an entrypoint that is neither detected nor self-bound', async () => {
@@ -266,7 +267,7 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       const code = ["import { Agent } from 'agents';", 'export class MyAgent extends Agent {}'].join('\n');
 
       const result = await tx(code);
-      expect(result.code).toContain('export const MyAgent = __SENTRY__.instrumentAgentWithSentry(');
+      expect(result.code).toContain('const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentAgentWithSentry(');
       expect(result.code).not.toContain('instrumentDurableObjectWithSentry');
     });
 
@@ -278,7 +279,7 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       ].join('\n');
 
       const result = await tx(code);
-      expect(result.code).toContain('export const MyAgent = __SENTRY__.instrumentAgentWithSentry(');
+      expect(result.code).toContain('const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentAgentWithSentry(');
     });
 
     it('wraps an Agent whose base class lives in another module', async () => {
@@ -288,7 +289,7 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       const code = ["import { MyBase } from './base';", 'export class MyAgent extends MyBase {}'].join('\n');
 
       const result = await tx(code);
-      expect(result.code).toContain('export const MyAgent = __SENTRY__.instrumentAgentWithSentry(');
+      expect(result.code).toContain('const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentAgentWithSentry(');
     });
 
     it('keeps the Durable Object helper for a DO whose base class lives in another module', async () => {
@@ -301,7 +302,7 @@ describe('sentryCloudflareAutoInstrumentPlugin', () => {
       const code = ["import { MyBase } from './base';", 'export class MyAgent extends MyBase {}'].join('\n');
 
       const result = await tx(code);
-      expect(result.code).toContain('export const MyAgent = __SENTRY__.instrumentDurableObjectWithSentry(');
+      expect(result.code).toContain('const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentDurableObjectWithSentry(');
       expect(result.code).not.toContain('instrumentAgentWithSentry');
     });
 
diff --git a/packages/cloudflare/test/vite/transform.test.ts b/packages/cloudflare/test/vite/transform.test.ts
index 51dafe6d6b27..7e26dd77465b 100644
--- a/packages/cloudflare/test/vite/transform.test.ts
+++ b/packages/cloudflare/test/vite/transform.test.ts
@@ -132,11 +132,50 @@ describe('Durable Object class wrapping', () => {
     const result = transform(code, ctx)!;
     expect(result).toBeDefined();
 
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_MyDurableObject__');
+    expect(result.code).toContain('class MyDurableObject extends DurableObject {');
     expect(result.code).not.toContain('export class MyDurableObject');
-    expect(result.code).toContain('__SENTRY__.instrumentDurableObjectWithSentry(');
-    expect(result.code).toContain('export const MyDurableObject =');
-    expect(result.code).toContain('__SENTRY_ORIGINAL_MyDurableObject__');
+    expect(result.code).toContain(
+      'const __SENTRY_WRAPPED_MyDurableObject__ = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), MyDurableObject);',
+    );
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDurableObject__ as MyDurableObject };');
+  });
+
+  // The wrapper must not touch the declaration: `Function.prototype.name` is what libraries read to
+  // identify the user's class (`@cloudflare/think` passes `this.constructor.name` to the AI SDK as the
+  // telemetry `functionId`, which becomes the `gen_ai.invoke_agent` span name), and a user-chosen
+  // `static name` has to keep winning too.
+  it('leaves the class declaration untouched and aliases the export instead', () => {
+    const code = [
+      'class DurableObject {}',
+      'export class MyDurableObject extends DurableObject { static name = "user-chosen"; }',
+    ].join('\n');
+
+    const result = transform(code, ctx)!;
+
+    expect(result.code).toContain('class MyDurableObject extends DurableObject { static name = "user-chosen"; }');
+    expect(result.code).not.toContain('__SENTRY_ORIGINAL_');
+    expect(result.code).not.toContain('Object.defineProperty');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDurableObject__ as MyDurableObject };');
+  });
+
+  it('shares one wrapper between two exports of the same local class', () => {
+    const code = [
+      'class DurableObject {}',
+      'class MyDurableObject extends DurableObject {}',
+      'export { MyDurableObject };',
+      'export { MyDurableObject as Alias };',
+    ].join('\n');
+
+    const result = transform(code, {
+      classWrappers: doWrappers('MyDurableObject', 'Alias'),
+      optionsFn: '(env) => ({})',
+    })!;
+
+    const wrapCount = (result.code.match(/instrumentDurableObjectWithSentry\(/g) ?? []).length;
+    expect(wrapCount).toBe(1);
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDurableObject__ as MyDurableObject };');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDurableObject__ as Alias };');
+    expect(result.wrappedClasses).toEqual(new Set(['MyDurableObject', 'Alias']));
   });
 
   it('wraps multiple DO classes', () => {
@@ -153,10 +192,10 @@ describe('Durable Object class wrapping', () => {
 
     const result = transform(code, multi)!;
     expect(result).toBeDefined();
-    expect(result.code).toContain('export const DOA =');
-    expect(result.code).toContain('export const DOB =');
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_DOA__');
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_DOB__');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_DOA__ as DOA };');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_DOB__ as DOB };');
+    expect(result.code).toContain('class DOA extends DurableObject');
+    expect(result.code).toContain('class DOB extends DurableObject');
   });
 
   it('ignores classes not listed in wrangler config', () => {
@@ -181,12 +220,11 @@ describe('Durable Object class wrapping', () => {
 
     const result = transform(code, ctx)!;
     expect(result).toBeDefined();
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_MyDurableObject__');
+    expect(result.code).toContain('class MyDurableObject extends DurableObject {');
     expect(result.code).toContain(
-      'const MyDurableObject = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), __SENTRY_ORIGINAL_MyDurableObject__);',
+      'const __SENTRY_WRAPPED_MyDurableObject__ = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), MyDurableObject);',
     );
-    // The original specifier export keeps exporting the wrapped binding.
-    expect(result.code).toContain('export { MyDurableObject };');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDurableObject__ as MyDurableObject };');
     expect(result.wrappedClasses).toEqual(new Set(['MyDurableObject']));
   });
 
@@ -199,11 +237,11 @@ describe('Durable Object class wrapping', () => {
 
     const result = transform(code, ctx)!;
     expect(result).toBeDefined();
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_Internal__');
+    expect(result.code).toContain('class Internal extends DurableObject {}');
     expect(result.code).toContain(
-      'const Internal = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), __SENTRY_ORIGINAL_Internal__);',
+      'const __SENTRY_WRAPPED_Internal__ = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), Internal);',
     );
-    expect(result.code).toContain('export { Internal as MyDurableObject };');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_Internal__ as MyDurableObject };');
     expect(result.wrappedClasses).toEqual(new Set(['MyDurableObject']));
   });
 
@@ -293,20 +331,19 @@ describe('Durable Object class wrapping', () => {
     ].join('\n');
 
     const result = transform(code, mixed)!;
-    // The local class keeps its binding (renamed declaration + wrapper), so its specifier is
-    // carried over untouched alongside the unrelated one.
+    // Both classes export through a wrapper binding; only the unrelated specifier is carried over.
     expect(result.code).toBe(
       [
         "import * as __SENTRY__ from '@sentry/cloudflare';",
         "import { ImportedDO } from './do';",
         'class DurableObject {}',
-        'class __SENTRY_ORIGINAL_LocalDO__ extends DurableObject {}',
-        'const LocalDO = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), __SENTRY_ORIGINAL_LocalDO__);',
+        'class LocalDO extends DurableObject {}',
+        'const __SENTRY_WRAPPED_LocalDO__ = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({}), LocalDO);',
         '',
         'const unrelated = 1;',
         'const __SENTRY_WRAPPED_ImportedDO__ = __SENTRY__._INTERNAL_wrapUnlessInstrumented(__SENTRY__.instrumentDurableObjectWithSentry, (env) => ({}), ImportedDO);',
-        'export { __SENTRY_WRAPPED_ImportedDO__ as ImportedDO };',
-        'export { LocalDO, unrelated };',
+        'export { __SENTRY_WRAPPED_LocalDO__ as LocalDO, __SENTRY_WRAPPED_ImportedDO__ as ImportedDO };',
+        'export { unrelated };',
       ].join('\n'),
     );
     expect(result.wrappedClasses).toEqual(new Set(['LocalDO', 'ImportedDO']));
@@ -344,7 +381,7 @@ describe('Durable Object class wrapping', () => {
     const result = transform(code, { classWrappers: doWrappers('MyDurableObject'), optionsFn: '(env) => ({})' })!;
     expect(result.wrappedClasses).toEqual(new Set(['MyDurableObject']));
     expect(result.code).toBe(code);
-    expect(result.code).not.toContain('__SENTRY_ORIGINAL_');
+    expect(result.code).not.toContain('__SENTRY_WRAPPED_');
     expect(result.code).not.toContain("import * as __SENTRY__ from '@sentry/cloudflare'");
   });
 
@@ -378,9 +415,10 @@ describe('Workflow class wrapping', () => {
 
     const result = transform(code, ctx)!;
     expect(result).toBeDefined();
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_MyWorkflow__');
+    expect(result.code).toContain('class MyWorkflow extends WorkflowEntrypoint {');
     expect(result.code).not.toContain('export class MyWorkflow');
-    expect(result.code).toContain('export const MyWorkflow = __SENTRY__.instrumentWorkflowWithSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyWorkflow__ = __SENTRY__.instrumentWorkflowWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyWorkflow__ as MyWorkflow };');
     // A workflow must never be wrapped with the DO helper.
     expect(result.code).not.toContain('instrumentDurableObjectWithSentry');
     expect(result.wrappedClasses).toEqual(new Set(['MyWorkflow']));
@@ -395,9 +433,9 @@ describe('Workflow class wrapping', () => {
 
     const result = transform(code, ctx)!;
     expect(result.code).toContain(
-      'const MyWorkflow = __SENTRY__.instrumentWorkflowWithSentry((env) => ({}), __SENTRY_ORIGINAL_MyWorkflow__);',
+      'const __SENTRY_WRAPPED_MyWorkflow__ = __SENTRY__.instrumentWorkflowWithSentry((env) => ({}), MyWorkflow);',
     );
-    expect(result.code).toContain('export { MyWorkflow };');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyWorkflow__ as MyWorkflow };');
     expect(result.wrappedClasses).toEqual(new Set(['MyWorkflow']));
   });
 
@@ -455,9 +493,10 @@ describe('WorkerEntrypoint class wrapping (structural)', () => {
 
     const result = transform(code, ctx)!;
     expect(result).toBeDefined();
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_AdminEntry__');
+    expect(result.code).toContain('class AdminEntry extends WorkerEntrypoint {');
     expect(result.code).not.toContain('export class AdminEntry');
-    expect(result.code).toContain('export const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };');
     expect(result.wrappedClasses).toEqual(new Set(['AdminEntry']));
   });
 
@@ -468,7 +507,8 @@ describe('WorkerEntrypoint class wrapping (structural)', () => {
     ].join('\n');
 
     const result = transform(code, ctx)!;
-    expect(result.code).toContain('export const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };');
   });
 
   it('wraps a class extending a namespace-imported WorkerEntrypoint', () => {
@@ -478,7 +518,8 @@ describe('WorkerEntrypoint class wrapping (structural)', () => {
     ].join('\n');
 
     const result = transform(code, ctx)!;
-    expect(result.code).toContain('export const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };');
   });
 
   it('wraps a class via an indirect same-file base chain', () => {
@@ -489,7 +530,8 @@ describe('WorkerEntrypoint class wrapping (structural)', () => {
     ].join('\n');
 
     const result = transform(code, ctx)!;
-    expect(result.code).toContain('export const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };');
     expect(result.wrappedClasses).toEqual(new Set(['AdminEntry']));
   });
 
@@ -502,9 +544,9 @@ describe('WorkerEntrypoint class wrapping (structural)', () => {
 
     const result = transform(code, ctx)!;
     expect(result.code).toContain(
-      'const AdminEntry = __SENTRY__.withSentry((env) => ({}), __SENTRY_ORIGINAL_AdminEntry__);',
+      'const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry((env) => ({}), AdminEntry);',
     );
-    expect(result.code).toContain('export { AdminEntry };');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };');
     expect(result.wrappedClasses).toEqual(new Set(['AdminEntry']));
   });
 
@@ -541,7 +583,8 @@ describe('WorkerEntrypoint class wrapping (config fallback)', () => {
     const code = ["import { BaseEntry } from './base';", 'export class AdminEntry extends BaseEntry {}'].join('\n');
 
     const result = transform(code, ctx)!;
-    expect(result.code).toContain('export const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_AdminEntry__ as AdminEntry };');
     expect(result.wrappedClasses).toEqual(new Set(['AdminEntry']));
   });
 
@@ -599,7 +642,8 @@ describe('agent class wrapping', () => {
       optionsFn: '(env) => ({})',
     })!;
 
-    expect(result.code).toContain('export const MyAgent = __SENTRY__.instrumentAgentWithSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentAgentWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyAgent__ as MyAgent };');
     expect(result.code).not.toContain('instrumentDurableObjectWithSentry');
     expect(result.wrappedClasses).toEqual(new Set(['MyAgent']));
   });
@@ -613,7 +657,8 @@ describe('agent class wrapping', () => {
       optionsFn: '(env) => ({})',
     })!;
 
-    expect(result.code).toContain('export const MyDO = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyDO__ = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDO__ as MyDO };');
     expect(result.code).not.toContain('instrumentAgentWithSentry');
   });
 
@@ -631,8 +676,10 @@ describe('agent class wrapping', () => {
       optionsFn: '(env) => ({})',
     })!;
 
-    expect(result.code).toContain('export const MyAgent = __SENTRY__.instrumentAgentWithSentry(');
-    expect(result.code).toContain('export const MyDO = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentAgentWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyAgent__ as MyAgent };');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyDO__ = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDO__ as MyDO };');
   });
 
   it('emits the expected source for a mixed Agent/chat-agent/DO entry', () => {
@@ -658,14 +705,17 @@ describe('agent class wrapping', () => {
         "import { Agent } from 'agents';",
         "import { AIChatAgent } from '@cloudflare/ai-chat';",
         "import { DurableObject } from 'cloudflare:workers';",
-        'class __SENTRY_ORIGINAL_MyAgent__ extends Agent {}',
-        'export const MyAgent = __SENTRY__.instrumentAgentWithSentry((env) => ({ dsn: env.SENTRY_DSN }), __SENTRY_ORIGINAL_MyAgent__);',
+        'class MyAgent extends Agent {}',
+        'const __SENTRY_WRAPPED_MyAgent__ = __SENTRY__.instrumentAgentWithSentry((env) => ({ dsn: env.SENTRY_DSN }), MyAgent);',
+        'export { __SENTRY_WRAPPED_MyAgent__ as MyAgent };',
         '',
-        'class __SENTRY_ORIGINAL_MyChat__ extends AIChatAgent {}',
-        'export const MyChat = __SENTRY__.instrumentAgentWithSentry((env) => ({ dsn: env.SENTRY_DSN }), __SENTRY_ORIGINAL_MyChat__);',
+        'class MyChat extends AIChatAgent {}',
+        'const __SENTRY_WRAPPED_MyChat__ = __SENTRY__.instrumentAgentWithSentry((env) => ({ dsn: env.SENTRY_DSN }), MyChat);',
+        'export { __SENTRY_WRAPPED_MyChat__ as MyChat };',
         '',
-        'class __SENTRY_ORIGINAL_MyDO__ extends DurableObject {}',
-        'export const MyDO = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({ dsn: env.SENTRY_DSN }), __SENTRY_ORIGINAL_MyDO__);',
+        'class MyDO extends DurableObject {}',
+        'const __SENTRY_WRAPPED_MyDO__ = __SENTRY__.instrumentDurableObjectWithSentry((env) => ({ dsn: env.SENTRY_DSN }), MyDO);',
+        'export { __SENTRY_WRAPPED_MyDO__ as MyDO };',
         '',
         'const __SENTRY_DEFAULT_EXPORT__ = { fetch() {} };',
         'export default __SENTRY__.withSentry((env) => ({ dsn: env.SENTRY_DSN }), __SENTRY_DEFAULT_EXPORT__);',
@@ -687,7 +737,8 @@ describe('agent class wrapping', () => {
       optionsFn: '(env) => ({})',
     })!;
 
-    expect(result.code).toContain('const LocalAgent = __SENTRY__.instrumentAgentWithSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_LocalAgent__ = __SENTRY__.instrumentAgentWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_LocalAgent__ as ConfiguredAgent };');
   });
 
   it('does not report a manually Agent-wrapped export as unwrapped', () => {
@@ -749,8 +800,10 @@ describe('combined transforms', () => {
     ].join('\n');
 
     const result = transform(code, mixed)!;
-    expect(result.code).toContain('export const MyDO = __SENTRY__.instrumentDurableObjectWithSentry(');
-    expect(result.code).toContain('export const MyWorkflow = __SENTRY__.instrumentWorkflowWithSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyDO__ = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDO__ as MyDO };');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyWorkflow__ = __SENTRY__.instrumentWorkflowWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyWorkflow__ as MyWorkflow };');
     expect(result.wrappedClasses).toEqual(new Set(['MyDO', 'MyWorkflow']));
     const importCount = (result.code.match(/import \* as __SENTRY__/g) ?? []).length;
     expect(importCount).toBe(1);
@@ -771,8 +824,9 @@ describe('combined transforms', () => {
     expect(result).toBeDefined();
 
     // DO wrapped
-    expect(result.code).toContain('class __SENTRY_ORIGINAL_MyDO__');
-    expect(result.code).toContain('export const MyDO = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('class MyDO extends DurableObject {');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_MyDO__ = __SENTRY__.instrumentDurableObjectWithSentry(');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDO__ as MyDO };');
 
     // Default export wrapped
     expect(result.code).toContain('const __SENTRY_DEFAULT_EXPORT__ =');
@@ -796,10 +850,10 @@ describe('combined transforms', () => {
     // The named export wraps it once; the default re-export must not wrap again.
     const wrapCount = (result.code.match(/withSentry\(/g) ?? []).length;
     expect(wrapCount).toBe(1);
-    expect(result.code).toContain('const AdminEntry = __SENTRY__.withSentry(');
+    expect(result.code).toContain('const __SENTRY_WRAPPED_AdminEntry__ = __SENTRY__.withSentry(');
     expect(result.code).not.toContain('__SENTRY_DEFAULT_EXPORT__');
-    // The default export still points at the (single-)wrapped binding.
-    expect(result.code).toContain('export default AdminEntry;');
+    // The default export is re-pointed at the (single-)wrapped binding.
+    expect(result.code).toContain('export default __SENTRY_WRAPPED_AdminEntry__;');
   });
 
   it('handles the default export appearing before its named wrap in source order', () => {
@@ -827,7 +881,7 @@ describe('combined transforms', () => {
     const result = transform(code, ctx)!;
     expect(result).toBeDefined();
     // DO still wrapped
-    expect(result.code).toContain('export const MyDO =');
+    expect(result.code).toContain('export { __SENTRY_WRAPPED_MyDO__ as MyDO };');
     // Default not double-wrapped
     expect(result.code).not.toContain('__SENTRY_DEFAULT_EXPORT__');
   });
diff --git a/packages/core/README.md b/packages/core/README.md
index c4c26b591b3e..8077bea4e165 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -10,13 +10,16 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
 
-## Links
+Shared foundations and utilities for Sentry’s JavaScript SDKs.
 
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+> [!NOTE]
+> Please consider all classes and exported functions and interfaces `internal`.
 
-## General
+## Documentation
 
-This package contains interface definitions, base classes and utilities for building Sentry JavaScript SDKs, like
-`@sentry/node` or `@sentry/browser`.
+- [JavaScript SDK documentation](https://docs.sentry.io/platforms/javascript/)
 
-Please consider all classes and exported functions and interfaces `internal`.
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/core/package.json b/packages/core/package.json
index c0c48e462fde..5422f170694e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -94,6 +94,6 @@
     "zod": "^3.24.1"
   },
   "dependencies": {
-    "@sentry/conventions": "^0.23.0"
+    "@sentry/conventions": "^0.24.0"
   }
 }
diff --git a/packages/core/src/api.ts b/packages/core/src/api.ts
index 842e6f35be2d..a6610a9c73ba 100644
--- a/packages/core/src/api.ts
+++ b/packages/core/src/api.ts
@@ -60,7 +60,7 @@ export function getReportDialogEndpoint(dsnLike: DsnLike, dialogOptions: ReportD
       continue;
     }
 
-    if (key === 'onClose') {
+    if (key === 'onClose' || key === 'onError') {
       continue;
     }
 
diff --git a/packages/core/src/integrations/mcp-server/index.ts b/packages/core/src/integrations/mcp-server/index.ts
index 192372462a9e..af02f2703462 100644
--- a/packages/core/src/integrations/mcp-server/index.ts
+++ b/packages/core/src/integrations/mcp-server/index.ts
@@ -5,10 +5,31 @@ import type { MCPServerInstance, McpServerWrapperOptions, MCPTransport } from '.
 import { validateMcpServerInstance } from './validation';
 
 /**
- * Tracks wrapped MCP server instances to prevent double-wrapping
+ * Maps each wrapped MCP server instance to the mutable capture options that the transport
+ * instrumentation reads (per message). Prevents double-wrapping while still letting a later
+ * `wrapMcpServerWithSentry` fill in options left unset by an earlier wrap — e.g. an auto-wrap at
+ * construction installs no explicit options, so a manual override still applies.
  * @internal
  */
-const wrappedMcpServerInstances = new WeakSet();
+const wrappedMcpServerOptions = new WeakMap<object, McpServerWrapperOptions>();
+
+/**
+ * Fill in capture options not explicitly set by an earlier wrap. Only unset fields are written, so
+ * the first explicit `recordInputs`/`recordOutputs` wins, but an auto-wrap that set neither still
+ * yields to a later manual override. Mutating the stored object updates the live transport
+ * instrumentation, which reads it per message.
+ */
+function applyMissingMcpOptions(target: McpServerWrapperOptions, source: McpServerWrapperOptions | undefined): void {
+  if (!source) {
+    return;
+  }
+  if (target.recordInputs === undefined && source.recordInputs !== undefined) {
+    target.recordInputs = source.recordInputs;
+  }
+  if (target.recordOutputs === undefined && source.recordOutputs !== undefined) {
+    target.recordOutputs = source.recordOutputs;
+  }
+}
 
 function instrumentTransport(transport: MCPTransport, options: McpServerWrapperOptions): void {
   wrapTransportOnMessage(transport, options);
@@ -95,6 +116,12 @@ function interceptTransportStart(transport: MCPTransport, beforeStart: () => voi
  * wraps any already-registered ones. Wrapping at construction time is recommended by
  * convention (consistent with other SDK integrations), but is not required.
  *
+ * Calling this more than once on the same instance never patches it twice. Options behave like a
+ * snapshot from the first *explicit* wrap: the first `recordInputs`/`recordOutputs` value set for a
+ * field wins, but a field left unset can still be filled by a later call. So when the SDK auto-wraps
+ * the server at construction (via the `mcpServer` integration) with no explicit options, a later
+ * manual `wrapMcpServerWithSentry(server, { recordInputs, recordOutputs })` still applies.
+ *
  * @example
  * ```typescript
  * import * as Sentry from '@sentry/core';
@@ -123,7 +150,9 @@ function interceptTransportStart(transport: MCPTransport, beforeStart: () => voi
  * @returns Instrumented server instance (same reference)
  */
 export function wrapMcpServerWithSentry<S extends object>(mcpServerInstance: S, options?: McpServerWrapperOptions): S {
-  if (wrappedMcpServerInstances.has(mcpServerInstance)) {
+  const existingOptions = wrappedMcpServerOptions.get(mcpServerInstance);
+  if (existingOptions) {
+    applyMissingMcpOptions(existingOptions, options);
     return mcpServerInstance;
   }
 
@@ -133,6 +162,7 @@ export function wrapMcpServerWithSentry<S extends object>(mcpServerInstance: S,
 
   const serverInstance = mcpServerInstance as MCPServerInstance;
   const captureOptions: McpServerWrapperOptions = { ...options };
+  wrappedMcpServerOptions.set(mcpServerInstance, captureOptions);
 
   fill(serverInstance, 'connect', originalConnect => {
     return async function (this: MCPServerInstance, transport: MCPTransport, ...restArgs: unknown[]) {
@@ -167,6 +197,5 @@ export function wrapMcpServerWithSentry<S extends object>(mcpServerInstance: S,
 
   wrapExistingHandlers(serverInstance);
 
-  wrappedMcpServerInstances.add(mcpServerInstance);
   return mcpServerInstance;
 }
diff --git a/packages/core/src/integrations/requestdata.ts b/packages/core/src/integrations/requestdata.ts
index 331c2598e389..a8e0dc14e0a2 100644
--- a/packages/core/src/integrations/requestdata.ts
+++ b/packages/core/src/integrations/requestdata.ts
@@ -18,7 +18,7 @@ import { filterCookiePairs, httpHeadersToSpanAttributes } from '../utils/request
 import { getUrlQuery } from '../utils/url';
 import { getClientIPAddress, ipHeaderNames } from '../vendor/getIpAddress';
 import { safeSetSpanJSONAttributes } from '../tracing/spans/captureSpan';
-import { URL_FULL, URL_QUERY } from '@sentry/conventions/attributes';
+import { SENTRY_IS_LOCALHOST, URL_FULL, URL_QUERY } from '@sentry/conventions/attributes';
 
 type RequestDataIncludeOptions = {
   cookies?: boolean;
@@ -100,7 +100,7 @@ const _requestDataIntegration = ((options: RequestDataIntegrationOptions = {}) =
       // This attribute is used by the "Filter out localhost events" feature on the Sentry backend.
       // Therefore, it's set on every span, not just the segment span.
       safeSetSpanJSONAttributes(span, {
-        'sentry.is_localhost': isLocalhostSpan(sdkProcessingMetadata, user.ip_address),
+        [SENTRY_IS_LOCALHOST]: isLocalhostSpan(sdkProcessingMetadata, user.ip_address),
       });
     },
     processSegmentSpan(span, client) {
diff --git a/packages/core/src/report-dialog.ts b/packages/core/src/report-dialog.ts
index a679604e5d0b..30c330baeef6 100644
--- a/packages/core/src/report-dialog.ts
+++ b/packages/core/src/report-dialog.ts
@@ -26,4 +26,10 @@ export interface ReportDialogOptions extends Record<string, unknown> {
   onLoad?(this: void): void;
   /** Callback after reportDialog closed */
   onClose?(this: void): void;
+  /**
+   * Callback if the reportDialog cannot be shown. This happens when:
+   * - there is no event ID (no `eventId` option and no event captured yet)
+   * - the dialog script fails to load (e.g. blocked by an ad blocker or a network error)
+   */
+  onError?(this: void, error: Error): void;
 }
diff --git a/packages/core/src/utils/cookie.ts b/packages/core/src/utils/cookie.ts
index fb4a8cb7e928..787cf4b862e5 100644
--- a/packages/core/src/utils/cookie.ts
+++ b/packages/core/src/utils/cookie.ts
@@ -46,7 +46,9 @@ export function parseCookieHeader(value: string | string[], headerName: 'cookie'
     if (typeof headerValue !== 'string') {
       return [];
     }
-    return headerName === 'set-cookie' ? [headerValue.split(';')[0]!] : headerValue.split(';');
+    return headerName === 'set-cookie'
+      ? splitJoinedSetCookieHeader(headerValue).map(cookie => cookie.split(';')[0]!)
+      : headerValue.split(';');
   });
 
   return (
@@ -66,6 +68,15 @@ export function parseCookieHeader(value: string | string[], headerName: 'cookie'
   );
 }
 
+/**
+ * No SDK path reads a joined header today, but `Headers.get('set-cookie')` and `xhr.getResponseHeader()`
+ * join repeated `Set-Cookie` headers with ", ". A "," only starts a new cookie when a "name=" follows
+ * before the next ";" or ",", so the "," in `Expires=Wed, 21 Oct 2026 07:28:00 GMT` does not split.
+ */
+function splitJoinedSetCookieHeader(headerValue: string): string[] {
+  return headerValue.split(/,(?=[^;=,]*=)/);
+}
+
 /**
  * Converts cookie pairs to a record with decoded values. The first cookie of a name wins.
  *
diff --git a/packages/core/test/lib/api.test.ts b/packages/core/test/lib/api.test.ts
index 879257eb20c1..866b50d3de30 100644
--- a/packages/core/test/lib/api.test.ts
+++ b/packages/core/test/lib/api.test.ts
@@ -123,6 +123,12 @@ describe('API', () => {
         { onClose: () => {} },
         'https://sentry.io:1234/subpath/api/embed/error-page/?dsn=https://abc@sentry.io:1234/subpath/123',
       ],
+      [
+        'with Public DSN and onError callback',
+        dsnPublic,
+        { onError: () => {} },
+        'https://sentry.io:1234/subpath/api/embed/error-page/?dsn=https://abc@sentry.io:1234/subpath/123',
+      ],
     ])(
       '%s',
       (
diff --git a/packages/core/test/lib/integrations/mcp-server/capturePolicy.test.ts b/packages/core/test/lib/integrations/mcp-server/capturePolicy.test.ts
index fd7ac8d055a2..3371ebed35d7 100644
--- a/packages/core/test/lib/integrations/mcp-server/capturePolicy.test.ts
+++ b/packages/core/test/lib/integrations/mcp-server/capturePolicy.test.ts
@@ -389,4 +389,31 @@ describe('MCP Server Capture Policy', () => {
     );
     expectToolResult(span);
   });
+
+  it('applies a later explicit override when the first wrap set no options (auto-instrumentation)', async () => {
+    // The `mcpServer` integration auto-wraps at construction with no options; a manual
+    // `wrapMcpServerWithSentry(server, { recordInputs: false, recordOutputs: false })` must still opt out,
+    // even against a client whose data-collection settings would otherwise capture both.
+    const server = createMockMcpServer();
+    wrapMcpServerWithSentry(server);
+    wrapMcpServerWithSentry(server, { recordInputs: false, recordOutputs: false });
+    const transport = await connectServer(server, 'capture-policy-auto-override');
+    const recordingScope = createClientScope(true, true);
+    const span = queueInactiveSpan();
+
+    receiveToolCall(transport, recordingScope, {
+      id: 'auto-override-request',
+      location: 'Riga, Latvia',
+    });
+    await sendToolResult(transport, recordingScope, {
+      id: 'auto-override-request',
+      text: 'Private forecast for Riga',
+    });
+
+    expect(startInactiveSpanSpy).toHaveBeenCalledOnce();
+    expect(startInactiveSpanSpy).toHaveBeenCalledWith(
+      buildToolSpanConfig({ id: 'auto-override-request', sessionId: 'capture-policy-auto-override' }),
+    );
+    expectToolResult(span);
+  });
 });
diff --git a/packages/core/test/lib/integrations/mcp-server/mcpServerWrapper.test.ts b/packages/core/test/lib/integrations/mcp-server/mcpServerWrapper.test.ts
index f67cf54b09a4..c2e653bbef2b 100644
--- a/packages/core/test/lib/integrations/mcp-server/mcpServerWrapper.test.ts
+++ b/packages/core/test/lib/integrations/mcp-server/mcpServerWrapper.test.ts
@@ -62,9 +62,13 @@ describe('wrapMcpServerWithSentry', () => {
     const mockMcpServer = createMockMcpServer();
 
     const wrappedOnce = wrapMcpServerWithSentry(mockMcpServer);
+    const connectAfterFirstWrap = wrappedOnce.connect;
     const wrappedTwice = wrapMcpServerWithSentry(wrappedOnce);
 
     expect(wrappedTwice).toBe(wrappedOnce);
+    // A second call (e.g. a manual `wrapMcpServerWithSentry` after auto-instrumentation
+    // already wrapped the instance at construction) must be a no-op, not re-patch `connect`.
+    expect(wrappedTwice.connect).toBe(connectAfterFirstWrap);
   });
 
   it('should wrap the connect method to intercept transport', () => {
diff --git a/packages/core/test/lib/utils/cookie.test.ts b/packages/core/test/lib/utils/cookie.test.ts
index 495041e72397..c7a4ba8136ed 100644
--- a/packages/core/test/lib/utils/cookie.test.ts
+++ b/packages/core/test/lib/utils/cookie.test.ts
@@ -122,6 +122,40 @@ describe('parseCookieHeader', () => {
       expect(parseCookieHeader('; HttpOnly', 'set-cookie')).toEqual([]);
     });
 
+    it.each([
+      [
+        'sid=s3cr3t; Path=/, theme=dark; Path=/',
+        [
+          ['sid', 's3cr3t'],
+          ['theme', 'dark'],
+        ],
+      ],
+      [
+        'sid=s3cr3t; Expires=Wed, 21 Oct 2026 07:28:00 GMT; Path=/, theme=dark',
+        [
+          ['sid', 's3cr3t'],
+          ['theme', 'dark'],
+        ],
+      ],
+      [
+        'sid=s3cr3t; Expires=Wed, 21 Oct 2026 07:28:00 GMT, theme=dark',
+        [
+          ['sid', 's3cr3t'],
+          ['theme', 'dark'],
+        ],
+      ],
+      ['sid=s3cr3t; Expires=Wed, 21 Oct 2026 07:28:00 GMT', [['sid', 's3cr3t']]],
+      [
+        'sid=s3cr3t,theme=dark',
+        [
+          ['sid', 's3cr3t'],
+          ['theme', 'dark'],
+        ],
+      ],
+    ])('splits headers joined with "," in %j', (header, expected) => {
+      expect(parseCookieHeader(header, 'set-cookie')).toEqual(expected);
+    });
+
     it('returns one pair per header value', () => {
       expect(parseCookieHeader(['theme=dark; HttpOnly', 'sid=s3cr3t; Secure'], 'set-cookie')).toEqual([
         ['theme', 'dark'],
diff --git a/packages/core/test/lib/utils/data-collection/filterCookies.test.ts b/packages/core/test/lib/utils/data-collection/filterCookies.test.ts
index f686e0b46e4f..2b6935f06b5b 100644
--- a/packages/core/test/lib/utils/data-collection/filterCookies.test.ts
+++ b/packages/core/test/lib/utils/data-collection/filterCookies.test.ts
@@ -122,6 +122,16 @@ describe('filterCookies', () => {
       ).toEqual({ theme: 'dark' });
     });
 
+    it('reads each cookie of several Set-Cookie headers joined with ","', () => {
+      expect(
+        filterCookies(
+          'sid=s3cr3t; Expires=Wed, 21 Oct 2026 07:28:00 GMT; Path=/, theme=dark; Path=/',
+          true,
+          'set-cookie',
+        ),
+      ).toEqual({ sid: '[Filtered]', theme: 'dark' });
+    });
+
     it('filters the token of a nameless cookie', () => {
       expect(filterCookies('y7Uu0Rk2QpLmXv3; HttpOnly; Secure', true, 'set-cookie')).toEqual({ '': '[Filtered]' });
     });
diff --git a/packages/deno/README.md b/packages/deno/README.md
index 2763652bed17..5a523dc6a94f 100644
--- a/packages/deno/README.md
+++ b/packages/deno/README.md
@@ -10,77 +10,17 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/deno.svg)](https://www.npmjs.com/package/@sentry/deno)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/deno.svg)](https://www.npmjs.com/package/@sentry/deno)
 
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+The official Sentry SDK for monitoring Deno applications.
 
 The Sentry Deno SDK is in beta. Please help us improve the SDK by
 [reporting any issues or giving us feedback](https://github.com/getsentry/sentry-javascript/issues).
 
-## Usage
-
-To use this SDK, call `Sentry.init(options)` as early as possible in the main entry module. This will initialize the SDK
-and hook into the environment. Note that you can turn off almost all side effects using the respective options.
-
-```javascript
-import * as Sentry from 'npm:@sentry/deno';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // ...
-});
-```
-
-To set context information or send manual events, use the exported functions of the Deno SDK. Note that these functions
-will not perform any action before you have called `init()`:
-
-```javascript
-// Set user information, as well as tags and further extras
-Sentry.setExtra('battery', 0.7);
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: 'My Breadcrumb',
-  // ...
-});
-
-// Capture exceptions, messages or manual events
-Sentry.captureMessage('Hello, world!');
-Sentry.captureException(new Error('Good bye'));
-Sentry.captureEvent({
-  message: 'Manual',
-  stacktrace: [
-    // ...
-  ],
-});
-```
-
-## Auto-instrumentation
-
-Some libraries (e.g. `mysql`) don't emit tracing signals on their
-own. To instrument them, Sentry transforms them at load time so they
-publish to `node:diagnostics_channel`.
-
-Use the `--preload` argument to `deno run` to enable
-these instrumentations.
-
-```bash
-$ deno run --preload=npm:@sentry/deno/import app.ts
-```
-
-If your `deno.json` maps `@sentry/deno` to the npm package, the bare
-`--preload=@sentry/deno/import` form works as well.
-
-Your `app.ts` should simply load Sentry as usual:
+## Documentation
 
-```ts
-// app.ts
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/deno/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/deno/configuration/)
 
-// initialize Sentry as early as possible
-import * as Sentry from 'npm:@sentry/deno';
-Sentry.init({ dsn: '__DSN__' });
+## Support
 
-// ... the rest of the app...
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 06c67ed08954..41a9f4f842fc 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
     "@sentry/server-utils": "11.0.0"
diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
index 3b44d8b6d875..847e979bf706 100644
--- a/packages/deno/src/index.ts
+++ b/packages/deno/src/index.ts
@@ -136,6 +136,7 @@ export {
   langChainIntegration,
   langGraphIntegration,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   createFlueInstrumentation,
   lruMemoizerIntegration,
@@ -147,6 +148,7 @@ export {
   openAIIntegration,
   groqIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   postgresIntegration,
   postgresJsIntegration,
   tediousIntegration,
diff --git a/packages/effect/README.md b/packages/effect/README.md
index 1a2f3abd2f0c..317320553f23 100644
--- a/packages/effect/README.md
+++ b/packages/effect/README.md
@@ -4,105 +4,16 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/effect.svg)](https://www.npmjs.com/package/@sentry/effect)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/effect.svg)](https://www.npmjs.com/package/@sentry/effect)
 
-> NOTICE: This package is in alpha state and may be subject to breaking changes.
-
-`@sentry/effect` supports both Effect v3 and Effect v4 (beta). The integration
-auto-detects the installed Effect version at runtime, but the layer composition
-APIs differ between the two major versions, so the setup code is slightly
-different.
-
-## Getting Started
-
-This SDK does not have docs yet. Stay tuned.
-
-## Usage with Effect v3
-
-```typescript
-import * as Sentry from '@sentry/effect/server';
-import { NodeRuntime } from '@effect/platform-node';
-import { Layer, Logger } from 'effect';
-import { HttpLive } from './Http.js';
-
-const SentryLive = Layer.mergeAll(
-  Sentry.effectLayer({
-    dsn: '__DSN__',
-    tracesSampleRate: 1.0,
-  }),
-  Layer.setTracer(Sentry.SentryEffectTracer),
-  Logger.replace(Logger.defaultLogger, Sentry.SentryEffectLogger),
-  Sentry.SentryEffectMetricsLayer,
-);
-
-const MainLive = HttpLive.pipe(Layer.provide(SentryLive));
-MainLive.pipe(Layer.launch, NodeRuntime.runMain);
-```
-
-## Usage with Effect v4
-
-Effect v4 reorganized the `Tracer` and `Logger` layer APIs, so the wiring looks
-slightly different. The `effectLayer`, `SentryEffectTracer`,
-`SentryEffectLogger`, and `SentryEffectMetricsLayer` exports themselves are the
-same.
+The official Sentry SDK for monitoring Effect applications.
 
-```typescript
-import * as Sentry from '@sentry/effect/server';
-import { NodeHttpServer, NodeRuntime } from '@effect/platform-node';
-import * as Layer from 'effect/Layer';
-import * as Logger from 'effect/Logger';
-import * as Tracer from 'effect/Tracer';
-import { HttpRouter } from 'effect/unstable/http';
-import { createServer } from 'http';
-import { Routes } from './Routes.js';
-
-const SentryLive = Layer.mergeAll(
-  Sentry.effectLayer({
-    dsn: '__DSN__',
-    tracesSampleRate: 1.0,
-  }),
-  Layer.succeed(Tracer.Tracer, Sentry.SentryEffectTracer),
-  Logger.layer([Sentry.SentryEffectLogger]),
-  Sentry.SentryEffectMetricsLayer,
-);
-
-const HttpLive = HttpRouter.serve(Routes).pipe(
-  Layer.provide(NodeHttpServer.layer(() => createServer(), { port: 3030 })),
-  Layer.provide(SentryLive),
-);
-
-NodeRuntime.runMain(Layer.launch(HttpLive));
-```
-
-### Error reporting
-
-On Effect v4, `Sentry.effectLayer` registers a Sentry `ErrorReporter`. Failures
-that pass through `Effect.withErrorReporting`, `ErrorReporter.report` or the
-built-in HTTP and RPC reporting boundaries are captured automatically. The
-`ErrorReporter.ignore`, `ErrorReporter.severity` and `ErrorReporter.attributes`
-annotations are respected: ignored errors are skipped, the severity becomes the
-event level and the attributes are attached as extra data.
-
-```typescript
-import { Data, Effect, ErrorReporter } from 'effect';
-
-class RateLimitError extends Data.TaggedError('RateLimitError')<{ readonly retryAfter: number }> {
-  readonly [ErrorReporter.severity] = 'Warn' as const;
-  readonly [ErrorReporter.attributes] = { retryAfter: this.retryAfter };
-}
-
-const program = Effect.fail(new RateLimitError({ retryAfter: 60 })).pipe(Effect.withErrorReporting);
-```
+> NOTICE: This package is in alpha state and may be subject to breaking changes.
 
-Reporters registered with `ErrorReporter.layer` replace the current set, so add
-your own reporters with `mergeWithExisting: true` or provide them below the
-Sentry layer to keep the Sentry reporter:
+## Documentation
 
-```typescript
-const SentryLive = Sentry.effectLayer({ dsn: '__DSN__' }).pipe(Layer.provide(ErrorReporter.layer([consoleReporter])));
-```
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/effect/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/effect/configuration/)
 
-## Links
+## Support
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/effect/)
-- [Sentry.io](https://sentry.io/?utm_source=github&utm_medium=npm_effect)
-- [Sentry Discord Server](https://discord.gg/Ww9hbqr)
-- [Stack Overflow](https://stackoverflow.com/questions/tagged/sentry)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/effect/package.json b/packages/effect/package.json
index 293887beb341..04216d50a09d 100644
--- a/packages/effect/package.json
+++ b/packages/effect/package.json
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@sentry/browser": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0"
   },
diff --git a/packages/elysia/README.md b/packages/elysia/README.md
index 7565ad83ff40..741414a34b3c 100644
--- a/packages/elysia/README.md
+++ b/packages/elysia/README.md
@@ -4,35 +4,22 @@
   </a>
 </p>
 
-> NOTICE: This package is in alpha state and may be subject to breaking changes.
-
 # Official Sentry SDK for Elysia
 
 [![npm version](https://img.shields.io/npm/v/@sentry/elysia.svg)](https://www.npmjs.com/package/@sentry/elysia)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/elysia.svg)](https://www.npmjs.com/package/@sentry/elysia)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/elysia.svg)](https://www.npmjs.com/package/@sentry/elysia)
 
-> **Alpha**: This SDK is in alpha stage and may have breaking changes in future releases.
-
-## Usage
+The official Sentry SDK for monitoring Elysia applications.
 
-```javascript
-import * as Sentry from '@sentry/elysia';
-import { Elysia } from 'elysia';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-});
+> NOTICE: This package is in alpha state and may be subject to breaking changes.
 
-const app = Sentry.withElysia(new Elysia())
-  .get('/', () => 'Hello World')
-  .listen(3000);
-```
+## Documentation
 
-## Links
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/elysia/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/elysia/configuration/)
 
-<!-- - [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/elysia/) -->
+## Support
 
-- [Sentry.io](https://sentry.io/?utm_source=github&utm_medium=npm_elysia)
-- [Sentry Discord Server](https://discord.gg/Ww9hbqr)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/elysia/package.json b/packages/elysia/package.json
index 9f5eb0d59280..24ae573216a9 100644
--- a/packages/elysia/package.json
+++ b/packages/elysia/package.json
@@ -34,14 +34,14 @@
   "dependencies": {
     "@sentry/bun": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0"
+    "@sentry/conventions": "^0.24.0"
   },
   "peerDependencies": {
     "elysia": "^1.4.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9",
-    "elysia": "^1.4.0"
+    "elysia": "^1.4.29"
   },
   "peerDependenciesMeta": {
     "elysia": {
diff --git a/packages/elysia/src/index.ts b/packages/elysia/src/index.ts
index 80e3c9e303ba..b9d21796fcbb 100644
--- a/packages/elysia/src/index.ts
+++ b/packages/elysia/src/index.ts
@@ -64,10 +64,12 @@ export {
   openAIIntegration,
   groqIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   langChainIntegration,
   langGraphIntegration,
   createFlueInstrumentation,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   modulesIntegration,
   contextLinesIntegration,
@@ -138,6 +140,7 @@ export {
   supabaseIntegration,
   instrumentSupabaseClient,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/ember/README.md b/packages/ember/README.md
index 7db2e1a18f05..ccef2c1b0b3b 100644
--- a/packages/ember/README.md
+++ b/packages/ember/README.md
@@ -10,159 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/ember.svg)](https://www.npmjs.com/package/@sentry/ember)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/ember.svg)](https://www.npmjs.com/package/@sentry/ember)
 
-This SDK is a v2 Ember addon that provides error tracking and performance monitoring for Ember.js applications.
+The official Sentry SDK for monitoring Ember.js applications.
 
-## Requirements
+## Documentation
 
-- Ember.js 4.0+
-- Node.js 20.19.0+
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/ember/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/ember/configuration/)
 
-## Installation
+## Support
 
-```bash
-npm install @sentry/ember
-# or
-yarn add @sentry/ember
-# or
-pnpm add @sentry/ember
-```
-
-## Basic Setup
-
-Initialize Sentry early in your application, typically in `app/app.ts` or `app/app.js`:
-
-```typescript
-import Application from '@ember/application';
-import Resolver from 'ember-resolver';
-import loadInitializers from 'ember-load-initializers';
-import config from 'my-app/config/environment';
-import * as Sentry from '@sentry/ember';
-
-// Initialize Sentry before the application
-Sentry.init({
-  dsn: '__YOUR_DSN__',
-  // Set tracesSampleRate to 1.0 to capture 100% of transactions for tracing.
-  // We recommend adjusting this value in production
-  tracesSampleRate: 1.0,
-});
-
-export default class App extends Application {
-  modulePrefix = config.modulePrefix;
-  podModulePrefix = config.podModulePrefix;
-  Resolver = Resolver;
-}
-
-loadInitializers(App, config.modulePrefix);
-```
-
-## Performance Monitoring
-
-For automatic performance instrumentation (page loads, navigation, runloop, components), create an instance-initializer:
-
-```typescript
-// app/instance-initializers/sentry-performance.ts
-import type ApplicationInstance from '@ember/application/instance';
-import { instrumentAppInstancePerformance } from '@sentry/ember';
-
-export function initialize(appInstance: ApplicationInstance): void {
-  instrumentAppInstancePerformance(appInstance, optionalOptions);
-}
-
-export default {
-  initialize,
-};
-```
-
-### Performance Options
-
-| Option                           | Type                  | Default    | Description                               |
-| -------------------------------- | --------------------- | ---------- | ----------------------------------------- |
-| `appInstance`                    | `ApplicationInstance` | _required_ | The Ember application instance            |
-| `disableRunloopPerformance`      | `boolean`             | `false`    | Disable runloop queue tracking            |
-| `disableInstrumentComponents`    | `boolean`             | `false`    | Disable component render tracking         |
-| `enableComponentDefinitions`     | `boolean`             | `false`    | Enable component definition tracking      |
-| `minimumRunloopQueueDuration`    | `number`              | `5`        | Minimum duration (ms) for runloop spans   |
-| `minimumComponentRenderDuration` | `number`              | `2`        | Minimum duration (ms) for component spans |
-| `instrumentPageLoad`             | `boolean`             | `true`     | Instrument page load spans                |
-| `instrumentNavigation`           | `boolean`             | `true`     | Instrument navigation spans               |
-| `idleTimeout`                    | `number`              | `1000`     | Idle timeout (ms) for tracing             |
-
-### Route Performance Instrumentation
-
-To instrument individual routes with detailed lifecycle tracking, use the `instrumentRoutePerformance` decorator:
-
-```typescript
-// app/routes/application.ts
-import Route from '@ember/routing/route';
-import { instrumentRoutePerformance } from '@sentry/ember';
-
-class ApplicationRoute extends Route {
-  async model() {
-    return this.store.findAll('post');
-  }
-}
-
-export default instrumentRoutePerformance(ApplicationRoute);
-```
-
-This wraps the route's `beforeModel`, `model`, `afterModel`, and `setupController` hooks with Sentry spans.
-
-## API
-
-This package re-exports everything from `@sentry/browser`, so you have access to the full Sentry Browser SDK API:
-
-```typescript
-import * as Sentry from '@sentry/ember';
-
-// Capture an error
-Sentry.captureException(new Error('Something went wrong'));
-
-// Capture a message
-Sentry.captureMessage('Something happened');
-
-// Set user context
-Sentry.setUser({ id: '123', email: 'user@example.com' });
-
-// Add breadcrumb
-Sentry.addBreadcrumb({
-  category: 'ui.click',
-  message: 'User clicked button',
-  level: 'info',
-});
-
-// Create a span
-Sentry.startSpan({ name: 'my-operation', op: 'task' }, () => {
-  // ... do work
-});
-```
-
-## Migration from v1 Addon
-
-If you're upgrading from an older version of `@sentry/ember` (v1 addon format), here are the key changes:
-
-### What Changed
-
-1. **No automatic instance initializer**: You must now explicitly set up performance instrumentation by creating an instance-initializer that calls `instrumentAppInstancePerformance(appInstance)`.
-
-2. **No `contentFor` hooks**: The addon no longer injects scripts via `contentFor`.
-
-3. **No environment config via `ENV['@sentry/ember']`**: Configure Sentry directly via `Sentry.init()` in your app.ts.
-
-4. **Simpler dependency tree**: The v2 addon format has fewer dependencies and works better with modern build tools like Vite and Embroider.
-
-### Migration Steps
-
-1. Update your `app/app.ts` to call `Sentry.init()` directly with your configuration.
-
-2. Create `app/instance-initializers/sentry-performance.ts` to set up performance monitoring using `instrumentAppInstancePerformance`.
-
-3. Remove any `@sentry/ember` configuration from `config/environment.js`.
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/ember/)
-- [TypeDoc](http://getsentry.github.io/sentry-javascript/)
-
-## License
-
-MIT
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/ember/package.json b/packages/ember/package.json
index ec9914039c08..00e6d52efcd1 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -45,7 +45,7 @@
     "@embroider/addon-shim": "^1.10.2",
     "@embroider/macros": "^1.20.2",
     "@sentry/browser": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "decorator-transforms": "^2.3.2"
   },
diff --git a/packages/ember/src/utils/instrumentEmberGlobals.ts b/packages/ember/src/utils/instrumentEmberGlobals.ts
index 39a98fd44639..498953a062f1 100644
--- a/packages/ember/src/utils/instrumentEmberGlobals.ts
+++ b/packages/ember/src/utils/instrumentEmberGlobals.ts
@@ -1,7 +1,7 @@
 import { subscribe } from '@ember/instrumentation';
 import { scheduleOnce } from '@ember/runloop';
 import { SENTRY_DESCRIPTION, SENTRY_OP, UI_COMPONENT_NAME } from '@sentry/conventions/attributes';
-import { UI_MOUNT, UI_RENDER, UI_TASK } from '@sentry/conventions/op';
+import { UI_MOUNT, UI_RENDER, UI_RESOLVE, UI_TASK } from '@sentry/conventions/op';
 import { getActiveSpan, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
 import type { Span } from '@sentry/core';
 import {
@@ -204,9 +204,7 @@ function _instrumentComponents(config: {
         },
 
         after(_name: string, _timestamp: number, payload: object) {
-          // TODO: Use the `UI_RESOLVE` const from `@sentry/conventions/op` once the op is released.
-          // See https://github.com/getsentry/sentry-conventions/pull/633
-          _processComponentRenderAfter(payload as Payload, beforeComponentDefinitionEntries, 'ui.resolve', 0);
+          _processComponentRenderAfter(payload as Payload, beforeComponentDefinitionEntries, UI_RESOLVE, 0);
         },
       });
     }
diff --git a/packages/eslint-config-sdk/README.md b/packages/eslint-config-sdk/README.md
index 0369a1ef1146..0d9abb45b577 100644
--- a/packages/eslint-config-sdk/README.md
+++ b/packages/eslint-config-sdk/README.md
@@ -10,19 +10,13 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry/eslint-config-sdk)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/eslint-config-sdk.svg)](https://www.npmjs.com/package/@sentry/eslint-config-sdk)
 
+Shared ESLint configuration used at Sentry.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages and repositories. It is
 > not part of the public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on
 > it directly.
 
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
-
-## General
-
-Install with `yarn add -D @sentry/eslint-config-sdk`
-
 ## Configuration
 
 Use `@sentry` for base rules. Make sure to specify your tsconfig under `parserOptions.project` so that you can
@@ -41,3 +35,8 @@ correctly use the typescript rules. This configuration comes with
   ]
 }
 ```
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/eslint-plugin-sdk/README.md b/packages/eslint-plugin-sdk/README.md
index 1bbf65d64921..745d88bad7f1 100644
--- a/packages/eslint-plugin-sdk/README.md
+++ b/packages/eslint-plugin-sdk/README.md
@@ -10,7 +10,18 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/eslint-plugin-sdk.svg)](https://www.npmjs.com/package/@sentry/eslint-plugin-sdk)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/eslint-plugin-sdk.svg)](https://www.npmjs.com/package/@sentry/eslint-plugin-sdk)
 
+Custom ESLint rules used at Sentry.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages and repositories. It is
 > not part of the public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on
 > it directly.
+
+## Documentation
+
+- [Available rules](https://github.com/getsentry/sentry-javascript/tree/develop/packages/eslint-plugin-sdk/src/rules)
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/feedback/README.md b/packages/feedback/README.md
index 761cb29475b0..60d02f56af1f 100644
--- a/packages/feedback/README.md
+++ b/packages/feedback/README.md
@@ -6,6 +6,8 @@
 
 # Sentry Integration for Feedback
 
+Sentry SDK integration for user feedback.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages. It is not part of the
 > public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on it directly.
@@ -17,13 +19,12 @@ any feedback/concerns.
 To view Feedback in Sentry, your
 [Sentry organization must be an early adopter](https://docs.sentry.io/product/accounts/early-adopter-features/).
 
-## Installation
+## Documentation
 
-Please read the [official integration documentation](https://docs.sentry.io/platforms/javascript/user-feedback/) for
-installation instructions.
+- [Getting started](https://docs.sentry.io/platforms/javascript/user-feedback/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/user-feedback/configuration/)
 
-## Configuration
+## Support
 
-The Feedback integration is highly customizable, please read the
-[official integration documentation](https://docs.sentry.io/platforms/javascript/user-feedback/configuration/) for the
-most up-to-date configuration options.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/gatsby/README.md b/packages/gatsby/README.md
index 0473030865da..cd3c63584300 100644
--- a/packages/gatsby/README.md
+++ b/packages/gatsby/README.md
@@ -6,83 +6,14 @@
 
 # Official Sentry SDK for GatsbyJS
 
-First register the package as a plugin in `gatsby-config.js`:
+The official Sentry SDK for monitoring Gatsby applications.
 
-```javascript
-module.exports = {
-  // ...
-  plugins: [
-    {
-      resolve: '@sentry/gatsby',
-      options: {
-        dsn: process.env.SENTRY_DSN, // this is the default
-      },
-    },
-    // ...
-  ],
-};
-```
+## Documentation
 
-Then configure your `Sentry.init` call:
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/gatsby/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/gatsby/configuration/)
 
-```javascript
-import * as Sentry from '@sentry/gatsby';
+## Support
 
-Sentry.init({
-  dsn: '__PUBLIC_DSN__',
-  integrations: [Sentry.browserTracingIntegration(), Sentry.replayIntegration()],
-
-  // Set tracesSampleRate to 1.0 to capture 100%
-  // of transactions for performance monitoring.
-  // We recommend adjusting this value in production
-  tracesSampleRate: 1.0,
-
-  // Capture Replay for 10% of all sessions,
-  // plus for 100% of sessions with an error
-  replaysSessionSampleRate: 0.1,
-  replaysOnErrorSampleRate: 1.0,
-
-  // Set `tracePropagationTargets` to control for which URLs distributed tracing should be enabled
-  tracePropagationTargets: ['localhost', /^https:\/\/yourserver\.io\/api/],
-});
-```
-
-The Gatsby SDK also automatically sets up sourcemaps uploading for you. To disable this functionality, set the
-`enableClientWebpackPlugin` option to be `false`.
-
-```javascript
-module.exports = {
-  // ...
-  plugins: [
-    {
-      resolve: '@sentry/gatsby',
-      options: {
-        enableClientWebpackPlugin: false,
-      },
-    },
-    // ...
-  ],
-};
-```
-
-Additionally, you can delete source map files after they have been uploaded by setting the `deleteSourcemapsAfterUpload`
-option to be `true`.
-
-```javascript
-module.exports = {
-  // ...
-  plugins: [
-    {
-      resolve: '@sentry/gatsby',
-      options: {
-        deleteSourcemapsAfterUpload: true,
-      },
-    },
-    // ...
-  ],
-};
-```
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/google-cloud-serverless/README.md b/packages/google-cloud-serverless/README.md
index 833d47a95f56..e363a91a4345 100644
--- a/packages/google-cloud-serverless/README.md
+++ b/packages/google-cloud-serverless/README.md
@@ -6,41 +6,14 @@
 
 # Official Sentry SDK for Google Cloud Functions
 
-## Links
+The official Sentry SDK for monitoring Google Cloud Functions.
 
-- [Official SDK Docs](https://docs.sentry.io/)
+## Documentation
 
-## General
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/gcp-functions/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/gcp-functions/configuration/)
 
-This package is a wrapper around `@sentry/node`, with added functionality related to various Serverless solutions. All
-methods available in `@sentry/node` can be imported from `@sentry/google-cloud-serverless`.
+## Support
 
-To use this SDK, call `Sentry.init(options)` at the very beginning of your JavaScript file.
-
-```javascript
-const Sentry = require('@sentry/google-cloud-serverless');
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-  // ...
-});
-
-// For HTTP Functions:
-
-exports.helloHttp = Sentry.wrapHttpFunction((req, res) => {
-  throw new Error('oh, hello there!');
-});
-
-// For Background Functions:
-
-exports.helloEvents = Sentry.wrapEventFunction((data, context, callback) => {
-  throw new Error('oh, hello there!');
-});
-
-// For CloudEvents:
-
-exports.helloEvents = Sentry.wrapCloudEventFunction((context, callback) => {
-  throw new Error('oh, hello there!');
-});
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 9b8cb806da33..4624a1a230b2 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -36,7 +36,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
index e86252691726..ec0838487d36 100644
--- a/packages/google-cloud-serverless/src/index.ts
+++ b/packages/google-cloud-serverless/src/index.ts
@@ -63,9 +63,11 @@ export {
   openAIIntegration,
   groqIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   langChainIntegration,
   langGraphIntegration,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   createFlueInstrumentation,
   modulesIntegration,
@@ -141,6 +143,7 @@ export {
   systemErrorIntegration,
   instrumentSupabaseClient,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/hono/README.md b/packages/hono/README.md
index 9506a20bdaba..2bb15d1ca93d 100644
--- a/packages/hono/README.md
+++ b/packages/hono/README.md
@@ -10,244 +10,15 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/hono.svg)](https://www.npmjs.com/package/@sentry/hono)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/hono.svg)](https://www.npmjs.com/package/@sentry/hono)
 
-This SDK is compatible with Hono 4+.
+The official Sentry SDK for monitoring Hono applications.
 
-## Links
+## Documentation
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/hono/)
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/hono/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/hono/configuration/)
+- [Hono-specific features](https://docs.sentry.io/platforms/javascript/guides/hono/features/)
 
-## Install
+## Support
 
-To get started, first install the `@sentry/hono` package:
-
-```bash
-npm install @sentry/hono
-```
-
-## Setup (Cloudflare Workers)
-
-### 1. Install Peer Dependency
-
-Additionally to `@sentry/hono`, install the `@sentry/cloudflare` package:
-
-```bash
-npm install --save @sentry/cloudflare
-```
-
-Make sure the installed version always stays in sync. The `@sentry/cloudflare` package is a required peer dependency when using `@sentry/hono/cloudflare`.
-You won't import `@sentry/cloudflare` directly in your code, but it needs to be installed in your project.
-
-### 2. Enable Node.js compatibility
-
-Set the `nodejs_compat` compatibility flag in your `wrangler.jsonc`/`wrangler.toml` config. This is because the SDK needs access to the `AsyncLocalStorage` API to work correctly.
-
-```jsonc {tabTitle:JSON} {filename:wrangler.jsonc}
-{
-  "compatibility_flags": ["nodejs_compat"],
-}
-```
-
-```toml {tabTitle:Toml} {filename:wrangler.toml}
-compatibility_flags = ["nodejs_compat"]
-```
-
-### 3. Initialize Sentry in your Hono app
-
-Initialize the Sentry Hono middleware as early as possible in your app:
-
-```typescript
-import { Hono } from 'hono';
-import { sentry } from '@sentry/hono/cloudflare';
-
-const app = new Hono();
-
-// Initialize Sentry middleware right after creating the app
-app.use(
-  sentry(app, {
-    dsn: '__DSN__',
-    // ...other Sentry options
-  }),
-);
-
-// ... your routes and other middleware
-
-export default app;
-```
-
-#### Access `env` from Cloudflare Worker bindings
-
-Pass the options as a callback instead of a plain options object. The function receives the Cloudflare Worker `env` as defined in the Worker's `Bindings`:
-
-```typescript
-import { Hono } from 'hono';
-import { sentry } from '@sentry/hono/cloudflare';
-
-type Bindings = { SENTRY_DSN: string };
-
-const app = new Hono<{ Bindings: Bindings }>();
-
-app.use(sentry(app, env => ({ dsn: env.SENTRY_DSN })));
-
-export default app;
-```
-
-## Setup (Node)
-
-### 1. Install Peer Dependency
-
-Additionally to `@sentry/hono`, install the `@sentry/node` package:
-
-```bash
-npm install --save @sentry/node
-```
-
-Make sure the installed version always stays in sync. The `@sentry/node` package is a required peer dependency when using `@sentry/hono/node`.
-You won't import `@sentry/node` directly in your code, but it needs to be installed in your project.
-
-### 2. Initialize Sentry in a separate file
-
-Create an `instrument.mjs` (or `instrument.ts`) file that initializes Sentry before the rest of your application runs.
-This ensures Sentry can wrap third-party libraries (e.g. database clients) as early as possible:
-
-```ts
-// instrument.mjs (or instrument.ts)
-import * as Sentry from '@sentry/hono/node';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-});
-```
-
-### 3. Load the instrument file with `--import`
-
-When starting your Hono Node application, use the `--import` CLI flag to load `instrument.mjs` before your app code:
-
-```bash
-node --import ./instrument.mjs app.js
-```
-
-This option can also be added to the `NODE_OPTIONS` environment variable:
-
-```bash
-NODE_OPTIONS="--import ./instrument.mjs"
-```
-
-### 4. Add the Sentry middleware to your Hono app
-
-Add the `sentry` middleware to your Hono app. Since Sentry was already initialized in the instrument file, no options are passed here:
-
-```ts
-import { Hono } from 'hono';
-import { serve } from '@hono/node-server';
-import { sentry } from '@sentry/hono/node';
-
-const app = new Hono();
-
-// Add Sentry middleware right after creating the app
-app.use(sentry(app));
-
-// ... your routes and other middleware
-
-serve(app);
-```
-
-## Setup (Bun)
-
-### 1. Install Peer Dependency
-
-Additionally to `@sentry/hono`, install the `@sentry/bun` package:
-
-```bash
-npm install --save @sentry/bun
-```
-
-Make sure the installed version always stays in sync. The `@sentry/bun` package is a required peer dependency when using `@sentry/hono/bun`.
-You won't import `@sentry/bun` directly in your code, but it needs to be installed in your project.
-
-### 2. Initialize Sentry in your Hono app
-
-Initialize the Sentry Hono middleware as early as possible in your app:
-
-```ts
-import { Hono } from 'hono';
-import { serve } from '@hono/node-server';
-import { sentry } from '@sentry/hono/bun';
-
-const app = new Hono();
-
-// Initialize Sentry middleware right after creating the app
-app.use(
-  sentry(app, {
-    dsn: '__DSN__', // or process.env.SENTRY_DSN or Bun.env.SENTRY_DSN
-    tracesSampleRate: 1.0,
-  }),
-);
-
-// ... your routes and other middleware
-
-serve(app);
-```
-
-## Setup (Deno)
-
-### 1. Install Peer Dependency
-
-Additionally to `@sentry/hono`, install the `@sentry/deno` package:
-
-```bash
-npm install --save @sentry/deno
-```
-
-Make sure the installed version always stays in sync. The `@sentry/deno` package is a required peer dependency when using `@sentry/hono/deno`.
-You won't import `@sentry/deno` directly in your code, but it needs to be installed in your project.
-
-### 2. Initialize Sentry in your Hono app
-
-Initialize the Sentry Hono middleware as early as possible in your app, then serve it with `Deno.serve`:
-
-```ts
-import { Hono } from 'hono';
-import { sentry } from '@sentry/hono/deno';
-
-const app = new Hono();
-
-// Initialize Sentry middleware right after creating the app
-app.use(
-  sentry(app, {
-    dsn: '__DSN__', // or Deno.env.get('SENTRY_DSN')
-    tracesSampleRate: 1.0,
-  }),
-);
-
-// ... your routes and other middleware
-
-Deno.serve(app.fetch);
-```
-
-Run your app with the permissions Sentry needs to read environment variables and send events:
-
-```bash
-deno run --allow-net --allow-env --allow-read app.ts
-```
-
-## Filtering errors
-
-By default, `@sentry/hono` captures 5xx errors and plain `Error` objects, and ignores 3xx/4xx HTTP errors (redirects, not-found, bad request, etc.).
-
-Use `shouldHandleError` to override this on a per-error basis:
-
-```ts
-app.use(
-  sentry(app, {
-    dsn: '__DSN__',
-    shouldHandleError(error) {
-      const status = (error as { status?: number })?.status;
-      // Capture 401/403 in addition to the default 5xx errors
-      return status === 401 || status === 403 || typeof status !== 'number' || status >= 500;
-    },
-  }),
-);
-```
-
-Return `true` to capture the error, `false` to suppress it.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/hono/package.json b/packages/hono/package.json
index 95158f664912..f3eeca511f58 100644
--- a/packages/hono/package.json
+++ b/packages/hono/package.json
@@ -74,7 +74,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0"
+    "@sentry/conventions": "^0.24.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x || ^5.x",
diff --git a/packages/integration-shims/README.md b/packages/integration-shims/README.md
index e315b1f61051..55cfd6b6a73c 100644
--- a/packages/integration-shims/README.md
+++ b/packages/integration-shims/README.md
@@ -6,5 +6,17 @@
 
 # Sentry Integration Shims
 
-This internal package exports shims for Integrations, which are used in order to guarantee a consistent CDN bundle
-output.
+Internal shims that provide consistent APIs across Sentry’s CDN bundles.
+
+> [!NOTE]
+> This is a private package used internally by Sentry’s JavaScript SDKs. It is not part of the public API contract
+> and may change at any time.
+
+## Documentation
+
+- [JavaScript SDK documentation](https://docs.sentry.io/platforms/javascript/)
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/nestjs/README.md b/packages/nestjs/README.md
index 6935e9f70af4..4eddbe7696fe 100644
--- a/packages/nestjs/README.md
+++ b/packages/nestjs/README.md
@@ -10,151 +10,15 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/nestjs.svg)](https://www.npmjs.com/package/@sentry/nestjs)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/nestjs.svg)](https://www.npmjs.com/package/@sentry/nestjs)
 
-## Installation
+The official Sentry SDK for monitoring NestJS applications.
 
-```bash
-npm install @sentry/nestjs
+## Documentation
 
-# Or yarn
-yarn add @sentry/nestjs
-```
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/nestjs/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/nestjs/configuration/)
+- [NestJS-specific features](https://docs.sentry.io/platforms/javascript/guides/nestjs/features/)
 
-## Usage
+## Support
 
-Add an `instrument.ts` file:
-
-```typescript
-import * as Sentry from '@sentry/nestjs';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // ...
-});
-```
-
-You need to require or import the `instrument.ts` file before requiring any other modules in your application. This is
-necessary to ensure that Sentry can automatically instrument all modules in your application:
-
-```typescript
-// Import this first!
-import './instrument';
-
-// Now import other modules
-import * as Sentry from '@sentry/nestjs';
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
-
-async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
-  await app.listen(3000);
-}
-
-bootstrap();
-```
-
-Afterwards, add the `SentryModule` as a root module to your main module:
-
-```typescript
-import { Module } from '@nestjs/common';
-import { SentryModule } from '@sentry/nestjs/setup';
-
-@Module({
-  imports: [
-    SentryModule.forRoot(),
-    // ...other modules
-  ],
-})
-export class AppModule {}
-```
-
-In case you are using a global catch-all exception filter (which is either a filter registered with
-`app.useGlobalFilters()` or a filter registered in your app module providers annotated with an empty `@Catch()`
-decorator), add a `@SentryExceptionCaptured()` decorator to the `catch()` method of this global error filter. This
-decorator will report all unexpected errors that are received by your global error filter to Sentry:
-
-```typescript
-import { Catch, ExceptionFilter } from '@nestjs/common';
-import { SentryExceptionCaptured } from '@sentry/nestjs';
-
-@Catch()
-export class YourCatchAllExceptionFilter implements ExceptionFilter {
-  @SentryExceptionCaptured()
-  catch(exception, host): void {
-    // your implementation here
-  }
-}
-```
-
-In case you do not have a global catch-all exception filter, add the `SentryGlobalFilter` to the providers of your main
-module. This filter will report all unhandled errors that are not caught by any other error filter to Sentry.
-**Important:** The `SentryGlobalFilter` needs to be registered before any other exception filters.
-
-```typescript
-import { Module } from '@nestjs/common';
-import { APP_FILTER } from '@nestjs/core';
-import { SentryGlobalFilter } from '@sentry/nestjs/setup';
-
-@Module({
-  providers: [
-    {
-      provide: APP_FILTER,
-      useClass: SentryGlobalFilter,
-    },
-    // ..other providers
-  ],
-})
-export class AppModule {}
-```
-
-**Note:** In NestJS + GraphQL applications replace the `SentryGlobalFilter` with the `SentryGlobalGraphQLFilter`.
-
-## SentryTraced
-
-Use the `@SentryTraced()` decorator to gain additional performance insights for any function within your NestJS
-applications.
-
-```typescript
-import { Injectable } from '@nestjs/common';
-import { SentryTraced } from '@sentry/nestjs';
-
-@Injectable()
-export class ExampleService {
-  @SentryTraced('example function')
-  async performTask() {
-    // Your business logic here
-  }
-}
-```
-
-## SentryCron
-
-Use the `@SentryCron()` decorator to augment the native NestJS `@Cron` decorator to send check-ins to Sentry before and
-after each cron job run.
-
-```typescript
-import { Cron } from '@nestjs/schedule';
-import { SentryCron } from '@sentry/nestjs';
-import type { MonitorConfig } from '@sentry/core';
-
-const monitorConfig: MonitorConfig = {
-  schedule: {
-    type: 'crontab',
-    value: '* * * * *',
-  },
-  checkinMargin: 2, // In minutes. Optional.
-  maxRuntime: 10, // In minutes. Optional.
-  timezone: 'America/Los_Angeles', // Optional.
-};
-
-export class MyCronService {
-  @Cron('* * * * *')
-  @SentryCron('my-monitor-slug', monitorConfig)
-  handleCron() {
-    // Your cron job logic here
-  }
-}
-```
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/nestjs/)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 80845c9704fd..e4cac3c1e978 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -44,7 +44,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-utils": "11.0.0"
diff --git a/packages/nextjs/README.md b/packages/nextjs/README.md
index ded7bdafb966..6b636cfc0e91 100644
--- a/packages/nextjs/README.md
+++ b/packages/nextjs/README.md
@@ -10,50 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/nextjs.svg)](https://www.npmjs.com/package/@sentry/nextjs)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/nextjs.svg)](https://www.npmjs.com/package/@sentry/nextjs)
 
-> See the [Official Sentry Next.js SDK Docs](https://docs.sentry.io/platforms/javascript/guides/nextjs/) to get started.
+The official Sentry SDK for monitoring Next.js applications.
 
-## Compatibility
+## Documentation
 
-Currently, the minimum supported version of Next.js is `14.0.0`.
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/nextjs/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/nextjs/configuration/)
 
-## Installation
+## Support
 
-To get started installing the SDK, use the Sentry Next.js Wizard by running the following command in your terminal or
-read the [Getting Started Docs](https://docs.sentry.io/platforms/javascript/guides/nextjs/):
-
-```sh
-npx @sentry/wizard@latest -i nextjs
-```
-
-The wizard will prompt you to log in to Sentry. After the wizard setup is completed, the SDK will automatically capture
-unhandled errors, and monitor performance.
-
-## Custom Usage
-
-To set context information or to send manual events, you can use `@sentry/nextjs` as follows:
-
-```ts
-import * as Sentry from '@sentry/nextjs';
-
-// Set user information, as well as tags and further extras
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-Sentry.setContext('application_area', { location: 'checkout' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: '"Add to cart" clicked',
-  // ...
-});
-
-// Capture exceptions or messages
-Sentry.captureException(new Error('Oh no.'));
-Sentry.captureMessage('Hello, world!');
-```
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/nextjs/)
-- [Sentry.io](https://sentry.io/?utm_source=github&utm_medium=npm_nextjs)
-- [Sentry Discord Server](https://discord.gg/Ww9hbqr)
-- [Stack Overflow](https://stackoverflow.com/questions/tagged/sentry)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 05e85030e38c..0f396ffe2532 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -76,7 +76,7 @@
     "@rollup/plugin-commonjs": "28.0.1",
     "@sentry/browser-utils": "11.0.0",
     "@sentry/bundler-plugins": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/opentelemetry": "11.0.0",
diff --git a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
index eb3edbf3eced..07258ff72416 100644
--- a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
@@ -156,7 +156,7 @@ const globalWithInjectedBasePath = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
 export function appRouterInstrumentNavigation(client: Client): void {
   routerTransitionHandler = (href, navigationType) => {
     const basePath = process.env._sentryBasePath ?? globalWithInjectedBasePath._sentryBasePath;
-    const normalizedHref = basePath && !href.startsWith(basePath) ? `${basePath}${href}` : href;
+    const normalizedHref = basePath && href.startsWith('/') && !href.startsWith(basePath) ? `${basePath}${href}` : href;
     const unparameterizedPathname = stripTrailingSlash(new URL(normalizedHref, WINDOW.location.href).pathname);
     const parameterizedPathname = maybeParameterizeRoute(unparameterizedPathname);
     // With span streaming, span names have to be low cardinality, so we can't fall back to the URL.
@@ -304,7 +304,9 @@ function patchRouter(client: Client, router: NextRouter, currentNavigationSpanRe
           const href = argArray[0];
           const basePath = process.env._sentryBasePath ?? globalWithInjectedBasePath._sentryBasePath;
           const normalizedHref =
-            basePath && typeof href === 'string' && !href.startsWith(basePath) ? `${basePath}${href}` : href;
+            basePath && typeof href === 'string' && href.startsWith('/') && !href.startsWith(basePath)
+              ? `${basePath}${href}`
+              : href;
           const transactionName = stripTrailingSlash(transactionNameifyRouterArgument(normalizedHref));
           const parameterizedPathname = maybeParameterizeRoute(transactionName);
 
diff --git a/packages/nextjs/src/config/loaders/componentAnnotationLoader.ts b/packages/nextjs/src/config/loaders/componentAnnotationLoader.ts
index 1a5c44109e78..49ab694e673d 100644
--- a/packages/nextjs/src/config/loaders/componentAnnotationLoader.ts
+++ b/packages/nextjs/src/config/loaders/componentAnnotationLoader.ts
@@ -1,4 +1,4 @@
-import { createComponentNameAnnotateHooks } from '@sentry/bundler-plugins/core';
+import { createComponentNameAnnotateHooks } from '@sentry/bundler-plugins/loader-utils';
 import type { LoaderThis } from './types';
 
 export type ComponentAnnotationLoaderOptions = {
@@ -10,7 +10,7 @@ export type ComponentAnnotationLoaderOptions = {
  * `data-sentry-element`, and `data-sentry-source-file` attributes.
  *
  * This is the Turbopack equivalent of what `@sentry/bundler-plugins/webpack` does
- * via the `reactComponentAnnotation` option and `@sentry/babel-plugin-component-annotate`.
+ * via the `reactComponentAnnotation` option.
  *
  * Options:
  *   - `ignoredComponents`: List of component names to exclude from annotation.
diff --git a/packages/nextjs/src/config/loaders/moduleMetadataInjectionLoader.ts b/packages/nextjs/src/config/loaders/moduleMetadataInjectionLoader.ts
index 0c44bac71db5..c199ecd75c8f 100644
--- a/packages/nextjs/src/config/loaders/moduleMetadataInjectionLoader.ts
+++ b/packages/nextjs/src/config/loaders/moduleMetadataInjectionLoader.ts
@@ -1,4 +1,4 @@
-import { getCodeInjectionPosition } from '@sentry/bundler-plugins/core';
+import { getCodeInjectionPosition } from '@sentry/bundler-plugins/loader-utils';
 import type { LoaderThis } from './types';
 
 export type ModuleMetadataInjectionLoaderOptions = {
diff --git a/packages/nextjs/src/config/loaders/valueInjectionLoader.ts b/packages/nextjs/src/config/loaders/valueInjectionLoader.ts
index 8937b4e435e1..9efd442e8d83 100644
--- a/packages/nextjs/src/config/loaders/valueInjectionLoader.ts
+++ b/packages/nextjs/src/config/loaders/valueInjectionLoader.ts
@@ -1,4 +1,4 @@
-import { getCodeInjectionPosition } from '@sentry/bundler-plugins/core';
+import { getCodeInjectionPosition } from '@sentry/bundler-plugins/loader-utils';
 import type { LoaderThis } from './types';
 
 export type ValueInjectionLoaderOptions = {
diff --git a/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts b/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts
index d6efd7f5a5f0..743f4abc35a8 100644
--- a/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts
+++ b/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts
@@ -1,5 +1,6 @@
-import { debug } from '@sentry/core';
+import { debug, escapeStringForRegex } from '@sentry/core';
 import * as path from 'path';
+import { getInstrumentedModuleNames } from '@sentry/server-utils/orchestrion/config';
 import {
   getOrchestrionLoaderPath,
   getSentryInstrumentations,
@@ -163,10 +164,16 @@ function maybeAddOrchestrionRule(
   // build time.
   const importHelperPath = resolveOrchestrionRuntimeRequest('@sentry/server-utils');
 
+  // Turbopack runs webpack loaders out of process, one round trip per matched file. The transform
+  // only ever touches files of the instrumented packages, so limit the rule to those instead of
+  // paying that round trip for every server-side module (all of node_modules included).
+  const instrumentedPackages = getInstrumentedModuleNames().map(escapeStringForRegex);
+  const instrumentedPackagePath = new RegExp(`node_modules/(?:${instrumentedPackages.join('|')})/`);
+
   return safelyAddTurbopackRule(rules, {
     matcher: '*.{js,mjs,cjs}',
     rule: {
-      condition: 'node',
+      condition: { all: ['node', { path: instrumentedPackagePath }] },
       loaders: [
         {
           loader: getOrchestrionLoaderPath(),
diff --git a/packages/nextjs/test/client/appRouterRoutingInstrumentation.test.ts b/packages/nextjs/test/client/appRouterRoutingInstrumentation.test.ts
index e54e9867cc89..37adaa05c25a 100644
--- a/packages/nextjs/test/client/appRouterRoutingInstrumentation.test.ts
+++ b/packages/nextjs/test/client/appRouterRoutingInstrumentation.test.ts
@@ -27,6 +27,7 @@ interface NextRouter {
 const globalWithNext = globalThis as typeof globalThis & {
   next?: { router?: NextRouter };
   _sentryRouteManifest?: string;
+  _sentryBasePath?: string;
 };
 
 const manifest: RouteManifest = {
@@ -38,6 +39,12 @@ const manifest: RouteManifest = {
       paramNames: ['param'],
       hasOptionalPrefix: false,
     },
+    {
+      path: '/my-app/navigation/:param/router-push',
+      regex: '^/my-app/navigation/([^/]+)/router-push$',
+      paramNames: ['param'],
+      hasOptionalPrefix: false,
+    },
   ],
   isrRoutes: [],
 };
@@ -56,6 +63,7 @@ async function setup(traceLifecycle: 'stream' | 'static'): Promise<{
   core: Core;
   router: NextRouter;
   client: Client;
+  instrumentation: Instrumentation;
 }> {
   vi.resetModules();
   const core: Core = await import('@sentry/core');
@@ -80,7 +88,7 @@ async function setup(traceLifecycle: 'stream' | 'static'): Promise<{
   instrumentation.appRouterInstrumentNavigation(client);
   await vi.waitFor(() => expect(router.back).not.toBe(originalBack));
 
-  return { core, router, client };
+  return { core, router, client, instrumentation };
 }
 
 describe('appRouterInstrumentNavigation (router-patch mode)', () => {
@@ -207,3 +215,49 @@ describe('appRouterInstrumentNavigation (router-patch mode)', () => {
     });
   });
 });
+
+describe('appRouterInstrumentNavigation with basePath', () => {
+  beforeEach(() => {
+    globalWithNext._sentryRouteManifest = JSON.stringify(manifest);
+    globalWithNext._sentryBasePath = '/my-app';
+    window.history.replaceState({}, '', '/my-app/navigation');
+  });
+
+  afterEach(() => {
+    delete globalWithNext.next;
+    delete globalWithNext._sentryRouteManifest;
+    delete globalWithNext._sentryBasePath;
+  });
+
+  it.each([
+    ['a root-relative path without basePath', '/navigation/42/router-push'],
+    ['a root-relative path with basePath', '/my-app/navigation/42/router-push'],
+    ['an absolute URL', 'http://localhost:3000/my-app/navigation/42/router-push'],
+  ])('names the router-patch navigation span correctly for %s', async (_, href) => {
+    const { core, router } = await setup('static');
+
+    router.push(href);
+
+    const span = core.getActiveSpan();
+    expect(span).toBeDefined();
+    const spanJson = core.spanToJSON(span!);
+    expect(spanJson.name).toBe('/my-app/navigation/:param/router-push');
+    expect(spanJson.attributes).toEqual(
+      expect.objectContaining({ 'url.full': 'http://localhost:3000/my-app/navigation/42/router-push' }),
+    );
+  });
+
+  it.each([
+    ['a root-relative path without basePath', '/navigation/42/router-push'],
+    ['a root-relative path with basePath', '/my-app/navigation/42/router-push'],
+    ['an absolute URL', 'http://localhost:3000/my-app/navigation/42/router-push'],
+  ])('names the transition-start-hook navigation span correctly for %s', async (_, href) => {
+    const { core, instrumentation } = await setup('static');
+
+    instrumentation.captureRouterTransitionStart(href, 'push');
+
+    const span = core.getActiveSpan();
+    expect(span).toBeDefined();
+    expect(core.spanToJSON(span!).name).toBe('/my-app/navigation/:param/router-push');
+  });
+});
diff --git a/packages/nextjs/test/config/loaders/componentAnnotationLoader.test.ts b/packages/nextjs/test/config/loaders/componentAnnotationLoader.test.ts
index f086d89f3ae2..a97b07291326 100644
--- a/packages/nextjs/test/config/loaders/componentAnnotationLoader.test.ts
+++ b/packages/nextjs/test/config/loaders/componentAnnotationLoader.test.ts
@@ -9,7 +9,7 @@ const { mockTransform, mockCreateHooks } = vi.hoisted(() => {
   return { mockTransform, mockCreateHooks };
 });
 
-vi.mock('@sentry/bundler-plugins/core', () => ({
+vi.mock('@sentry/bundler-plugins/loader-utils', () => ({
   createComponentNameAnnotateHooks: mockCreateHooks,
 }));
 
diff --git a/packages/nextjs/test/config/turbopack/constructTurbopackConfig.test.ts b/packages/nextjs/test/config/turbopack/constructTurbopackConfig.test.ts
index c0479119ef2d..d647c4d78ccf 100644
--- a/packages/nextjs/test/config/turbopack/constructTurbopackConfig.test.ts
+++ b/packages/nextjs/test/config/turbopack/constructTurbopackConfig.test.ts
@@ -1455,7 +1455,7 @@ describe('orchestrion build-time instrumentation', () => {
   function getOrchestrionOptions(result: ReturnType<typeof constructTurbopackConfig>): {
     instrumentations: Array<{ module: { name: string; filePath: unknown } }>;
   } {
-    const rule = result.rules!['*.{js,mjs,cjs}'] as {
+    const rule = result.rules!['*.{js,mjs,cjs}'] as unknown as {
       loaders: Array<{ options: { instrumentations: Array<{ module: { name: string; filePath: unknown } }> } }>;
     };
     return rule.loaders[0]!.options;
@@ -1504,6 +1504,13 @@ describe('orchestrion build-time instrumentation', () => {
     expect(importHelperPath).not.toContain('orchestrion');
   });
 
+  function getOrchestrionCondition(result: ReturnType<typeof constructTurbopackConfig>): {
+    all: [string, { path: RegExp }];
+  } {
+    const rule = result.rules!['*.{js,mjs,cjs}'] as unknown as { condition: { all: [string, { path: RegExp }] } };
+    return rule.condition;
+  }
+
   it('restricts the orchestrion rule to the node environment', () => {
     const result = constructTurbopackConfig({
       userNextConfig: {},
@@ -1511,10 +1518,35 @@ describe('orchestrion build-time instrumentation', () => {
       nextJsVersion: '16.0.0',
     });
 
-    // `condition: 'node'` is what keeps the transform off client code — orchestrion
+    // `'node'` is what keeps the transform off client code — orchestrion
     // splices `node:diagnostics_channel` calls that throw `X is not a function` in the browser.
-    const rule = result.rules!['*.{js,mjs,cjs}'] as { condition?: unknown };
-    expect(rule.condition).toBe('node');
+    expect(getOrchestrionCondition(result)).toEqual({ all: ['node', { path: expect.any(RegExp) }] });
+  });
+
+  it('only sends files of instrumented packages through the loader', () => {
+    const result = constructTurbopackConfig({
+      userNextConfig: {},
+      userSentryOptions: {},
+      nextJsVersion: '16.0.0',
+    });
+
+    // Turbopack runs webpack loaders out of process, per file. Without a path filter every
+    // server-side JS file — all of node_modules included — pays that cost (see #24764).
+    const { path: pathCondition } = getOrchestrionCondition(result).all[1];
+
+    expect(pathCondition.test('node_modules/openai/resources/chat/completions/completions.js')).toBe(true);
+    expect(pathCondition.test('node_modules/@anthropic-ai/sdk/resources/messages/messages.mjs')).toBe(true);
+    expect(
+      pathCondition.test(
+        'node_modules/.pnpm/@anthropic-ai+sdk@0.50.0/node_modules/@anthropic-ai/sdk/resources/messages/messages.js',
+      ),
+    ).toBe(true);
+    expect(pathCondition.test('apps/web/node_modules/pg/lib/client.js')).toBe(true);
+
+    expect(pathCondition.test('node_modules/next/dist/server/app-render/app-render.js')).toBe(false);
+    expect(pathCondition.test('node_modules/openai-agents/dist/index.js')).toBe(false);
+    expect(pathCondition.test('node_modules/lodash/lodash.js')).toBe(false);
+    expect(pathCondition.test('app/api/chat/route.js')).toBe(false);
   });
 
   it('does not add the orchestrion rule when build-time instrumentation is turned off', () => {
diff --git a/packages/nitro/README.md b/packages/nitro/README.md
index 459d8087ce0a..125877a1abfe 100644
--- a/packages/nitro/README.md
+++ b/packages/nitro/README.md
@@ -4,126 +4,22 @@
   </a>
 </p>
 
-> NOTICE: This package is in beta state and may be subject to breaking changes.
-
 # Official Sentry SDK for Nitro
 
 [![npm version](https://img.shields.io/npm/v/@sentry/nitro.svg)](https://www.npmjs.com/package/@sentry/nitro)
 [![npm dm](https://img.shields.io/npm/dm/@sentry/nitro.svg)](https://www.npmjs.com/package/@sentry/nitro)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/nitro.svg)](https://www.npmjs.com/package/@sentry/nitro)
 
-## Links
-
-- [Official Nitro SDK Docs](https://docs.sentry.io/platforms/javascript/guides/nitro/)
-- [Example Nitro app](https://github.com/getsentry/sentry-javascript/tree/develop/dev-packages/e2e-tests/test-applications/nitro-3)
-
-## Compatibility
-
-The minimum supported version of Nitro is `3.0.260415-beta`.
-
-## General
-
-This package is a wrapper around `@sentry/node` with added instrumentation for Nitro's features like:
-
-- HTTP handlers and error capturing.
-- [Middleware instrumentation](https://nitro.build/guide/routing#middleware).
-  <!-- - [Database instrumentation](https://nitro.build/guide/database). -->
-  <!-- - [KV Storage](https://nitro.build/guide/storage) and [Cache](https://nitro.build/guide/cache) instrumentation. -->
-
-## Manual Setup
-
-### 1. Prerequisites & Installation
-
-1. Install the Sentry Nitro SDK:
-
-   ```bash
-   # Using npm
-   npm install @sentry/nitro
-
-   # Using yarn
-   yarn add @sentry/nitro
-
-   # Using pnpm
-   pnpm add @sentry/nitro
-   ```
-
-### 2. Build-Time Nitro Config Setup
-
-1. Import `withSentryConfig` from `@sentry/nitro` and call it with your Nitro config.
-
-#### In `nitro.config.ts`
+The official Sentry SDK for monitoring Nitro applications.
 
-If you are using a dedicated `nitro.config.ts` file, you can import `withSentryConfig` from `@sentry/nitro` and call it with your Nitro config.
-
-```javascript
-import { defineNitroConfig } from 'nitro/config';
-import { withSentryConfig } from '@sentry/nitro';
-
-const config = defineNitroConfig({
-  // ...
-});
-
-export default withSentryConfig(config, {
-  // Sentry Build Options
-});
-```
-
-#### In `vite.config.ts`
-
-If you are using Nitro as a Vite plugin, you can import `withSentryConfig` from `@sentry/nitro` and call it with your Nitro config.
-
-```ts
-import { defineConfig } from 'vite';
-import { nitro } from 'nitro/vite';
-import { withSentryConfig } from '@sentry/nitro';
-
-export default defineConfig({
-  plugins: [nitro()],
-  nitro: withSentryConfig(
-    {
-      // Nitro options
-    },
-    {
-      // Sentry Build Options
-    },
-  ),
-});
-```
-
-### 3. Sentry Config Setup
-
-Create an `instrument.mjs` file in your project root to initialize the Sentry SDK:
-
-```javascript
-import * as Sentry from '@sentry/nitro';
-
-Sentry.init({
-  dsn: '__YOUR_DSN__',
-  tracesSampleRate: 1.0,
-});
-```
-
-Then use `--import` in `NODE_OPTIONS` to load the instrumentation before your app code:
-
-```bash
-NODE_OPTIONS='--import ./instrument.mjs' npx nitro dev
-```
-
-This works with any Nitro command (`nitro dev`, `nitro preview`, or a production start script).
-
-## Uploading Source Maps
+> NOTICE: This package is in beta state and may be subject to breaking changes.
 
-The `withSentryConfig` function automatically configures source map uploading when the `authToken`, `org`, and `project`
-options are provided:
+## Documentation
 
-```javascript
-export default withSentryConfig(config, {
-  org: 'your-sentry-org',
-  project: 'your-sentry-project',
-  authToken: process.env.SENTRY_AUTH_TOKEN,
-});
-```
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/nitro/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/nitro/configuration/)
 
-## Troubleshoot
+## Support
 
-If you encounter any issues with error tracking or integrations, refer to the official [Sentry Nitro SDK documentation](https://docs.sentry.io/platforms/javascript/guides/nitro/). If the documentation does not provide the necessary information, consider opening an issue on GitHub.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/nitro/package.json b/packages/nitro/package.json
index 671b4d3baa42..d23566ccc15e 100644
--- a/packages/nitro/package.json
+++ b/packages/nitro/package.json
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@sentry/bundler-plugins": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
diff --git a/packages/node-native/README.md b/packages/node-native/README.md
index 4ff7b6fdab45..53ffb938e612 100644
--- a/packages/node-native/README.md
+++ b/packages/node-native/README.md
@@ -10,59 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/node-native.svg)](https://www.npmjs.com/package/@sentry/node-native)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/node-native.svg)](https://www.npmjs.com/package/@sentry/node-native)
 
-## Installation
+Native tools for the Sentry Node.js SDK.
 
-```bash
-# Using yarn
-yarn add @sentry/node @sentry/node-native
+## Documentation
 
-# Using npm
-npm install --save @sentry/node @sentry/node-native
-```
+- [Event loop monitoring](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/event-loop-block/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/event-loop-block/#configuration-options)
 
-## `eventLoopBlockIntegration`
+## Support
 
-The `eventLoopBlockIntegration` can be used to monitor for blocked event loops in
-all threads of a Node.js application.
-
-If you instrument your application via the Node.js `--import` flag, Sentry will
-be started and this instrumentation will be automatically applied to all worker
-threads.
-
-`instrument.mjs`
-
-```javascript
-import * as Sentry from '@sentry/node';
-import { eventLoopBlockIntegration } from '@sentry/node-native';
-
-Sentry.init({
-  dsn: '__YOUR_DSN__',
-  // Capture stack traces when the event loop is blocked for more than 500ms
-  integrations: [eventLoopBlockIntegration({ threshold: 500 })],
-});
-```
-
-`app.mjs`
-
-```javascript
-import { Worker } from 'worker_threads';
-
-const worker = new Worker(new URL('./worker.mjs', import.meta.url));
-
-// This main thread will be monitored for blocked event loops
-```
-
-`worker.mjs`
-
-```javascript
-// This worker thread will also be monitored for blocked event loops too
-```
-
-Start your application:
-
-```bash
-node --import instrument.mjs app.mjs
-```
-
-If a thread is blocked for more than the configured threshold, stack traces will
-be captured for all threads and sent to Sentry.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/node/.oxlintrc.json b/packages/node/.oxlintrc.json
index 4a3a8ff955c7..fe2f863db941 100644
--- a/packages/node/.oxlintrc.json
+++ b/packages/node/.oxlintrc.json
@@ -17,7 +17,24 @@
     {
       "files": ["**/src/**"],
       "rules": {
-        "sdk/no-class-field-initializers": "off"
+        "sdk/no-class-field-initializers": "off",
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "node:diagnostics_channel",
+                "allowTypeImports": true,
+                "message": "Bun garbage-collects a channel that no code references, together with its subscribers. Use `subscribeDiagnosticsChannel` or `diagnosticsTracingChannel` from `@sentry/server-utils` instead. See https://github.com/oven-sh/bun/issues/43086"
+              },
+              {
+                "name": "diagnostics_channel",
+                "allowTypeImports": true,
+                "message": "Bun garbage-collects a channel that no code references, together with its subscribers. Use `subscribeDiagnosticsChannel` or `diagnosticsTracingChannel` from `@sentry/server-utils` instead. See https://github.com/oven-sh/bun/issues/43086"
+              }
+            ]
+          }
+        ]
       }
     },
     {
diff --git a/packages/node/README.md b/packages/node/README.md
index a71d049b777f..90f6a15f9b1e 100644
--- a/packages/node/README.md
+++ b/packages/node/README.md
@@ -10,87 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
 
-## Installation
+The official Sentry SDK for monitoring Node.js applications.
 
-```bash
-npm install @sentry/node
+## Documentation
 
-# Or yarn
-yarn add @sentry/node
-```
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/node/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/node/configuration/)
 
-## Usage
+## Support
 
-Sentry should be initialized as early in your app as possible. It is essential that you call `Sentry.init` before you
-require any other modules in your application, otherwise auto-instrumentation of these modules will **not** work.
-
-You need to create a file named `instrument.js` that imports and initializes Sentry:
-
-```js
-// CJS Syntax
-const Sentry = require('@sentry/node');
-// ESM Syntax
-import * as Sentry from '@sentry/node';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // ...
-});
-```
-
-You need to require or import the `instrument.js` file before importing any other modules in your application. This is
-necessary to ensure that Sentry can automatically instrument all modules in your application:
-
-```js
-// Import this first!
-import './instrument';
-
-// Now import other modules
-import http from 'http';
-
-// Your application code goes here
-```
-
-### ESM Support
-
-When running your application in ESM mode, you should use the Node.js
-[`--import`](https://nodejs.org/api/cli.html#--importmodule) command line option to ensure that Sentry is loaded before
-the application code is evaluated.
-
-Adjust the Node.js call for your application to use the `--import` parameter and point it at `instrument.js`, which
-contains your `Sentry.init`() code:
-
-```bash
-# Note: This is only available for Node v18.19.0 onwards.
-node --import ./instrument.mjs app.mjs
-```
-
-If it is not possible for you to pass the `--import` flag to the Node.js binary, you can alternatively use the
-`NODE_OPTIONS` environment variable as follows:
-
-```bash
-NODE_OPTIONS="--import ./instrument.mjs" npm run start
-```
-
-### Bundling your server
-
-`@sentry/node` installs its automatic (diagnostics-channel) instrumentation through a runtime module
-hook that ships in `@sentry/server-runtime-injection` and is designed to run from `node_modules`. There are two
-supported ways to keep auto-instrumentation working when you bundle your server:
-
-1. **Keep `@sentry/server-runtime-injection` external** (do not inline it into the bundle) so the runtime hook
-   loads from `node_modules`. Most bundlers externalize `node_modules` for a Node target by default;
-   if yours inlines everything, mark `@sentry/server-runtime-injection` as external explicitly.
-2. **Instrument at build time** with the Sentry bundler plugins (`@sentry/node/esbuild`,
-   `@sentry/node/webpack`, `@sentry/node/vite`, `@sentry/node/rollup`), which inject the
-   instrumentation into your bundled dependencies during the build. In this mode the runtime hook is
-   not needed.
-
-If you bundle `@sentry/server-runtime-injection` **and** don't use the build-time plugin, its internal code
-transformer is stripped and runtime auto-instrumentation is disabled. `@sentry/node` warns the
-first time an instrumented dependency loads uninstrumented, so a build-time-instrumented app never
-sees the warning.
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/node/package.json b/packages/node/package.json
index af9151804dac..fc5a9a33f2ca 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -78,7 +78,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/opentelemetry": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
index c4f2edc27610..ae598683d38b 100644
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -23,6 +23,7 @@ export {
   lruMemoizerIntegration,
   createFlueInstrumentation,
   mastraIntegration,
+  mcpServerIntegration,
   SentryMastraExporter,
   mongoIntegration,
   mongooseIntegration,
@@ -31,6 +32,7 @@ export {
   mysql2Integration,
   openAIIntegration,
   togetherAIIntegration,
+  typesafeIntegration,
   postgresIntegration,
   postgresJsIntegration,
   redisIntegration,
@@ -45,6 +47,7 @@ export {
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   createLangChainCallbackHandler,
   instrumentLangChainEmbeddings,
   instrumentStateGraph,
diff --git a/packages/node/src/integrations/childProcess.ts b/packages/node/src/integrations/childProcess.ts
index 236184c89a81..bd3ebf93c762 100644
--- a/packages/node/src/integrations/childProcess.ts
+++ b/packages/node/src/integrations/childProcess.ts
@@ -1,6 +1,6 @@
 import type { ChildProcess } from 'node:child_process';
-import * as diagnosticsChannel from 'node:diagnostics_channel';
 import { addBreadcrumb, defineIntegration, isObjectLike } from '@sentry/core';
+import { subscribeDiagnosticsChannel } from '@sentry/server-utils';
 
 interface Options {
   /**
@@ -21,7 +21,7 @@ export const childProcessIntegration = defineIntegration((options: Options = {})
   return {
     name: INTEGRATION_NAME,
     setup() {
-      diagnosticsChannel.channel('child_process').subscribe((event: unknown) => {
+      subscribeDiagnosticsChannel('child_process', (event: unknown) => {
         if (isObjectLike(event) && 'process' in event) {
           captureChildProcessEvents(event.process as ChildProcess, options);
         }
diff --git a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
index a0d38f50043c..6f940d60093e 100644
--- a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
+++ b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
@@ -1,4 +1,3 @@
-import { subscribe } from 'node:diagnostics_channel';
 import { context, trace } from '@opentelemetry/api';
 import type { ClientRequest, IncomingMessage } from 'node:http';
 import type { Span } from '@sentry/core';
@@ -10,6 +9,7 @@ import {
   HTTP_ON_CLIENT_REQUEST,
   patchHttpModuleClient,
 } from '@sentry/core/server';
+import { subscribeDiagnosticsChannel } from '@sentry/server-utils';
 import { NODE_VERSION } from '../../nodeVersion';
 import { errorMonitor } from 'node:events';
 import * as http from 'node:http';
@@ -125,7 +125,7 @@ export function instrumentHttpOutgoingRequests(
 
 function instrumentHttpOutgoingRequestsViaChannel(options: HttpInstrumentationOptions): void {
   const { [HTTP_ON_CLIENT_REQUEST]: onHttpClientRequestCreated } = getHttpClientSubscriptions(options);
-  subscribe(HTTP_ON_CLIENT_REQUEST, onHttpClientRequestCreated);
+  subscribeDiagnosticsChannel(HTTP_ON_CLIENT_REQUEST, onHttpClientRequestCreated);
 }
 
 /**
diff --git a/packages/node/src/integrations/http/httpServerIntegration.ts b/packages/node/src/integrations/http/httpServerIntegration.ts
index 68de63aeecdb..6322cd0169bd 100644
--- a/packages/node/src/integrations/http/httpServerIntegration.ts
+++ b/packages/node/src/integrations/http/httpServerIntegration.ts
@@ -1,10 +1,10 @@
-import { subscribe } from 'node:diagnostics_channel';
 import type { RequestOptions } from 'node:http';
 import { context, createContextKey, propagation } from '@opentelemetry/api';
 import type { Integration, IntegrationFn } from '@sentry/core';
 import { addNonEnumerableProperty, debug, getClient } from '@sentry/core';
 import type { HttpIncomingMessage, HttpServerResponse } from '@sentry/core/server';
 import { getHttpServerSubscriptions, HTTP_ON_SERVER_REQUEST, recordRequestSession } from '@sentry/core/server';
+import { subscribeDiagnosticsChannel } from '@sentry/server-utils';
 import type { RequestEventData } from '@sentry/core';
 import { DEBUG_BUILD } from '../../debug-build';
 
@@ -143,7 +143,7 @@ const _httpServerIntegration = ((options: HttpServerIntegrationOptions = {}) =>
     name: INTEGRATION_NAME,
     setupOnce() {
       const { [HTTP_ON_SERVER_REQUEST]: onHttpServerRequestStart } = getHttpServerSubscriptions(_options);
-      subscribe(HTTP_ON_SERVER_REQUEST, onHttpServerRequestStart);
+      subscribeDiagnosticsChannel(HTTP_ON_SERVER_REQUEST, onHttpServerRequestStart);
     },
     afterAllSetup(client) {
       if (DEBUG_BUILD && client.getIntegrationByName('Http')) {
diff --git a/packages/node/src/integrations/node-fetch/undici-instrumentation.ts b/packages/node/src/integrations/node-fetch/undici-instrumentation.ts
index 89eed4800d46..0def1c3be01d 100644
--- a/packages/node/src/integrations/node-fetch/undici-instrumentation.ts
+++ b/packages/node/src/integrations/node-fetch/undici-instrumentation.ts
@@ -16,7 +16,6 @@
 
 /* eslint-disable max-lines */
 
-import * as diagch from 'diagnostics_channel';
 import { URL } from 'url';
 
 import type { Span, SpanAttributes } from '@sentry/core';
@@ -42,6 +41,7 @@ import {
   filterCollectedUrlQuery,
   httpHeadersToSpanAttributes,
 } from '@sentry/core';
+import { subscribeDiagnosticsChannel } from '@sentry/server-utils';
 import { addFetchRequestBreadcrumb, addTracePropagationHeadersToFetchRequest } from '../../utils/outgoingFetchRequest';
 import {
   HTTP_REQUEST_METHOD,
@@ -118,7 +118,7 @@ function subscribeToChannel(
   diagnosticChannel: string,
   onMessage: (message: unknown, name: string | symbol) => void,
 ): void {
-  diagch.subscribe?.(diagnosticChannel, onMessage);
+  subscribeDiagnosticsChannel(diagnosticChannel, onMessage);
 }
 
 function parseRequestHeaders(request: UndiciRequest): Map<string, string | string[]> {
diff --git a/packages/node/src/integrations/pino.ts b/packages/node/src/integrations/pino.ts
index 44d153d818f0..c5560f0c34d5 100644
--- a/packages/node/src/integrations/pino.ts
+++ b/packages/node/src/integrations/pino.ts
@@ -1,4 +1,3 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
 import type { IntegrationFn, LogSeverityLevel } from '@sentry/core';
 import {
   _INTERNAL_captureLog,
@@ -10,6 +9,7 @@ import {
   severityLevelFromString,
   withScope,
 } from '@sentry/core';
+import { diagnosticsTracingChannel } from '@sentry/server-utils';
 
 const SENTRY_TRACK_SYMBOL = Symbol('sentry-track-pino-logger');
 
@@ -125,7 +125,7 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
   return {
     name: 'Pino',
     setup: () => {
-      const integratedChannel = diagnosticsChannel.tracingChannel('pino_asJson');
+      const integratedChannel = diagnosticsTracingChannel('pino_asJson');
 
       function onPinoStart(self: Pino, args: PinoHookArgs, result: PinoResult): void {
         if (!shouldTrackLogger(self)) {
diff --git a/packages/node/src/integrations/workerThreads.ts b/packages/node/src/integrations/workerThreads.ts
index 27010849e0f0..4a43dc3a6e03 100644
--- a/packages/node/src/integrations/workerThreads.ts
+++ b/packages/node/src/integrations/workerThreads.ts
@@ -1,6 +1,6 @@
 import type { Worker } from 'node:worker_threads';
-import * as diagnosticsChannel from 'node:diagnostics_channel';
 import { captureException, defineIntegration, isObjectLike } from '@sentry/core';
+import { subscribeDiagnosticsChannel } from '@sentry/server-utils';
 
 const INTEGRATION_NAME = 'WorkerThreads' as const;
 
@@ -12,7 +12,7 @@ export const workerThreadsIntegration = defineIntegration(() => {
   return {
     name: INTEGRATION_NAME,
     setup() {
-      diagnosticsChannel.channel('worker_threads').subscribe((event: unknown) => {
+      subscribeDiagnosticsChannel('worker_threads', (event: unknown) => {
         if (isObjectLike(event) && 'worker' in event) {
           captureWorkerThreadEvents(event.worker as Worker);
         }
diff --git a/packages/node/src/sdk/apm-js-collab-tracing-hooks.d.ts b/packages/node/src/sdk/apm-js-collab-tracing-hooks.d.ts
index 9b28ae3eccb5..66967761937b 100644
--- a/packages/node/src/sdk/apm-js-collab-tracing-hooks.d.ts
+++ b/packages/node/src/sdk/apm-js-collab-tracing-hooks.d.ts
@@ -5,7 +5,7 @@ declare module '@apm-js-collab/tracing-hooks' {
 
   /** Hooks require */
   export default class ModulePatch {
-    public constructor(config: PatchConfig): ModulePatch;
+    public constructor(config: PatchConfig);
     public patch(): void;
   }
 }
diff --git a/packages/nuxt/README.md b/packages/nuxt/README.md
index 2c90dcc21d93..3c4991675895 100644
--- a/packages/nuxt/README.md
+++ b/packages/nuxt/README.md
@@ -10,27 +10,15 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/nuxt.svg)](https://www.npmjs.com/package/@sentry/nuxt)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/nuxt.svg)](https://www.npmjs.com/package/@sentry/nuxt)
 
-This SDK is for [Nuxt](https://nuxt.com/). If you're using [Vue](https://vuejs.org/) see our
-[Vue SDK here](https://github.com/getsentry/sentry-javascript/tree/develop/packages/vue).
+The official Sentry SDK for monitoring Nuxt applications.
 
-## Setup Instructions and Documentation
+## Documentation
 
-Check out the [Official Nuxt SDK Docs](https://docs.sentry.io/platforms/javascript/guides/nuxt/) for further information on configuration and usage.
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/nuxt/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/nuxt/configuration/)
+- [Nuxt-specific features](https://docs.sentry.io/platforms/javascript/guides/nuxt/features/)
 
-## Compatibility
+## Support
 
-The minimum supported version of Nuxt is `3.7.0` (`3.14.0+` recommended).
-
-## General
-
-This package is a wrapper around `@sentry/node` for the server and `@sentry/vue` for the client side, with added
-functionality related to Nuxt.
-
-## Troubleshoot
-
-If your server-side auto-instrumentation stops recording spans after bundling (e.g. certain Nitro
-presets), make sure `@sentry/server-runtime-injection` is kept **external** in the Nitro/server build rather than
-inlined, as its runtime module hook must resolve from `node_modules`. `@sentry/node` logs a warning
-the first time an instrumented dependency loads uninstrumented.
-
-If you encounter any issues with error tracking or integrations, refer to the official [Sentry Nuxt SDK documentation](https://docs.sentry.io/platforms/javascript/guides/nuxt/). If the documentation does not provide the necessary information, consider opening an issue on GitHub.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 4fb9fa4a313b..a15ff3490c30 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -56,7 +56,7 @@
     "@nuxt/kit": "^4.5.2",
     "@sentry/browser": "11.0.0",
     "@sentry/cloudflare": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/bundler-plugins": "11.0.0",
diff --git a/packages/opentelemetry/README.md b/packages/opentelemetry/README.md
index 18fbdad8bfab..c568465a9fb4 100644
--- a/packages/opentelemetry/README.md
+++ b/packages/opentelemetry/README.md
@@ -10,97 +10,15 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/opentelemetry.svg)](https://www.npmjs.com/package/@sentry/opentelemetry)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/opentelemetry.svg)](https://www.npmjs.com/package/@sentry/opentelemetry)
 
-This package allows you to send your OpenTelemetry trace data to Sentry via OpenTelemetry SpanProcessors.
+OpenTelemetry support for Sentry’s JavaScript SDKs.
 
-If you are using `@sentry/node`, OpenTelemetry support is included out of the box. This package is only necessary if you
-are setting up OpenTelemetry support for Sentry yourself.
+## Documentation
 
-## Installation
+- [OpenTelemetry documentation](https://docs.sentry.io/platforms/javascript/guides/node/opentelemetry/)
+- [Capture spans from OpenTelemetry APIs](https://docs.sentry.io/platforms/javascript/guides/node/opentelemetry/using-opentelemetry-apis/)
+- [Use your own OpenTelemetry pipeline](https://docs.sentry.io/platforms/javascript/guides/node/opentelemetry/custom-setup/)
 
-```bash
-npm install @sentry/opentelemetry
+## Support
 
-# Or yarn
-yarn add @sentry/opentelemetry
-```
-
-Note that `@sentry/opentelemetry` depends on the following peer dependencies:
-
-- `@opentelemetry/api` version `1.0.0` or greater
-
-## Usage
-
-This package exposes a few building blocks you can add to your OpenTelemetry setup in order to capture OpenTelemetry
-traces to Sentry.
-
-This is how you can use this in your app:
-
-1. Initialize Sentry, e.g. `@sentry/node`!
-2. Call `setupEventContextTrace(client)`
-3. Add `SentrySampler` as sampler
-4. Add `SentrySpanProcessor` as span processor
-5. Register the Sentry context manager (`SentryAsyncLocalStorageContextManager`, or `wrapContextManagerClass` for a custom base)
-6. Add `SentryPropagator` as propagator
-7. Setup OTEL-powered async context strategy for Sentry via `setOpenTelemetryContextAsyncContextStrategy()`
-
-For example, you could set this up as follows:
-
-```js
-import * as Sentry from '@sentry/node';
-import {
-  SentryAsyncLocalStorageContextManager,
-  SentryPropagator,
-  SentrySampler,
-  SentrySpanProcessor,
-  setupEventContextTrace,
-  setOpenTelemetryContextAsyncContextStrategy,
-} from '@sentry/opentelemetry';
-import { context, propagation, trace } from '@opentelemetry/api';
-
-function setupSentry() {
-  Sentry.init({
-    dsn: 'xxx',
-  });
-
-  const client = Sentry.getClient();
-  setupEventContextTrace(client);
-
-  const provider = new BasicTracerProvider({
-    sampler: new SentrySampler(client),
-  });
-  provider.addSpanProcessor(new SentrySpanProcessor());
-
-  // Initialize the provider
-  trace.setGlobalTracerProvider(provider);
-  context.setGlobalContextManager(new SentryAsyncLocalStorageContextManager());
-
-  setOpenTelemetryContextAsyncContextStrategy();
-}
-```
-
-A full setup example can be found in
-[node-experimental](https://github.com/getsentry/sentry-javascript/blob/develop/packages/node-experimental).
-
-## Sentry Tracer Provider
-
-`SentryTracerProvider` is a minimal OpenTelemetry tracer provider which creates native Sentry spans directly.
-It is useful when code uses the global OpenTelemetry API and you do not need the full OpenTelemetry SDK span processor
-and exporter pipeline.
-
-```js
-import { trace } from '@opentelemetry/api';
-import { SentryTracerProvider } from '@sentry/opentelemetry';
-
-trace.setGlobalTracerProvider(new SentryTracerProvider());
-
-const span = trace.getTracer('example').startSpan('work');
-span.end();
-```
-
-In `@sentry/node`, this is the default tracer provider.
-
-The `SentryTracerProvider` does not handle OpenTelemetry logs and metrics.
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index e24d6077b62b..8644ed2e575c 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -27,7 +27,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0"
   },
   "peerDependencies": {
diff --git a/packages/profiling-node/README.md b/packages/profiling-node/README.md
index 3188d5b20b1f..f517467dd913 100644
--- a/packages/profiling-node/README.md
+++ b/packages/profiling-node/README.md
@@ -10,43 +10,12 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/profiling-node.svg)](https://www.npmjs.com/package/@sentry/profiling-node)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/profiling-node.svg)](https://www.npmjs.com/package/@sentry/profiling-node)
 
-## Installation
+Profiling for Node.js applications.
 
-Profiling works as an extension of tracing so you will need both @sentry/node and @sentry/profiling-node installed.
+## Documentation
 
-```bash
-# Using yarn
-yarn add @sentry/node @sentry/profiling-node
-
-# Using npm
-npm install --save @sentry/node @sentry/profiling-node
-```
-
-## Usage
-
-```javascript
-import * as Sentry from '@sentry/node';
-import { nodeProfilingIntegration } from '@sentry/profiling-node';
-
-Sentry.init({
-  dsn: 'https://7fa19397baaf433f919fbe02228d5470@o1137848.ingest.sentry.io/6625302',
-  debug: true,
-  tracesSampleRate: 1,
-  profileSessionSampleRate: 1,
-  profileLifecycle: 'trace',
-  integrations: [nodeProfilingIntegration()],
-});
-```
-
-The Sentry SDK will now collect profile chunks while spans are active, including spans started by automatic instrumentation.
-
-```javascript
-Sentry.startSpan({ name: 'some workflow' }, () => {
-  // The code in here will be profiled
-});
-```
-
-With `profileLifecycle: 'manual'` (the default), you can start and stop the profiler by calling `Sentry.profiler.startProfiler()` and `Sentry.profiler.stopProfiler()`.
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/node/profiling/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/node/profiling/#enabling-profiling)
 
 ### Building the package from source
 
@@ -55,19 +24,16 @@ from source. The libraries required to successfully build the package from sourc
 already required to build any other package which uses native modules and if your codebase uses any of those modules,
 there is a fairly good chance this will work out of the box. The required packages are python, make and g++.
 
-**Windows:** If you are building on windows, you may need to install windows-build-tools
+**Windows:** If you are building on windows, you may need to install Visual Studio's C++ build tools.
 
-**_Python:_** Python 3.12 is not supported yet so you will need a version of python that is lower than 3.12
-
-```bash
+**macOS:** Install Xcode Command Line Tools for the compiler and make.
 
-# using yarn package manager
-yarn global add windows-build-tools
-# or npm package manager
-npm i -g windows-build-tools
-```
+See the [node-gyp prerequisites](https://github.com/nodejs/node-gyp#installation) for supported Python versions and
+platform-specific requirements.
 
-After you have installed the toolchain, you should be able to build the binaries from source
+After you have installed the toolchain, you should be able to build the binaries from source.
+The native bindings are maintained in the [Node CPU profiler repository](https://github.com/getsentry/sentry-javascript-profiling-node-binaries).
+Clone that repository, install its dependencies with `yarn install --ignore-scripts`, and run the following from its root:
 
 ```bash
 # configure node-gyp using yarn
@@ -81,206 +47,20 @@ yarn build:bindings
 npm run build:bindings
 ```
 
-After the binaries are built, you should see them inside the profiling-node/lib folder.
+After the binaries are built, you should see them inside that repository's lib folder.
 
 ### Prebuilt binaries
 
-We currently ship prebuilt binaries for a few of the most common platforms and node versions (v18-24).
+We currently ship prebuilt binaries for a few of the most common platforms and node versions.
 
 - macOS x64
 - Linux ARM64 (musl)
 - Linux x64 (glibc)
 - Windows x64
 
-For a more detailed list, see job_compile_bindings_profiling_node job in our build.yml github action workflow.
-
-### Bundling
-
-If you are looking to squeeze some extra performance or improve cold start in your application (especially true for
-serverless environments where modules are often evaluates on a per request basis), then we recommend you look into
-bundling your code. Modern JS engines are much faster at parsing and compiling JS than following long module resolution
-chains and reading file contents from disk. Because @sentry/profiling-node is a package that uses native node modules,
-bundling it is slightly different than just bundling javascript. In other words, the bundler needs to recognize that a
-.node file is node native binding and move it to the correct location so that it can later be used. Failing to do so
-will result in a MODULE_NOT_FOUND error.
-
-The easiest way to make bundling work with @sentry/profiling-node and other modules which use native nodejs bindings is
-to mark the package as external - this will prevent the code from the package from being bundled, but it means that you
-will now need to rely on the package to be installed in your production environment.
-
-To mark the package as external, use the following configuration:
-
-[Next.js 13+](https://nextjs.org/docs/app/api-reference/next-config-js/serverComponentsExternalPackages)
-
-```js
-const { withSentryConfig } = require('@sentry/nextjs');
-
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    // Add the "@sentry/profiling-node" to serverComponentsExternalPackages.
-    serverComponentsExternalPackages: ['@sentry/profiling-node'],
-  },
-};
-
-module.exports = withSentryConfig(nextConfig, {/* ... */});
-```
-
-[webpack](https://webpack.js.org/configuration/externals/#externals)
-
-```js
-externals: {
-  "@sentry/profiling-node": "commonjs @sentry/profiling-node",
-},
-```
-
-[esbuild](https://esbuild.github.io/api/#external)
-
-```js
-{
-  entryPoints: ['index.js'],
-  platform: 'node',
-  external: ['@sentry/profiling-node'],
-}
-```
-
-[Rollup](https://rollupjs.org/configuration-options/#external)
-
-```js
-{
-  entry: 'index.js',
-  external: '@sentry/profiling-node'
-}
-```
-
-[serverless-esbuild (serverless.yml)](https://www.serverless.com/plugins/serverless-esbuild#external-dependencies)
-
-```yml
-custom:
-  esbuild:
-    external:
-      - @sentry/profiling-node
-    packagerOptions:
-      scripts:
-        - npm install @sentry/profiling-node
-```
-
-[vercel-ncc](https://github.com/vercel/ncc#programmatically-from-nodejs)
-
-```js
-{
-  externals: ["@sentry/profiling-node"],
-}
-```
-
-[vite](https://vitejs.dev/config/ssr-options.html#ssr-external)
-
-```js
-ssr: {
-  external: ['@sentry/profiling-node'];
-}
-```
-
-Marking the package as external is the simplest and most future proof way of ensuring it will work, however if you want
-to bundle it, it is possible to do so as well. Bundling has the benefit of improving your script startup time as all of
-the code is (usually) inside a single executable .js file, which saves time on module resolution.
-
-In general, when attempting to bundle .node native file extensions, you will need to tell your bundler how to treat
-these, as by default it does not know how to handle them. The required approach varies between build tools and you will
-need to find which one will work for you.
-
-The result of bundling .node files correctly is that they are placed into your bundle output directory with their
-require paths updated to reflect their final location.
-
-Example of bundling @sentry/profiling-node with esbuild and .copy loader
-
-```json
-// package.json
-{
-  "scripts": "node esbuild.serverless.js"
-}
-```
-
-```js
-// esbuild.serverless.js
-const { sentryEsbuildPlugin } = require('@sentry/esbuild-plugin');
-
-require('esbuild').build({
-  entryPoints: ['./index.js'],
-  outfile: './dist',
-  platform: 'node',
-  bundle: true,
-  minify: true,
-  sourcemap: true,
-  // This is no longer necessary
-  // external: ["@sentry/profiling-node"],
-  loader: {
-    // ensures .node binaries are copied to ./dist
-    '.node': 'copy',
-  },
-  plugins: [
-    // See https://docs.sentry.io/platforms/javascript/sourcemaps/uploading/esbuild/
-    sentryEsbuildPlugin({
-      project: '',
-      org: '',
-      authToken: '',
-      release: '',
-      sourcemaps: {
-        // Specify the directory containing build artifacts
-        assets: './dist/**',
-      },
-    }),
-  ],
-});
-```
-
-Once you run `node esbuild.serverless.js` esbuild wil bundle and output the files to ./dist folder, but note that all of
-the binaries will be copied. This is wasteful as you will likely only need one of these libraries to be available during
-runtime. Since the binaries follow the `sentry_cpu_profiler-<platform>-<arch>-<stdlib>-<abi>.node` naming scheme, you can
-delete the ones that do not match your target runtime as part of your build step to reduce the deployment size.
-
-### Environment flags
-
-The default mode of the v8 CpuProfiler is kEagerLoggin which enables the profiler even when no profiles are active -
-this is good because it makes calls to startProfiling fast at the tradeoff for constant CPU overhead. The behavior can
-be controlled via the `SENTRY_PROFILER_LOGGING_MODE` environment variable with values of `eager|lazy`. If you opt to use
-the lazy logging mode, calls to startProfiling may be slow (depending on environment and node version, it can be in the
-order of a few hundred ms).
-
-Example of starting a server with lazy logging mode.
-
-```javascript
-SENTRY_PROFILER_LOGGING_MODE=lazy node server.js
-```
-
-## FAQ 💭
-
-### Can the profiler leak PII to Sentry?
-
-The profiler does not collect function arguments so leaking any PII is unlikely. We only collect a subset of the values
-which may identify the device and os that the profiler is running on (if you are already using tracing, it is likely
-that these values are already being collected by the SDK).
-
-There is one way a profiler could leak pii information, but this is unlikely and would only happen for cases where you
-might be creating or naming functions which might contain pii information such as
-
-```js
-eval('function scriptFor${PII_DATA}....');
-```
-
-In that case it is possible that the function name may end up being reported to Sentry.
-
-### Are worker threads supported?
-
-No. All instances of the profiler are scoped per thread In practice, this means that starting a transaction on thread A
-and delegating work to thread B will only result in sample stacks being collected from thread A. That said, nothing
-should prevent you from starting a transaction on thread B concurrently which will result in two independent profiles
-being sent to the Sentry backend. We currently do not do any correlation between such transactions, but we would be open
-to exploring the possibilities. Please file an issue if you have suggestions or specific use-cases in mind.
+For a more detailed list, see the `job_compile` job in the [native build workflow](https://github.com/getsentry/sentry-javascript-profiling-node-binaries/blob/main/.github/workflows/build.yml).
 
-### How much overhead will this profiler add?
+## Support
 
-The profiler uses the kEagerLogging option by default which trades off fast calls to startProfiling for a small amount
-of constant CPU overhead. If you are using kEagerLogging then the tradeoff is reversed and there will be a small CPU
-overhead while the profiler is not running, but calls to startProfiling could be slow (in our tests, this varies by
-environments and node versions, but could be in the order of a couple 100ms).
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/react-router/README.md b/packages/react-router/README.md
index 4bc7bf9890b6..38d6dde98c94 100644
--- a/packages/react-router/README.md
+++ b/packages/react-router/README.md
@@ -10,176 +10,16 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/react-router.svg)](https://www.npmjs.com/package/@sentry/react-router)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/react-router.svg)](https://www.npmjs.com/package/@sentry/react-router)
 
-> This SDK is for [React Router (framework)](https://reactrouter.com/start/framework/installation). If you're using [React Router (library)](https://reactrouter.com/start/library/installation) see our
-> [React SDK here](https://docs.sentry.io/platforms/javascript/guides/react/features/react-router/v7/).
+The official Sentry SDK for monitoring React Router applications in framework mode.
 
-## Links
+For React Router in library mode, use the [React SDK](https://docs.sentry.io/platforms/javascript/guides/react/features/react-router/v7/).
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/react-router/)
+## Documentation
 
-## General
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/react-router/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/react-router/configuration/)
 
-This package is a wrapper around `@sentry/node` for the server and `@sentry/browser` for the client side.
+## Support
 
-## Manual Setup
-
-### Expose Hooks
-
-React Router exposes two hooks in your `app` folder (`entry.client.tsx` and `entry.server.tsx`).
-If you do not see these two files, expose them with the following command:
-
-```bash
-npx react-router reveal
-```
-
-### Client-Side Setup
-
-Initialize the SDK in your `entry.client.tsx` file:
-
-```tsx
-import * as Sentry from '@sentry/react-router';
-import { startTransition, StrictMode } from 'react';
-import { hydrateRoot } from 'react-dom/client';
-import { HydratedRouter } from 'react-router/dom';
-
-Sentry.init({
-  dsn: '___PUBLIC_DSN___',
-  integrations: [Sentry.reactRouterTracingIntegration()],
-
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-
-  // Set `tracePropagationTargets` to declare which URL(s) should have trace propagation enabled
-  tracePropagationTargets: [/^\//, /^https:\/\/yourserver\.io\/api/],
-});
-
-startTransition(() => {
-  hydrateRoot(
-    document,
-    <StrictMode>
-      <HydratedRouter instrumentations={[Sentry.createSentryClientInstrumentation()]} onError={Sentry.sentryOnError} />
-    </StrictMode>,
-  );
-});
-```
-
-Now, update your `app/root.tsx` file to report any unhandled errors from your global error boundary:
-
-```tsx
-import * as Sentry from '@sentry/react-router';
-
-export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
-  let message = 'Oops!';
-  let details = 'An unexpected error occurred.';
-  let stack: string | undefined;
-
-  if (isRouteErrorResponse(error)) {
-    message = error.status === 404 ? '404' : 'Error';
-    details = error.status === 404 ? 'The requested page could not be found.' : error.statusText || details;
-  } else if (error && error instanceof Error) {
-    // you only want to capture non 404-errors that reach the boundary
-    Sentry.captureException(error);
-    if (import.meta.env.DEV) {
-      details = error.message;
-      stack = error.stack;
-    }
-  }
-
-  return (
-    <main>
-      <h1>{message}</h1>
-      <p>{details}</p>
-      {stack && (
-        <pre>
-          <code>{stack}</code>
-        </pre>
-      )}
-    </main>
-  );
-}
-// ...
-```
-
-### Server-Side Setup
-
-Create an `instrument.server.mjs` file in the root of your app:
-
-```js
-import * as Sentry from '@sentry/react-router';
-
-Sentry.init({
-  dsn: '___PUBLIC_DSN___',
-  tracesSampleRate: 1.0, // Capture 100% of the transactions
-});
-```
-
-In your `entry.server.tsx` file, import the instrumentation file at the very top, export the
-`instrumentations` array, and export the `handleError` function:
-
-```tsx
-import './instrument.server.mjs';
-import * as Sentry from '@sentry/react-router';
-import { type HandleErrorFunction } from 'react-router';
-
-export const handleError: HandleErrorFunction = (error, { request }) => {
-  // React Router may abort some interrupted requests, report those
-  if (!request.signal.aborted) {
-    Sentry.captureException(error);
-
-    // make sure to still log the error so you can see it
-    console.error(error);
-  }
-};
-
-// Register the Sentry server instrumentation so loaders, actions and middleware are traced.
-export const instrumentations = [Sentry.createSentryServerInstrumentation()];
-// ... rest of your server entry
-```
-
-### Loading the Instrumentation via `--import` (Alternative)
-
-Instead of importing the instrumentation file at the top of `entry.server.tsx`, you can load it before
-the application starts via the `--import` command line option. Since React Router runs in ESM mode,
-update the `start` and `dev` scripts accordingly:
-
-```json
-"scripts": {
-  "dev": "NODE_OPTIONS='--import ./instrument.server.mjs' react-router dev",
-  "start": "NODE_OPTIONS='--import ./instrument.server.mjs' react-router-serve ./build/server/index.js",
-}
-```
-
-## Build-time Config
-
-Update your vite.config.ts file to include the `sentryReactRouter` plugin and also add your config options to the vite config (this is required for uploading sourcemaps at the end of the build):
-
-```ts
-import { reactRouter } from '@react-router/dev/vite';
-import { sentryReactRouter } from '@sentry/react-router/vite';
-import { defineConfig } from 'vite';
-
-const sentryConfig = {
-  authToken: '...',
-  org: '...',
-  project: '...',
-  // rest of your config
-};
-
-export default defineConfig(config => {
-  return {
-    plugins: [reactRouter(), sentryReactRouter(sentryConfig, config)],
-    sentryConfig,
-  };
-});
-```
-
-Next, in your `react-router.config.ts` file, include the `sentryOnBuildEnd` hook:
-
-```ts
-import type { Config } from '@react-router/dev/config';
-import { sentryOnBuildEnd } from '@sentry/react-router/vite';
-
-export default {
-  ssr: true,
-  buildEnd: sentryOnBuildEnd,
-} satisfies Config;
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 1ec8a5122ce5..0d206c488a38 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -52,7 +52,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@sentry/browser": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/react": "11.0.0",
diff --git a/packages/react/README.md b/packages/react/README.md
index b8d9879aa231..9321952b6708 100644
--- a/packages/react/README.md
+++ b/packages/react/README.md
@@ -6,112 +6,15 @@
 
 # Official Sentry SDK for ReactJS
 
-## Links
+The official Sentry SDK for monitoring React applications.
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/react/)
+## Documentation
 
-## General
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/react/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/react/configuration/)
+- [React-specific features](https://docs.sentry.io/platforms/javascript/guides/react/features/)
 
-This package is a wrapper around `@sentry/browser`, with added functionality related to React. All methods available in
-`@sentry/browser` can be imported from `@sentry/react`.
+## Support
 
-To use this SDK, call `Sentry.init(options)` before you mount your React component.
-
-```javascript
-import React from 'react';
-import { createRoot } from 'react-dom/client';
-import * as Sentry from '@sentry/react';
-
-Sentry.init({
-  dsn: '__DSN__',
-  // ...
-});
-
-// ...
-
-const container = document.getElementById(“app”);
-const root = createRoot(container);
-root.render(<App />);
-
-// also works with hydrateRoot
-// const domNode = document.getElementById('root');
-// const root = hydrateRoot(domNode, reactNode);
-// root.render(<App />);
-```
-
-### React 19
-
-Starting with React 19, the `createRoot` and `hydrateRoot` methods expose error hooks that can be used to capture errors
-automatically. Use the `Sentry.reactErrorHandler` function to capture errors in the error hooks you are interested in.
-
-```js
-const container = document.getElementById(“app”);
-const root = createRoot(container, {
-  // Callback called when an error is thrown and not caught by an Error Boundary.
-  onUncaughtError: Sentry.reactErrorHandler((error, errorInfo) => {
-    console.warn('Uncaught error', error, errorInfo.componentStack);
-  }),
-  // Callback called when React catches an error in an Error Boundary.
-  onCaughtError: Sentry.reactErrorHandler(),
-  // Callback called when React automatically recovers from errors.
-  onRecoverableError: Sentry.reactErrorHandler(),
-});
-root.render(<App />);
-```
-
-If you want more finely grained control over error handling, we recommend only adding the `onUncaughtError` and
-`onRecoverableError` hooks and using an `ErrorBoundary` component instead of the `onCaughtError` hook.
-
-### ErrorBoundary
-
-`@sentry/react` exports an ErrorBoundary component that will automatically send Javascript errors from inside a
-component tree to Sentry, and set a fallback UI.
-
-> app.js
-
-```javascript
-import React from 'react';
-import * as Sentry from '@sentry/react';
-
-function FallbackComponent() {
-  return <div>An error has occurred</div>;
-}
-
-class App extends React.Component {
-  render() {
-    return (
-      <Sentry.ErrorBoundary fallback={FallbackComponent} showDialog>
-        <OtherComponents />
-      </Sentry.ErrorBoundary>
-    );
-  }
-}
-
-export default App;
-```
-
-### Profiler
-
-`@sentry/react` exports a Profiler component that leverages the tracing features to add React-related spans to
-transactions. If tracing is not enabled, the Profiler component will not work. The Profiler tracks component mount,
-render duration and updates.
-
-> app.js
-
-```javascript
-import React from 'react';
-import * as Sentry from '@sentry/react';
-
-class App extends React.Component {
-  render() {
-    return (
-      <FancyComponent>
-        <InsideComponent someProp={2} />
-        <AnotherComponent />
-      </FancyComponent>
-    );
-  }
-}
-
-export default Sentry.withProfiler(App);
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/react/package.json b/packages/react/package.json
index e8baaafc9e1c..844295ca6d6d 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -59,7 +59,7 @@
   "dependencies": {
     "@sentry/browser": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0"
+    "@sentry/conventions": "^0.24.0"
   },
   "peerDependencies": {
     "react": "17.x || 18.x || 19.x",
diff --git a/packages/react/test/reactrouter-cross-usage.test.tsx b/packages/react/test/reactrouter-cross-usage.test.tsx
index 191629ab8ee1..3711626a27c2 100644
--- a/packages/react/test/reactrouter-cross-usage.test.tsx
+++ b/packages/react/test/reactrouter-cross-usage.test.tsx
@@ -35,6 +35,23 @@ import {
   wrapUseRoutesV6,
 } from '../src/reactrouterv6';
 
+// jsdom provides its own AbortSignal, which the undici `Request` of Node >= 24 rejects
+// in `RequestInit`. React Router only reads the signal back off the request, so keep it
+// as an own property instead of handing it to undici.
+const NativeRequest = globalThis.Request;
+vi.stubGlobal(
+  'Request',
+  class extends NativeRequest {
+    public constructor(input: RequestInfo | URL, init: RequestInit = {}) {
+      const { signal, ...rest } = init;
+      super(input, rest);
+      if (signal) {
+        Object.defineProperty(this, 'signal', { value: signal, configurable: true });
+      }
+    }
+  },
+);
+
 const mockStartBrowserTracingPageLoadSpan = vi.fn();
 const mockStartBrowserTracingNavigationSpan = vi.fn();
 
diff --git a/packages/remix/README.md b/packages/remix/README.md
index ddb0c643a869..826159aa47c9 100644
--- a/packages/remix/README.md
+++ b/packages/remix/README.md
@@ -10,125 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/remix.svg)](https://www.npmjs.com/package/@sentry/remix)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/remix.svg)](https://www.npmjs.com/package/@sentry/remix)
 
-## General
+The official Sentry SDK for monitoring Remix applications.
 
-This package is a wrapper around `@sentry/node` for the server and `@sentry/react` for the client, with added
-functionality related to Remix.
+## Documentation
 
-To use this SDK, initialize Sentry in your Remix entry points for both the client and server.
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/remix/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/remix/configuration/)
 
-```ts
-// entry.client.tsx
+## Support
 
-import { useLocation, useMatches } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
-import { useEffect } from 'react';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1,
-  integrations: [
-    Sentry.browserTracingIntegration({
-      useEffect,
-      useLocation,
-      useMatches,
-    }),
-  ],
-  // ...
-});
-```
-
-```ts
-// entry.server.tsx
-
-import { prisma } from '~/db.server';
-
-import * as Sentry from '@sentry/remix';
-
-Sentry.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1,
-  integrations: [Sentry.prismaIntegration()],
-  // ...
-});
-```
-
-Also, wrap your Remix root with `withSentry` to catch React component errors and to get parameterized router
-transactions.
-
-```ts
-// root.tsx
-
-import {
-  Links,
-  LiveReload,
-  Meta,
-  Outlet,
-  Scripts,
-  ScrollRestoration,
-} from "@remix-run/react";
-
-import { withSentry } from "@sentry/remix";
-
-function App() {
-  return (
-    <html>
-      <head>
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <Outlet />
-        <ScrollRestoration />
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-
-export default withSentry(App);
-```
-
-To set context information or send manual events, use the exported functions of `@sentry/remix`.
-
-```ts
-import * as Sentry from '@sentry/remix';
-
-// Set user information, as well as tags and further extras
-Sentry.setExtra('battery', 0.7);
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: 'My Breadcrumb',
-  // ...
-});
-
-// Capture exceptions, messages or manual events
-Sentry.captureMessage('Hello, world!');
-Sentry.captureException(new Error('Good bye'));
-Sentry.captureEvent({
-  message: 'Manual',
-  stacktrace: [
-    // ...
-  ],
-});
-```
-
-## Sourcemaps and Releases
-
-The Remix SDK provides a script that automatically creates a release and uploads sourcemaps. To generate sourcemaps with
-Remix, you need to call `remix build` with the `--sourcemap` option.
-
-On release, call the upload sourcemaps command to upload source maps and create a release:
-
-```bash
-npx @sentry/remix --upload-sourcemaps
-```
-
-To see more details on how to use the command, run `npx @sentry/remix --upload-sourcemaps --help`.
-
-For more advanced configuration,
-[directly use `sentry-cli` to upload source maps.](https://github.com/getsentry/sentry-cli).
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 1d90cacd1b45..5399dcbd29c3 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -51,6 +51,23 @@
       "import": {
         "default": "./build/import-hook.mjs"
       }
+    },
+    "./v3": {
+      "import": {
+        "types": "./build/types/v3/index.server.d.ts",
+        "default": "./build/esm/v3/index.server.js"
+      }
+    },
+    "./v3/client": {
+      "import": {
+        "types": "./build/types/v3/index.client.d.ts",
+        "default": "./build/esm/v3/index.client.js"
+      }
+    },
+    "./v3/node": {
+      "import": {
+        "default": "./build/v3-node.mjs"
+      }
     }
   },
   "publishConfig": {
@@ -58,8 +75,9 @@
   },
   "dependencies": {
     "@remix-run/router": "^1.23.4",
+    "@sentry/browser": "11.0.0",
     "@sentry/bundler-plugins": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/react": "11.0.0",
@@ -81,7 +99,8 @@
     "@remix-run/node": "2.x",
     "@remix-run/react": "2.x",
     "@remix-run/server-runtime": "2.x",
-    "react": "18.x"
+    "react": "18.x",
+    "remix": ">=3.0.0-rc.1 <4"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
@@ -115,9 +134,27 @@
           "{projectRoot}/build/cjs",
           "{projectRoot}/build/npm/esm",
           "{projectRoot}/build/npm/cjs",
-          "{projectRoot}/build/import-hook.mjs"
+          "{projectRoot}/build/import-hook.mjs",
+          "{projectRoot}/build/v3-node.mjs"
         ]
       }
     }
+  },
+  "peerDependenciesMeta": {
+    "@remix-run/node": {
+      "optional": true
+    },
+    "@remix-run/react": {
+      "optional": true
+    },
+    "@remix-run/server-runtime": {
+      "optional": true
+    },
+    "react": {
+      "optional": true
+    },
+    "remix": {
+      "optional": true
+    }
   }
 }
diff --git a/packages/remix/rollup.npm.config.mjs b/packages/remix/rollup.npm.config.mjs
index 9bf3f04f3ee3..d6992abc3302 100644
--- a/packages/remix/rollup.npm.config.mjs
+++ b/packages/remix/rollup.npm.config.mjs
@@ -1,10 +1,19 @@
+import { defineConfig } from 'rollup';
 import { makeBaseNPMConfig, makeNPMConfigVariants, makeOrchestrionLoader } from '@sentry-internal/rollup-utils';
 
+// `external: /.*/` keeps the `remix` import a runtime resolution against the installed package.
+const v3NodeEntry = defineConfig({
+  input: 'src/v3/node.mjs',
+  external: /.*/,
+  output: { format: 'esm', file: 'build/v3-node.mjs' },
+});
+
 // We rely on esbuild's defaults for JSX (`jsx: 'transform'` = classic runtime, no
 // __self/__source attributes). React 19 prefers the new automatic transform, but switching
 // to it would break React 17 support — so we intentionally stay on classic for now.
 // https://legacy.reactjs.org/blog/2020/09/22/introducing-the-new-jsx-transform.html
 export default [
+  v3NodeEntry,
   ...makeNPMConfigVariants(
     makeBaseNPMConfig({
       entrypoints: [
@@ -14,12 +23,17 @@ export default [
         'src/server/index.ts',
         'src/cloudflare/index.ts',
         'src/vite/index.ts',
+        'src/v3/index.server.ts',
+        'src/v3/index.client.ts',
       ],
       packageSpecificConfig: {
         external: ['react-router', 'react-router-dom', 'react', 'react/jsx-runtime'],
         output: {
           // make it so Rollup calms down about the fact that we're combining default and named exports
           exports: 'named',
+          // Without this, Rollup infers a common root from the whole module graph, which here reaches
+          // into sibling workspace packages, and the v3 entries land outside `build/esm/v3/`.
+          preserveModulesRoot: 'src',
         },
       },
     }),
diff --git a/packages/remix/src/server/index.ts b/packages/remix/src/server/index.ts
index f019b947d1ab..3d713e88b0f3 100644
--- a/packages/remix/src/server/index.ts
+++ b/packages/remix/src/server/index.ts
@@ -126,6 +126,8 @@ export {
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
+  instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentStateGraph,
   instrumentStateGraphCompile,
   zodErrorsIntegration,
diff --git a/packages/remix/src/v3/index.client.ts b/packages/remix/src/v3/index.client.ts
new file mode 100644
index 000000000000..7cdc7036be5a
--- /dev/null
+++ b/packages/remix/src/v3/index.client.ts
@@ -0,0 +1,8 @@
+// A named list rather than `export * from '@sentry/browser'`: Remix 3 has no bundler, so a wildcard
+// makes every export reachable and nothing can be tree shaken out of the served module graph.
+//
+// `init` is withheld until the Remix 3 browser SDK lands. Re-exporting `@sentry/browser`'s would give
+// an app History based tracing, which yields no navigation spans in Remix 3, so it would look
+// configured while reporting nothing.
+export { captureException, captureMessage } from '@sentry/browser';
+export type { BrowserOptions } from '@sentry/browser';
diff --git a/packages/remix/src/v3/index.server.ts b/packages/remix/src/v3/index.server.ts
new file mode 100644
index 000000000000..107a51657aca
--- /dev/null
+++ b/packages/remix/src/v3/index.server.ts
@@ -0,0 +1,4 @@
+// Placeholder until the Remix 3 server instrumentation lands. `@sentry/node`'s `init` already emits
+// `http.server` spans, so this is useful on its own; route parameterisation and router error capture
+// are what is still missing.
+export * from '@sentry/node';
diff --git a/packages/remix/src/v3/node.mjs b/packages/remix/src/v3/node.mjs
new file mode 100644
index 000000000000..4923bc078d97
--- /dev/null
+++ b/packages/remix/src/v3/node.mjs
@@ -0,0 +1,3 @@
+// Replaces `--import remix/node-tsx` rather than adding a second flag. Sentry's module hook is
+// registered here once the server instrumentation lands, so for now nothing is instrumented.
+await import('remix/node-tsx');
diff --git a/packages/remix/test/v3-exports.test.ts b/packages/remix/test/v3-exports.test.ts
new file mode 100644
index 000000000000..96e2c033ae76
--- /dev/null
+++ b/packages/remix/test/v3-exports.test.ts
@@ -0,0 +1,66 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as semver from 'semver';
+import { describe, expect, it } from 'vitest';
+
+import packageJson from '../package.json';
+
+const packageRoot = path.resolve(__dirname, '..');
+
+// `exports` mixes shapes (`"./package.json"` is a bare string), so it does not fit one index signature.
+const exportsMap = packageJson.exports as unknown as Record<string, { import?: Record<string, string> }>;
+
+/**
+ * A mismatch between the `exports` map and the build output is invisible: the build and lint both
+ * pass, and the package is broken only for whoever installs it. Rollup infers its output layout from
+ * the module graph, so an unrelated change can relocate these files.
+ */
+describe('Remix 3 exports', () => {
+  const subpaths = ['./v3', './v3/client', './v3/node'];
+
+  it.each(subpaths)('%s is declared in the exports map', subpath => {
+    expect(packageJson.exports).toHaveProperty([subpath]);
+  });
+
+  it.each(subpaths)('%s only exposes an import condition', subpath => {
+    // Remix 3's asset server rejects CommonJS outright, so a `require` condition could never load.
+    expect(Object.keys(exportsMap[subpath] ?? {})).toEqual(['import']);
+  });
+
+  it.each(subpaths)('%s points at files that exist in the build output', subpath => {
+    const targets = Object.values(exportsMap[subpath]?.import ?? {});
+
+    expect(targets.length).toBeGreaterThan(0);
+
+    for (const target of targets) {
+      expect(fs.existsSync(path.join(packageRoot, target)), `${subpath} -> ${target} is missing`).toBe(true);
+    }
+  });
+
+  describe('the Remix 3 peer range', () => {
+    const range = packageJson.peerDependencies.remix;
+
+    // Asserted by behaviour, so the range can change after Remix 3 reaches GA without failing here.
+    it('accepts release candidates', () => {
+      // `3.x` does not match `3.0.0-rc.1`: semver ranges exclude prereleases unless they name one.
+      expect(semver.satisfies('3.0.0-rc.1', range)).toBe(true);
+      expect(semver.satisfies('3.0.0-rc.2', range)).toBe(true);
+    });
+
+    it('accepts stable 3.x', () => {
+      expect(semver.satisfies('3.0.0', range)).toBe(true);
+      expect(semver.satisfies('3.4.2', range)).toBe(true);
+    });
+
+    it('rejects the next major', () => {
+      expect(semver.satisfies('4.0.0', range)).toBe(false);
+    });
+  });
+
+  it('marks every peer dependency optional', () => {
+    // A Remix 3 app must not have the Remix 2 packages or React installed on its behalf.
+    for (const name of Object.keys(packageJson.peerDependencies)) {
+      expect(packageJson.peerDependenciesMeta, `${name} should be optional`).toHaveProperty([name, 'optional'], true);
+    }
+  });
+});
diff --git a/packages/replay-canvas/README.md b/packages/replay-canvas/README.md
index fcd12924e638..2faf422d6e30 100644
--- a/packages/replay-canvas/README.md
+++ b/packages/replay-canvas/README.md
@@ -6,49 +6,19 @@
 
 # Sentry Session Replay with Canvas
 
+Canvas recording support for Sentry Session Replay.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages. It is re-exported from
 > `@sentry/browser` and other browser-related SDKs like `@sentry/react` and `@sentry/vue`. It is not part of the public
 > API contract and may change in any release. Do not rely on SemVer compatibility if you depend on it directly.
 
-## Pre-requisites
-
-Replay with canvas requires Node 14+, and browsers newer than IE11.
-
-## Installation
-
-Replay and ReplayCanvas can be imported from `@sentry/browser`, or a respective SDK package like `@sentry/react` or
-`@sentry/vue`. You don't need to install anything in order to use Session Replay. The minimum version that includes
-Replay is 7.27.0.
-
-For details on using Replay when using Sentry via the CDN bundles, see [CDN bundle](#loading-replay-as-a-cdn-bundle).
-
-## Setup
-
-To set up the canvas integration, add the following to your Sentry integrations:
-
-```javascript
-Sentry.replayCanvasIntegration(),
-```
-
-### Full Example
-
-```javascript
-import * as Sentry from '@sentry/browser';
-// or e.g. import * as Sentry from '@sentry/react';
-
-Sentry.init({
-  dsn: '__DSN__',
+## Documentation
 
-  // This sets the sample rate to be 10%. You may want this to be 100% while
-  // in development and sample at a lower rate in production
-  replaysSessionSampleRate: 0.1,
+- [Canvas recording](https://docs.sentry.io/platforms/javascript/session-replay/#canvas-recording)
+- [Session Replay configuration](https://docs.sentry.io/platforms/javascript/session-replay/configuration/)
 
-  // If the entire session is not sampled, use the below sample rate to sample
-  // sessions when an error occurs.
-  replaysOnErrorSampleRate: 1.0,
+## Support
 
-  integrations: [Sentry.replayIntegration(), Sentry.replayCanvasIntegration()],
-  // ...
-});
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/replay-internal/README.md b/packages/replay-internal/README.md
index 0660c3f3c86e..fcd27ef14bd1 100644
--- a/packages/replay-internal/README.md
+++ b/packages/replay-internal/README.md
@@ -10,248 +10,19 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/replay.svg)](https://www.npmjs.com/package/@sentry/replay)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/replay.svg)](https://www.npmjs.com/package/@sentry/replay)
 
+Session Replay integration for Sentry’s JavaScript SDKs.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages. It is re-exported from
 > `@sentry/browser` and other browser-related SDKs like `@sentry/react` and `@sentry/vue`. It is not part of the public
 > API contract and may change in any release. Do not rely on SemVer compatibility if you depend on it directly.
 
-## Pre-requisites
-
-`@sentry/replay` requires Node 14+, and browsers newer than IE11.
-
-## Installation
-
-Replay can be imported from `@sentry/browser`, or a respective SDK package like `@sentry/react` or `@sentry/vue`. You
-don't need to install anything in order to use Session Replay. The minimum version that includes Replay is 7.27.0.
-
-For details on using Replay when using Sentry via the CDN bundles, see [CDN bundle](#loading-replay-as-a-cdn-bundle).
-
-## Setup
-
-To set up the integration, add the following to your Sentry initialization. Several options are supported and passable
-via the integration constructor. See the [configuration section](#configuration) below for more details.
-
-```javascript
-import * as Sentry from '@sentry/browser';
-// or e.g. import * as Sentry from '@sentry/react';
-
-Sentry.init({
-  dsn: '__DSN__',
-
-  // This sets the sample rate to be 10%. You may want this to be 100% while
-  // in development and sample at a lower rate in production
-  replaysSessionSampleRate: 0.1,
-
-  // If the entire session is not sampled, use the below sample rate to sample
-  // sessions when an error occurs.
-  replaysOnErrorSampleRate: 1.0,
-
-  integrations: [
-    Sentry.replayIntegration({
-      // Additional SDK configuration goes in here, for example:
-      maskAllText: true,
-      blockAllMedia: true,
-      // See below for all available options
-    }),
-  ],
-  // ...
-});
-```
-
-### Lazy loading Replay
-
-Replay will start automatically when you add the integration. If you do not want to start Replay immediately (e.g. if
-you want to lazy-load it), you can also use `addIntegration` to load it later:
-
-```js
-import * as Sentry from "@sentry/react";
-import { BrowserClient } from "@sentry/browser";
-
-Sentry.init({
-  // Do not load it initially
-  integrations: []
-});
-
-// Sometime later
-const { Replay } = await import('@sentry/browser');
-const client = Sentry.getClient<BrowserClient>();
-
-// Client can be undefined
-client?.addIntegration(Sentry.replayIntegration());
-```
-
-### Identifying Users
-
-If you have only followed the above instructions to setup session replays, you will only see IP addresses in Sentry's
-UI. In order to associate a user identity to a session replay, use
-[`setUser`](https://docs.sentry.io/platforms/javascript/enriching-events/identify-user/).
-
-```javascript
-import * as Sentry from '@sentry/browser';
-
-Sentry.setUser({ email: 'jane.doe@example.com' });
-```
-
-### Stopping & starting Replays manually
-
-Replay recording only starts when it is included in the `integrations` array when calling `Sentry.init` or calling
-`addIntegration` from the a Sentry client instance. To stop recording you can call `stop()`.
-
-```js
-import * as Sentry from "@sentry/react";
-import { BrowserClient } from "@sentry/browser";
-
-const replay = Sentry.replayIntegration();
-
-Sentry.init({
-  integrations: [replay]
-});
-
-const client = Sentry.getClient<BrowserClient>();
-
-// Add replay integration, will start recording
-client?.addIntegration(replay);
-
-// Stop recording
-replay.stop();
-```
-
-When both `replaysSessionSampleRate` and `replaysOnErrorSampleRate` are `0`, recording will _not_ start. In this case,
-you can manually start recording:
-
-```js
-replay.start(); // Will start a session in "session" mode, regardless of sample rates
-replay.startBuffering(); // Will start a session in "buffer" mode, regardless of sample rates
-```
-
-## Loading Replay as a CDN Bundle
-
-As an alternative to the NPM package, you can use Replay as a CDN bundle. Please refer to the
-[Session Replay installation guide](https://docs.sentry.io/platforms/javascript/session-replay/#install) for CDN bundle
-instructions.
-
-<details>
-<summary>Deprecated Replay integration bundle</summary>
-Installing the replay integration as a secondary integration bundle to the SDK bundle was deprecated in favour of
-complete CDN bundles that already contain the replay integration. No need to keep two bundles in sync anymore.
-The `replay.(min.)js` bundle will be removed in v8 of the JS SDKs.
-
-```html
-<script src="https://browser.sentry-cdn.com/7.41.0/bundle.min.js" crossorigin="anonymous"></script>
-<script src="https://browser.sentry-cdn.com/7.41.0/replay.min.js" crossorigin="anonymous"></script>
-```
-
-</details>
-
-## Sessions
-
-A session starts when the Session Replay SDK is first loaded and initialized. The session will continue until 5 minutes
-passes without any user interactions[^1] with the application _OR_ until a maximum of 30 minutes have elapsed. Closing
-the browser tab will end the session immediately according to the rules for
-[SessionStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage).
-
-[^1]: An 'interaction' refers to either a mouse click or a browser navigation event.
-
-### Accessing the Replay Session ID
-
-You can get the ID of the currently running session via `replay.getReplayId()`. This will return `undefined` if no
-session is ongoing.
-
-### Replay Captures Only on Errors
-
-Alternatively, rather than recording an entire session, you can capture a replay only when an error occurs. In this
-case, the integration will buffer up to one minute worth of events prior to the error being thrown. It will continue to
-record the session following the rules above regarding session life and activity. Read the [sampling](#Sampling) section
-for configuration options.
-
-## Sampling
-
-Sampling allows you to control how much of your website's traffic will result in a Session Replay. There are two sample
-rates you can adjust to get the replays more relevant to your interests:
-
-- `replaysSessionSampleRate` - The sample rate for replays that begin recording immediately and last the entirety of the
-  user's session.
-- `replaysOnErrorSampleRate` - The sample rate for replays that are recorded when an error happens. This type of replay
-  will record up to a minute of events prior to the error and continue recording until the session ends.
-
-When Replay is initialized, we check the `replaysSessionSampleRate`. If it is sampled, then we start recording & sending
-Replay data immediately. Else, if `replaysOnErrorSampleRate > 0`, we'll start recording in buffering mode. In this mode,
-whenever an error occurs we'll check `replaysOnErrorSampleRate`. If it is sampled, when we'll upload the Replay to
-Sentry and continue recording normally.
-
-## Configuration
-
-### SDK Configuration
-
-The following options can be configured on the root level of your browser-based Sentry SDK, in `init({})`:
-
-| key                      | type   | default | description                                                                                                                                                                                                                                                     |
-| ------------------------ | ------ | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| replaysSessionSampleRate | number | `0`     | The sample rate for replays that begin recording immediately and last the entirety of the user's session. 1.0 will collect all replays, 0 will collect no replays.                                                                                              |
-| replaysOnErrorSampleRate | number | `0`     | The sample rate for replays that are recorded when an error happens. This type of replay will record up to a minute of events prior to the error and continue recording until the session ends. 1.0 capturing all sessions with an error, and 0 capturing none. |
-
-### General Integration Configuration
-
-The following options can be configured as options to the integration, in `Sentry.replayIntegration({})`:
-
-| key           | type    | default | description                                                                                                                                                                       |
-| ------------- | ------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| stickySession | boolean | `true`  | Keep track of the user across page loads. Note a single user using multiple tabs will result in multiple sessions. Closing a tab will result in the session being closed as well. |
-
-### Privacy Configuration
-
-The following options can be configured as options to the integration, in `Sentry.replayIntegration({})`:
-
-| key           | type                     | default                                | description                                                                                                                                  |
-| ------------- | ------------------------ | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
-| maskAllText   | boolean                  | `true`                                 | Mask _all_ text content. Will pass text content through `maskFn` before sending to server.                                                   |
-| maskAllInputs | boolean                  | `true`                                 | Mask values of `<input>` elements. Passes input values through `maskInputFn` before sending to server.                                       |
-| blockAllMedia | boolean                  | `true`                                 | Block _all_ media elements (`img, svg, video, object, picture, embed, map, audio`)                                                           |
-| maskFn        | (text: string) => string | `(text) => '*'.repeat(text.length)`    | Function to customize how text content is masked before sending to server. By default, masks text with `*`.                                  |
-| block         | Array<string>            | `.sentry-block, [data-sentry-block]`   | Redact any elements that match the DOM selectors. See [privacy](#blocking) section for an example.                                           |
-| unblock       | Array<string>            | []                                     | Do not redact any elements that match the DOM selectors. Useful when using `blockAllMedia`. See [privacy](#blocking) section for an example. |
-| mask          | Array<string>            | `.sentry-mask, [data-sentry-mask]`     | Mask all elements that match the given DOM selectors. See [privacy](#masking) section for an example.                                        |
-| unmask        | Array<string>            | []                                     | Unmask all elements that match the given DOM selectors. Useful when using `maskAllText`. See [privacy](#masking) section for an example.     |
-| ignore        | Array<string>            | `.sentry-ignore, [data-sentry-ignore]` | Ignores all events on the matching input fields. See [privacy](#ignoring) section for an example.                                            |
-
-## Privacy
-
-There are several ways to deal with PII. By default, the integration will mask all text content with `*` and block all
-media elements (`img, svg, video, object, picture, embed, map, audio`). This can be disabled by setting `maskAllText` to
-`false`. It is also possible to add the following CSS classes to specific DOM elements to prevent recording its
-contents: `sentry-block`, `sentry-ignore`, and `sentry-mask`. The following sections will show examples of how content
-is handled by the differing methods.
-
-### Masking
-
-Masking replaces the text content with something else. The default masking behavior is to replace each character with a
-`*`. In this example the relevant html code is: `<table class="sentry-mask">...</table>`.
-![Masking example](https://user-images.githubusercontent.com/79684/193118192-dee1d3d8-5813-47e8-b532-f9ee1c8714b3.png)
-
-### Blocking
-
-Blocking replaces the element with a placeholder that has the same dimensions. The recording will show an empty space
-where the content was. In this example the relevant html code is: `<table data-sentry-block>...</table>`.
-![Blocking example](https://user-images.githubusercontent.com/79684/193118084-51a589fc-2160-476a-a8dc-b681eddb136c.png)
-
-### Ignoring
-
-Ignoring only applies to form inputs. Events will be ignored on the input element so that the replay does not show what
-occurs inside of the input. In the below example, notice how the results in the table below the input changes, but no
-text is visible in the input.
-
-https://user-images.githubusercontent.com/79684/192815134-a6451c3f-d3cb-455f-a699-7c3fe04d0a2e.mov
-
-## Error Linking
+## Documentation
 
-Currently, errors that happen on the page while a replay is running are linked to the Replay, making it as easy as
-possible to jump between related issues/replays. However, please note that it is _possible_ that the error count
-reported on the Replay Detail page does not match the actual errors that have been captured. The reason for that is that
-errors _can_ be lost, e.g. a network request fails, or similar. This should not happen to often, but be aware that it is
-theoretically possible.
+- [Getting started](https://docs.sentry.io/platforms/javascript/session-replay/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/session-replay/configuration/)
 
-## Manually sending replay data
+## Support
 
-You can use `replay.flush()` to immediately send all currently captured replay data. When Replay is currently in
-buffering mode, this will send up to the last 60 seconds of replay data, and also continue sending afterwards, similar
-to when an error happens & is recorded.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/replay-internal/test/unit/util/addEvent.test.ts b/packages/replay-internal/test/unit/util/addEvent.test.ts
index cd37c3f79275..f600ab14727c 100644
--- a/packages/replay-internal/test/unit/util/addEvent.test.ts
+++ b/packages/replay-internal/test/unit/util/addEvent.test.ts
@@ -97,7 +97,7 @@ describe('Unit | util | addEvent', () => {
     expect(recordDroppedEventSpy).not.toHaveBeenCalled();
   });
 
-  it('stops when exceeding buffer size limit', async function () {
+  it('stops when exceeding buffer size limit', { timeout: 10_000 }, async function () {
     vi.setSystemTime(BASE_TIMESTAMP);
 
     const replay = setupReplayContainer({
diff --git a/packages/replay-worker/README.md b/packages/replay-worker/README.md
index 9afc37e85b95..b201205667bc 100644
--- a/packages/replay-worker/README.md
+++ b/packages/replay-worker/README.md
@@ -6,14 +6,26 @@
 
 # Sentry Session Replay Worker
 
-This is an internal package that is used by @sentry/replay. It generates a web worker and converts it to a
-string, so that we can process it easier in replay.
+Compression worker for Sentry Session Replay.
 
 By extracting this into a dedicated (private, internal) package, we can streamline the build of replay.
 
+> [!NOTE]
+> This is a private package used internally by Sentry’s JavaScript SDKs. It is not part of the public API contract
+> and may change at any time.
+
 ## Example Worker
 
 You can find an example worker for if you want to self-host the compression worker in [/examples](./examples/).
 
 This is generated from the actual source via `yarn build:examples`, which should be run manually whenever replay-worker
 is updated.
+
+## Documentation
+
+- [Session Replay documentation](https://docs.sentry.io/platforms/javascript/session-replay/)
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/server-runtime-injection/README.md b/packages/server-runtime-injection/README.md
index e7c09f0935f0..6ad8c1d61ac5 100644
--- a/packages/server-runtime-injection/README.md
+++ b/packages/server-runtime-injection/README.md
@@ -8,15 +8,23 @@
 
 [![npm version](https://img.shields.io/npm/v/@sentry/server-runtime-injection.svg)](https://www.npmjs.com/package/@sentry/server-runtime-injection)
 
-This is an internal package for the Sentry JavaScript SDKs. It is not part of the public API contract
-and may change at any time.
+Runtime instrumentation for Sentry’s JavaScript server SDKs.
 
-It contains the **runtime** diagnostics-channel injection used by the server SDKs — the module hooks
-that transform instrumented dependencies as they load at runtime (`register`, `hook`, `import-hook`),
-together with the vendored code transformer they rely on.
+> [!NOTE]
+> This package is an internal library published for use by Sentry-owned JavaScript SDK packages. It is not part of the
+> public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on it directly.
 
 > **Important:** this package must be kept **external** (not bundled) when bundling a server. Its
 > runtime hook loads a transformer that self-references its own on-disk `node_modules` location;
 > bundling it strips the transformer and breaks that self-reference. When you bundle your server,
 > either keep `@sentry/server-runtime-injection` external, or rely on the build-time instrumentation
 > from the Sentry bundler plugins instead.
+
+## Documentation
+
+- [JavaScript SDK documentation](https://docs.sentry.io/platforms/javascript/)
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/server-runtime-injection/package.json b/packages/server-runtime-injection/package.json
index 1720537ea844..3322f556a7c5 100644
--- a/packages/server-runtime-injection/package.json
+++ b/packages/server-runtime-injection/package.json
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@apm-js-collab/code-transformer": "^0.18.1",
-    "@apm-js-collab/tracing-hooks": "^0.13.2",
+    "@apm-js-collab/tracing-hooks": "^0.13.3",
     "@types/node": "^18.19.1",
     "@vercel/nft": "^1.3.0",
     "meriyah": "^6.1.4"
diff --git a/packages/server-runtime-injection/src/register.ts b/packages/server-runtime-injection/src/register.ts
index 38b55efe48d7..d84c2d76ec97 100644
--- a/packages/server-runtime-injection/src/register.ts
+++ b/packages/server-runtime-injection/src/register.ts
@@ -1,5 +1,5 @@
 import { consoleSandbox, debug, getClient, GLOBAL_OBJ, parseSemver } from '@sentry/core';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import * as Module from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
@@ -28,20 +28,63 @@ function hasStableSyncModuleHooks(isDeno: boolean): boolean {
   return major > 25 || (major === 25 && minor >= 1) || (major === 24 && minor >= 13);
 }
 
+/** `"type"` of the nearest `package.json`, keyed by the directory the lookup started in. */
+const packageTypeByDir = new Map<string, string | undefined>();
+
+function getPackageType(dir: string): string | undefined {
+  if (packageTypeByDir.has(dir)) {
+    return packageTypeByDir.get(dir);
+  }
+
+  let type: string | undefined;
+  const packageJsonPath = join(dir, 'package.json');
+  if (existsSync(packageJsonPath)) {
+    try {
+      type = (JSON.parse(readFileSync(packageJsonPath, 'utf8')) as { type?: string }).type;
+    } catch {
+      type = undefined;
+    }
+  } else if (dirname(dir) !== dir) {
+    type = getPackageType(dirname(dir));
+  }
+
+  packageTypeByDir.set(dir, type);
+  return type;
+}
+
+/** The `format` Node would report for `url`, for the formats Deno leaves out. */
+function getMissingDenoFormat(url: string): string | undefined {
+  if (url.endsWith('.json')) {
+    return 'json';
+  }
+  if (url.endsWith('.mjs')) {
+    return 'module';
+  }
+  if (url.startsWith('file:') && url.endsWith('.js') && getPackageType(dirname(fileURLToPath(url))) === 'module') {
+    return 'module';
+  }
+  return undefined;
+}
+
 /**
- * Deno's `nextLoad` reports no `format` for a `.json` file, where Node reports `'json'`. With any
- * load hook installed, Deno's CJS loader then compiles the JSON as JavaScript and `require()` of it
- * throws `SyntaxError: Unexpected token ':'`. Restoring the format is enough, and only Deno needs
- * it: on Node the format is never missing.
+ * Deno's `nextLoad` reports no `format` for a `.json` file or an ES module, where Node reports
+ * `'json'` or `'module'`. Without the format, Deno's CJS loader compiles JSON as JavaScript
+ * (`SyntaxError: Unexpected token ':'`), and the transform treats an ES module as CommonJS and
+ * injects a `require()` into it (`ReferenceError: require is not defined`). The format is restored
+ * on the `nextLoad` result, so the transform sees it too. Only Deno needs this.
  */
-function withDenoJsonFormat(loadHook: Function): Function {
-  return (url: string, context: unknown, nextLoad: Function) => {
-    const result = loadHook(url, context, nextLoad) as { format?: string };
-    if (result?.format === undefined && url.endsWith('.json')) {
-      result.format = 'json';
-    }
-    return result;
-  };
+function withDenoFormats(loadHook: Function): Function {
+  return (url: string, context: unknown, nextLoad: Function) =>
+    loadHook(url, context, (nextUrl: string, nextContext: unknown) => {
+      const result = nextLoad(nextUrl, nextContext) as { format?: string | null } | undefined;
+      if (result && result.format == null) {
+        const format = getMissingDenoFormat(nextUrl);
+        if (format) {
+          result.format = format;
+        }
+      }
+      return result;
+    });
 }
 
 /**
@@ -181,7 +224,7 @@ export function registerDiagnosticsChannelInjection(): void {
   try {
     if (typeof mod.registerHooks === 'function' && stableSyncHooks) {
       initialize({ instrumentations: SENTRY_RUNTIME_INSTRUMENTATIONS });
-      mod.registerHooks({ resolve, load: globalAny.Deno ? withDenoJsonFormat(load) : load });
+      mod.registerHooks({ resolve, load: globalAny.Deno ? withDenoFormats(load) : load });
       debug.log('Registered diagnostics-channel injection via Module.registerHooks()');
     } else if (typeof mod.register === 'function' && !globalAny.Bun && !globalAny.Deno) {
       // `Module.register` + the `_compile` patch is Node 18.19–24.12 / 25.0
diff --git a/packages/server-runtime-injection/test/register.test.ts b/packages/server-runtime-injection/test/register.test.ts
index 18307c0073eb..bab7e6c56c8a 100644
--- a/packages/server-runtime-injection/test/register.test.ts
+++ b/packages/server-runtime-injection/test/register.test.ts
@@ -1,15 +1,27 @@
 import type * as SentryCore from '@sentry/core';
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import type * as NodeModule from 'node:module';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+
+type LoadResult = { format?: string | null };
+type LoadHook = (url: string, context: unknown, nextLoad: (url: string, context: unknown) => LoadResult) => unknown;
 
 // The registration installs real Node module hooks, which we neither want nor need here. Stub the
 // tracing-hooks surface so the tests can drive the diagnostics callback directly, and neuter
 // `node:module`'s hook installers: on Node 24.13+/26 the stable-sync-hooks path would otherwise call
 // the real `Module.registerHooks({ resolve, load })` with the mocked (undefined-returning) callbacks,
 // leaving a broken resolve hook installed process-wide that crashes vitest's next dynamic `import()`.
+const registerHooksMock = vi.fn<(options: { load: LoadHook; resolve: unknown }) => void>();
 vi.mock('node:module', async importOriginal => {
   const actual = await importOriginal<typeof NodeModule>();
-  return { ...actual, registerHooks: vi.fn(), register: vi.fn() };
+  return {
+    ...actual,
+    registerHooks: (options: { load: LoadHook; resolve: unknown }) => registerHooksMock(options),
+    register: vi.fn(),
+  };
 });
 
 const setDiagnosticsHookMock = vi.fn<(cb: DiagnosticsCallback) => void>();
@@ -21,9 +33,10 @@ vi.mock('@apm-js-collab/tracing-hooks', () => ({
     patch(): void {}
   },
 }));
+const loadMock = vi.fn<LoadHook>();
 vi.mock('@apm-js-collab/tracing-hooks/hook-sync.mjs', () => ({
   initialize: vi.fn(),
-  load: vi.fn(),
+  load: (...args: Parameters<LoadHook>) => loadMock(...args),
   resolve: vi.fn(),
   createDiagnosticsPort: vi.fn(),
 }));
@@ -192,3 +205,69 @@ describe('registerDiagnosticsChannelInjection - bundled/tree-shaken detection',
     expect(setDiagnosticsHookMock).toHaveBeenCalledTimes(1);
   });
 });
+
+describe('registerDiagnosticsChannelInjection - Deno module formats', () => {
+  let fixtureDir: string;
+  let registerDiagnosticsChannelInjection: typeof RegisterModule.registerDiagnosticsChannelInjection;
+  let loadHook: LoadHook;
+
+  beforeAll(() => {
+    fixtureDir = mkdtempSync(join(tmpdir(), 'sentry-deno-formats-'));
+    mkdirSync(join(fixtureDir, 'esm-package', 'lib'), { recursive: true });
+    writeFileSync(join(fixtureDir, 'esm-package', 'package.json'), JSON.stringify({ type: 'module' }));
+    writeFileSync(join(fixtureDir, 'esm-package', 'lib', 'index.js'), 'export default 1;');
+    mkdirSync(join(fixtureDir, 'cjs-package'), { recursive: true });
+    writeFileSync(join(fixtureDir, 'cjs-package', 'package.json'), JSON.stringify({}));
+    writeFileSync(join(fixtureDir, 'cjs-package', 'index.js'), 'module.exports = 1;');
+  });
+
+  afterAll(() => {
+    rmSync(fixtureDir, { recursive: true, force: true });
+  });
+
+  beforeEach(async () => {
+    delete GLOBAL_OBJ.__SENTRY_ORCHESTRION__;
+    (globalThis as { Deno?: unknown }).Deno = { version: { deno: '2.8.3' } };
+    vi.resetModules();
+    registerHooksMock.mockClear();
+    // The transform reads the format from what `nextLoad` returns, so the stub forwards to it.
+    loadMock.mockImplementation((url, context, nextLoad) => nextLoad(url, context));
+
+    ({ registerDiagnosticsChannelInjection } = await import('../src/register'));
+    registerDiagnosticsChannelInjection();
+
+    const [options] = registerHooksMock.mock.lastCall ?? [];
+    if (!options) {
+      throw new Error('registerDiagnosticsChannelInjection() did not call Module.registerHooks()');
+    }
+    loadHook = options.load;
+  });
+
+  afterEach(() => {
+    delete GLOBAL_OBJ.__SENTRY_ORCHESTRION__;
+    delete (globalThis as { Deno?: unknown }).Deno;
+    loadMock.mockReset();
+  });
+
+  it.each([
+    ['a `.js` file in a `"type": "module"` package', 'esm-package/lib/index.js', 'module'],
+    ['an `.mjs` file', 'cjs-package/other.mjs', 'module'],
+    ['a `.json` file', 'cjs-package/package.json', 'json'],
+  ])('restores the format Deno leaves out for %s', (_label, file, format) => {
+    const url = pathToFileURL(join(fixtureDir, file)).href;
+
+    expect(loadHook(url, {}, () => ({ format: null }))).toEqual({ format });
+  });
+
+  it('keeps the format missing for a `.js` file in a package without `"type": "module"`', () => {
+    const url = pathToFileURL(join(fixtureDir, 'cjs-package', 'index.js')).href;
+
+    expect(loadHook(url, {}, () => ({ format: null }))).toEqual({ format: null });
+  });
+
+  it('keeps a format that Deno reports', () => {
+    const url = pathToFileURL(join(fixtureDir, 'esm-package', 'lib', 'index.js')).href;
+
+    expect(loadHook(url, {}, () => ({ format: 'commonjs' }))).toEqual({ format: 'commonjs' });
+  });
+});
diff --git a/packages/server-utils/.oxlintrc.json b/packages/server-utils/.oxlintrc.json
index 4a3a8ff955c7..d9e07c9dd0cd 100644
--- a/packages/server-utils/.oxlintrc.json
+++ b/packages/server-utils/.oxlintrc.json
@@ -17,7 +17,24 @@
     {
       "files": ["**/src/**"],
       "rules": {
-        "sdk/no-class-field-initializers": "off"
+        "sdk/no-class-field-initializers": "off",
+        "no-restricted-imports": [
+          "error",
+          {
+            "paths": [
+              {
+                "name": "node:diagnostics_channel",
+                "allowTypeImports": true,
+                "message": "Bun garbage-collects a channel that no code references, together with its subscribers. Import the wrappers from `src/utils/diagnosticsChannel.ts` instead. See https://github.com/oven-sh/bun/issues/43086"
+              },
+              {
+                "name": "diagnostics_channel",
+                "allowTypeImports": true,
+                "message": "Bun garbage-collects a channel that no code references, together with its subscribers. Import the wrappers from `src/utils/diagnosticsChannel.ts` instead. See https://github.com/oven-sh/bun/issues/43086"
+              }
+            ]
+          }
+        ]
       }
     },
     {
diff --git a/packages/server-utils/README.md b/packages/server-utils/README.md
index 6cad314e2c62..913702972808 100644
--- a/packages/server-utils/README.md
+++ b/packages/server-utils/README.md
@@ -10,15 +10,17 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/server-utils.svg)](https://www.npmjs.com/package/@sentry/server-utils)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/server-utils.svg)](https://www.npmjs.com/package/@sentry/server-utils)
 
+Shared server-side utilities used by Sentry’s JavaScript SDKs.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages. It is not part of the
 > public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on it directly.
 
-## Links
+## Documentation
 
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+- [JavaScript SDK documentation](https://docs.sentry.io/platforms/javascript/)
 
-## General
+## Support
 
-Common server-only utilities used by the Sentry JavaScript server SDKs (node, bun, deno, cloudflare,
-aws-serverless, google-cloud-serverless, vercel-edge).
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/server-utils/package.json b/packages/server-utils/package.json
index 236c63d10dbc..8596c73ebe2d 100644
--- a/packages/server-utils/package.json
+++ b/packages/server-utils/package.json
@@ -89,7 +89,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0"
   },
   "devDependencies": {
diff --git a/packages/server-utils/src/ai/google-genai/streaming.ts b/packages/server-utils/src/ai/google-genai/streaming.ts
index a846d549d516..4937b0742b3e 100644
--- a/packages/server-utils/src/ai/google-genai/streaming.ts
+++ b/packages/server-utils/src/ai/google-genai/streaming.ts
@@ -72,6 +72,7 @@ function handleResponseMetadata(chunk: GoogleGenAIResponse, state: StreamingStat
  * @param recordOutputs - Whether to record outputs
  */
 function handleCandidateContent(chunk: GoogleGenAIResponse, state: StreamingState, recordOutputs: boolean): void {
+  // The SDK getter already extracts function calls from candidate parts.
   if (Array.isArray(chunk.functionCalls)) {
     state.toolCalls.push(...chunk.functionCalls);
   }
@@ -87,14 +88,6 @@ function handleCandidateContent(chunk: GoogleGenAIResponse, state: StreamingStat
 
     for (const part of candidate?.content?.parts ?? []) {
       if (recordOutputs && part.text) state.responseTexts.push(part.text);
-      if (part.functionCall) {
-        state.toolCalls.push({
-          type: 'function',
-          id: part.functionCall.id,
-          name: part.functionCall.name,
-          arguments: part.functionCall.args,
-        });
-      }
     }
   }
 }
diff --git a/packages/server-utils/src/ai/index.ts b/packages/server-utils/src/ai/index.ts
index d45ece7e300f..3fc0f4bd5fc9 100644
--- a/packages/server-utils/src/ai/index.ts
+++ b/packages/server-utils/src/ai/index.ts
@@ -8,6 +8,7 @@ export { instrumentOpenAiClient } from './openai';
 export { instrumentAnthropicAiClient } from './anthropic-ai';
 export { instrumentGoogleGenAIClient } from './google-genai';
 export { instrumentMistralAiClient } from './mistral';
+export { instrumentTypeSafeClient } from './typesafe';
 export { instrumentWorkersAiClient } from './workers-ai';
 export { createLangChainCallbackHandler, instrumentLangChainEmbeddings } from './langchain';
 export { instrumentStateGraph, instrumentStateGraphCompile, instrumentCreateReactAgent } from './langgraph';
diff --git a/packages/server-utils/src/ai/typesafe/constants.ts b/packages/server-utils/src/ai/typesafe/constants.ts
new file mode 100644
index 000000000000..47c71bda6fb9
--- /dev/null
+++ b/packages/server-utils/src/ai/typesafe/constants.ts
@@ -0,0 +1,5 @@
+export const TYPESAFE_INTEGRATION_NAME = 'TypeSafe' as const;
+
+export const TYPESAFE_PROVIDER_NAME = 'typesafe' as const;
+
+export const TYPESAFE_ORIGIN = 'auto.ai.typesafe' as const;
diff --git a/packages/server-utils/src/ai/typesafe/index.ts b/packages/server-utils/src/ai/typesafe/index.ts
new file mode 100644
index 000000000000..b8fe48878024
--- /dev/null
+++ b/packages/server-utils/src/ai/typesafe/index.ts
@@ -0,0 +1,174 @@
+import {
+  GEN_AI_INPUT_MESSAGES,
+  GEN_AI_OPERATION_NAME,
+  GEN_AI_OUTPUT_MESSAGES,
+  GEN_AI_PROVIDER_NAME,
+  GEN_AI_REQUEST_MODEL,
+  GEN_AI_RESPONSE_MODEL,
+  GEN_AI_USAGE_INPUT_TOKENS,
+  GEN_AI_USAGE_OUTPUT_TOKENS,
+  GEN_AI_USAGE_TOTAL_TOKENS,
+} from '@sentry/conventions/attributes';
+import type { Span, SpanAttributes } from '@sentry/core';
+import {
+  isObjectLike,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SPAN_STATUS_ERROR,
+  startInactiveSpan,
+  stringify,
+  withActiveSpan,
+} from '@sentry/core';
+import type { GenAiOptions } from '../core/utils';
+import { getGenAiSpanOp, resolveAIRecordingOptions } from '../core/utils';
+import { TYPESAFE_ORIGIN, TYPESAFE_PROVIDER_NAME } from './constants';
+
+/**
+ * Start the span for a `systemOne(request)` call. The request model falls back to the client's
+ * `defaultModel`, the same way the SDK resolves it.
+ */
+export function startEvaluateSpan(request: unknown, client: unknown, recordInputs: boolean): Span {
+  const params = isObjectLike(request) ? request : {};
+  const defaultModel = isObjectLike(client) ? client.defaultModel : undefined;
+  const model =
+    typeof params.model === 'string' ? params.model : typeof defaultModel === 'string' ? defaultModel : undefined;
+
+  return startInactiveSpan({
+    name: model ? `evaluate ${model}` : 'evaluate',
+    op: getGenAiSpanOp('evaluate'),
+    attributes: getRequestAttributes(params, model, recordInputs),
+  });
+}
+
+function getRequestAttributes(
+  request: Record<string, unknown>,
+  model: string | undefined,
+  recordInputs: boolean,
+): SpanAttributes {
+  return {
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: TYPESAFE_ORIGIN,
+    [GEN_AI_OPERATION_NAME]: 'evaluate',
+    [GEN_AI_PROVIDER_NAME]: TYPESAFE_PROVIDER_NAME,
+    ...(model ? { [GEN_AI_REQUEST_MODEL]: model } : {}),
+    ...(recordInputs
+      ? {
+          [GEN_AI_INPUT_MESSAGES]: stringify([
+            { type: 'evaluation', state: request.state, questions: request.questions },
+          ]),
+        }
+      : {}),
+  };
+}
+
+/** Add the response model, token usage and (optionally) the answers of a `systemOne` result. */
+export function addResponseAttributes(span: Span, result: unknown, recordOutputs: boolean): void {
+  if (!isObjectLike(result)) {
+    return;
+  }
+
+  if (typeof result.model === 'string') {
+    span.setAttribute(GEN_AI_RESPONSE_MODEL, result.model);
+  }
+
+  const usage = isObjectLike(result.usage) ? result.usage : undefined;
+  const inputTokens = typeof usage?.input_tokens === 'number' ? usage.input_tokens : undefined;
+  const outputTokens = typeof usage?.output_tokens === 'number' ? usage.output_tokens : undefined;
+  if (inputTokens !== undefined) {
+    span.setAttribute(GEN_AI_USAGE_INPUT_TOKENS, inputTokens);
+  }
+  if (outputTokens !== undefined) {
+    span.setAttribute(GEN_AI_USAGE_OUTPUT_TOKENS, outputTokens);
+  }
+  if (inputTokens !== undefined && outputTokens !== undefined) {
+    span.setAttribute(GEN_AI_USAGE_TOTAL_TOKENS, inputTokens + outputTokens);
+  }
+
+  if (recordOutputs && result.answers !== undefined) {
+    span.setAttribute(GEN_AI_OUTPUT_MESSAGES, stringify([{ type: 'evaluation', answers: result.answers }]));
+  }
+}
+
+/**
+ * `systemOne` returns a lazy `APIPromise` before the request settles, and parses the body on the first
+ * `.then()`. Wait on `asResponse()` (the raw fetch, which does not parse the body) and read a clone of
+ * the body, so the caller's own parse is unaffected. Call this before the caller can await the result,
+ * so the clone is taken first. Returns `false` when `result` is not an `APIPromise`.
+ */
+export function onSystemOneResponse(
+  result: unknown,
+  onBody: (body: unknown) => void,
+  onError: (error: unknown) => void,
+): boolean {
+  if (!isObjectLike(result) || typeof result.asResponse !== 'function') {
+    return false;
+  }
+
+  (result.asResponse() as Promise<Response>).then(
+    response =>
+      response
+        .clone()
+        .json()
+        .then(
+          body => onBody(body),
+          () => onBody(undefined),
+        ),
+    error => onError(error),
+  );
+
+  return true;
+}
+
+/**
+ * Instrument a TypeSafe client (`@typesafe-ai/sdk`) with Sentry tracing.
+ */
+export function instrumentTypeSafeClient<T extends object>(client: T, options?: GenAiOptions): T {
+  return new Proxy(client, {
+    get(target, prop) {
+      // Read with the real client as receiver: the SDK keeps its API key in a private class field.
+      const value: unknown = Reflect.get(target, prop, target);
+      if (typeof value !== 'function') {
+        return value;
+      }
+      if (prop === 'systemOne') {
+        return (...args: unknown[]) =>
+          instrumentSystemOne(value as (...args: unknown[]) => unknown, target, args, options);
+      }
+      return value.bind(target);
+    },
+  });
+}
+
+function instrumentSystemOne(
+  systemOne: (...args: unknown[]) => unknown,
+  client: object,
+  args: unknown[],
+  options: GenAiOptions | undefined,
+): unknown {
+  const { recordInputs, recordOutputs } = resolveAIRecordingOptions(options);
+  const span = startEvaluateSpan(args[0], client, recordInputs);
+  const endWithError = (): void => {
+    span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+    span.end();
+  };
+
+  let result: unknown;
+  try {
+    result = withActiveSpan(span, () => systemOne.apply(client, args));
+  } catch (error) {
+    endWithError();
+    throw error;
+  }
+
+  const waiting = onSystemOneResponse(
+    result,
+    body => {
+      addResponseAttributes(span, body, recordOutputs);
+      span.end();
+    },
+    endWithError,
+  );
+  if (!waiting) {
+    span.end();
+  }
+
+  return result;
+}
diff --git a/packages/server-utils/src/index.ts b/packages/server-utils/src/index.ts
index 54e82b0dae6f..23515673a427 100644
--- a/packages/server-utils/src/index.ts
+++ b/packages/server-utils/src/index.ts
@@ -13,6 +13,10 @@ export type { InstrumentationConfig } from './orchestrion/apmTypes';
 // `orchestrion/bundler/moduleInjectedTransform.ts`); it is a plain runtime
 // helper with no orchestrion build-time dependency.
 export { orchestrionModuleInjected } from './utils/moduleInjected';
+export {
+  subscribe as subscribeDiagnosticsChannel,
+  tracingChannel as diagnosticsTracingChannel,
+} from './utils/diagnosticsChannel';
 export { eveConversationHook, eveIntegration } from './eve';
 export { getInstrumentedModuleNames } from './orchestrion/config';
 export {
@@ -46,6 +50,7 @@ export { createFlueInstrumentation } from './ai/flue';
 export { flueIntegration } from './integrations/flue';
 export type { FlueOptions } from './ai/flue';
 export { mastraIntegration } from './integrations/mastra';
+export { mcpServerIntegration } from './integrations/mcp-server';
 export { SentryMastraExporter } from './ai/mastra';
 export { lruMemoizerIntegration } from './integrations/lru-memoizer';
 export { mongoIntegration } from './integrations/mongodb';
@@ -53,6 +58,7 @@ export { mongooseIntegration } from './integrations/mongoose';
 export { mistralAIIntegration } from './integrations/mistral';
 export { groqIntegration } from './integrations/groq';
 export { togetherAIIntegration } from './integrations/together-ai';
+export { typesafeIntegration } from './integrations/typesafe';
 export { mysqlIntegration } from './integrations/mysql';
 export { mysql2Integration } from './integrations/mysql2';
 export { openAIIntegration } from './integrations/openai';
diff --git a/packages/server-utils/src/integrations/amqplib.ts b/packages/server-utils/src/integrations/amqplib.ts
index 864022d8d291..b67b546d8b2f 100644
--- a/packages/server-utils/src/integrations/amqplib.ts
+++ b/packages/server-utils/src/integrations/amqplib.ts
@@ -1,5 +1,5 @@
 /* eslint-disable max-lines */
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span, SpanAttributes } from '@sentry/core';
 import {
   continueTrace,
diff --git a/packages/server-utils/src/integrations/anthropic.ts b/packages/server-utils/src/integrations/anthropic.ts
index 87bce3b9c199..c8638acc0a28 100644
--- a/packages/server-utils/src/integrations/anthropic.ts
+++ b/packages/server-utils/src/integrations/anthropic.ts
@@ -1,5 +1,5 @@
 import { GEN_AI_REQUEST_MODEL } from '@sentry/conventions/attributes';
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span, SpanAttributeValue } from '@sentry/core';
 import {
   _INTERNAL_shouldSkipAiProviderWrapping,
diff --git a/packages/server-utils/src/integrations/aws-sdk/index.ts b/packages/server-utils/src/integrations/aws-sdk/index.ts
index 1b0656551a10..eb966dcd56c6 100644
--- a/packages/server-utils/src/integrations/aws-sdk/index.ts
+++ b/packages/server-utils/src/integrations/aws-sdk/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn, Span } from '@sentry/core';
 import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';
 import {
diff --git a/packages/server-utils/src/integrations/dataloader.ts b/packages/server-utils/src/integrations/dataloader.ts
index be42e44d3006..ac928f3ceeca 100644
--- a/packages/server-utils/src/integrations/dataloader.ts
+++ b/packages/server-utils/src/integrations/dataloader.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import {
   CACHE_KEY,
   CACHE_OPERATION,
diff --git a/packages/server-utils/src/integrations/express/index.ts b/packages/server-utils/src/integrations/express/index.ts
index 52598014408d..c53ff8fcf6bb 100644
--- a/packages/server-utils/src/integrations/express/index.ts
+++ b/packages/server-utils/src/integrations/express/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import { expressModuleNames } from '../../orchestrion/config/express';
diff --git a/packages/server-utils/src/integrations/fastify/errors.ts b/packages/server-utils/src/integrations/fastify/errors.ts
index 1dcc5d5bc9ad..3ef6ad596863 100644
--- a/packages/server-utils/src/integrations/fastify/errors.ts
+++ b/packages/server-utils/src/integrations/fastify/errors.ts
@@ -1,5 +1,5 @@
 import type { FastifyIntegration, FastifyReply, FastifyRequest } from './types';
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import { addNonEnumerableProperty, captureException, getClient } from '@sentry/core';
 import { defaultShouldHandleError, INTEGRATION_NAME } from './utils';
 
diff --git a/packages/server-utils/src/integrations/fastify/instrumentation.ts b/packages/server-utils/src/integrations/fastify/instrumentation.ts
index c64f16d1d67a..92f71c908fe4 100644
--- a/packages/server-utils/src/integrations/fastify/instrumentation.ts
+++ b/packages/server-utils/src/integrations/fastify/instrumentation.ts
@@ -14,7 +14,7 @@
 /* eslint-disable @typescript-eslint/no-this-alias */
 /* eslint-disable max-lines */
 
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import {
   HTTP_REQUEST_METHOD,
   HTTP_RESPONSE_STATUS_CODE,
diff --git a/packages/server-utils/src/integrations/firebase/instrumentation.ts b/packages/server-utils/src/integrations/firebase/instrumentation.ts
index 0951e85194a6..5fcadfd2ae45 100644
--- a/packages/server-utils/src/integrations/firebase/instrumentation.ts
+++ b/packages/server-utils/src/integrations/firebase/instrumentation.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import { CHANNELS } from '../../orchestrion/channels';
 import { bindTracingChannelToSpan, safeChannelCallback } from '../../tracing-channel';
 import type { FirestoreReference } from './firestore-types';
diff --git a/packages/server-utils/src/integrations/generic-pool.ts b/packages/server-utils/src/integrations/generic-pool.ts
index ad6452e85f65..40d0f4c530a1 100644
--- a/packages/server-utils/src/integrations/generic-pool.ts
+++ b/packages/server-utils/src/integrations/generic-pool.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import { SENTRY_OP } from '@sentry/conventions/attributes';
 import { DB } from '@sentry/conventions/op';
 import type { IntegrationFn } from '@sentry/core';
diff --git a/packages/server-utils/src/integrations/google-genai.ts b/packages/server-utils/src/integrations/google-genai.ts
index 9c37a5351f7e..6ddaf8757d6a 100644
--- a/packages/server-utils/src/integrations/google-genai.ts
+++ b/packages/server-utils/src/integrations/google-genai.ts
@@ -1,5 +1,5 @@
 import { GEN_AI_REQUEST_MODEL, SENTRY_OP, SENTRY_ORIGIN } from '@sentry/conventions/attributes';
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span } from '@sentry/core';
 import {
   _INTERNAL_shouldSkipAiProviderWrapping,
diff --git a/packages/server-utils/src/integrations/graphql/index.ts b/packages/server-utils/src/integrations/graphql/index.ts
index bd204e21eda7..e0397b1ac769 100644
--- a/packages/server-utils/src/integrations/graphql/index.ts
+++ b/packages/server-utils/src/integrations/graphql/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration, waitForTracingChannelBinding } from '@sentry/core';
 import { subscribeGraphqlDiagnosticChannels, type GraphQLOptions } from './graphql-dc-subscriber';
diff --git a/packages/server-utils/src/integrations/hapi/index.ts b/packages/server-utils/src/integrations/hapi/index.ts
index 70c462ca0324..e7b8af943694 100644
--- a/packages/server-utils/src/integrations/hapi/index.ts
+++ b/packages/server-utils/src/integrations/hapi/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import { CHANNELS } from '../../orchestrion/channels';
diff --git a/packages/server-utils/src/integrations/index.ts b/packages/server-utils/src/integrations/index.ts
index fa6cf1759906..3546d98d0310 100644
--- a/packages/server-utils/src/integrations/index.ts
+++ b/packages/server-utils/src/integrations/index.ts
@@ -16,6 +16,7 @@ import { lruMemoizerIntegration } from './lru-memoizer';
 import { langChainIntegration } from './langchain';
 import { langGraphIntegration } from './langgraph';
 import { mastraIntegration } from './mastra';
+import { mcpServerIntegration } from './mcp-server';
 import { vercelAIIntegration } from './vercel-ai';
 import { openAIIntegration } from './openai';
 import { anthropicAIIntegration } from './anthropic';
@@ -23,6 +24,7 @@ import { googleGenAIIntegration } from './google-genai';
 import { mistralAIIntegration } from './mistral';
 import { groqIntegration } from './groq';
 import { togetherAIIntegration } from './together-ai';
+import { typesafeIntegration } from './typesafe';
 import { postgresJsIntegration } from './postgres-js';
 import { firebaseIntegration } from './firebase';
 import { expressIntegration } from './express';
@@ -63,8 +65,10 @@ export function getTracingIntegrations(): Integration[] {
     mistralAIIntegration(),
     groqIntegration(),
     togetherAIIntegration(),
+    typesafeIntegration(),
     postgresJsIntegration(),
     firebaseIntegration(),
+    mcpServerIntegration(),
   ];
 }
 
diff --git a/packages/server-utils/src/integrations/kafkajs/index.ts b/packages/server-utils/src/integrations/kafkajs/index.ts
index 21d08cb536f0..5160dedf80ca 100644
--- a/packages/server-utils/src/integrations/kafkajs/index.ts
+++ b/packages/server-utils/src/integrations/kafkajs/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { TracingChannelSubscribers } from 'node:diagnostics_channel';
 import type { IntegrationFn, Span } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
diff --git a/packages/server-utils/src/integrations/knex.ts b/packages/server-utils/src/integrations/knex.ts
index e326a2e7a7ec..5d85d1491682 100644
--- a/packages/server-utils/src/integrations/knex.ts
+++ b/packages/server-utils/src/integrations/knex.ts
@@ -2,7 +2,7 @@
 // emit them deliberately to preserve parity with what `@opentelemetry/instrumentation-knex` produced.
 /* oxlint-disable typescript/no-deprecated */
 
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span, SpanAttributes } from '@sentry/core';
 import {
   debug,
diff --git a/packages/server-utils/src/integrations/koa/index.ts b/packages/server-utils/src/integrations/koa/index.ts
index caa21288c656..3ee982041147 100644
--- a/packages/server-utils/src/integrations/koa/index.ts
+++ b/packages/server-utils/src/integrations/koa/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import {
   addNonEnumerableProperty,
diff --git a/packages/server-utils/src/integrations/langchain.ts b/packages/server-utils/src/integrations/langchain.ts
index 0e8016853445..d8513a80b926 100644
--- a/packages/server-utils/src/integrations/langchain.ts
+++ b/packages/server-utils/src/integrations/langchain.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span } from '@sentry/core';
 import { _INTERNAL_skipAiProviderWrapping, defineIntegration, startInactiveSpan } from '@sentry/core';
 import { ANTHROPIC_AI_INTEGRATION_NAME } from '../ai/anthropic-ai/constants';
diff --git a/packages/server-utils/src/integrations/langgraph.ts b/packages/server-utils/src/integrations/langgraph.ts
index 124260fe4029..a6b9f6f21541 100644
--- a/packages/server-utils/src/integrations/langgraph.ts
+++ b/packages/server-utils/src/integrations/langgraph.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import { debug, defineIntegration } from '@sentry/core';
 import { resolveAIRecordingOptions } from '../ai/core/utils';
diff --git a/packages/server-utils/src/integrations/lru-memoizer.ts b/packages/server-utils/src/integrations/lru-memoizer.ts
index 070d431bea99..6bb2b8acbd53 100644
--- a/packages/server-utils/src/integrations/lru-memoizer.ts
+++ b/packages/server-utils/src/integrations/lru-memoizer.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import { CHANNELS } from '../orchestrion/channels';
diff --git a/packages/server-utils/src/integrations/mastra.ts b/packages/server-utils/src/integrations/mastra.ts
index 7a6b4c1f2a50..cfd1c5c70995 100644
--- a/packages/server-utils/src/integrations/mastra.ts
+++ b/packages/server-utils/src/integrations/mastra.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import { createRequire } from 'node:module';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
diff --git a/packages/server-utils/src/integrations/mcp-server.ts b/packages/server-utils/src/integrations/mcp-server.ts
new file mode 100644
index 000000000000..8f3a75f1a0f1
--- /dev/null
+++ b/packages/server-utils/src/integrations/mcp-server.ts
@@ -0,0 +1,54 @@
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
+import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
+import { wrapMcpServerWithSentry } from '@sentry/core/server';
+import { CHANNELS } from '../orchestrion/channels';
+import { mcpServerModuleNames } from '../orchestrion/config/mcp-server';
+import { invokeOrchestrionInstrumentation } from '../orchestrion/instrumentation';
+import { safeChannelCallback } from '../tracing-channel';
+
+const INTEGRATION_NAME = 'McpServer';
+
+interface ConstructorChannelContext {
+  arguments: unknown[];
+  self?: unknown;
+}
+
+const _mcpServerIntegration = (() => {
+  return {
+    name: INTEGRATION_NAME,
+    setup(client) {
+      // `wrapMcpServerWithSentry` only patches methods on the freshly-built instance; it opens no
+      // spans itself (those come later from the wrapped transport), so a missing async-context
+      // binding must not defer the subscription.
+      invokeOrchestrionInstrumentation(client, mcpServerModuleNames, subscribe, [], {
+        requiresTracingChannelBinding: false,
+      });
+    },
+  };
+}) satisfies IntegrationFn;
+
+function subscribe(): void {
+  // Wrap each newly-constructed `McpServer` the moment its constructor returns. This is the
+  // automatic equivalent of a user calling `wrapMcpServerWithSentry(new McpServer(...))`; the
+  // wrap's own `WeakSet` guard makes a later manual call on the same instance a no-op, so the two
+  // paths coexist safely.
+  for (const channel of [CHANNELS.MCP_SERVER_V2_CONSTRUCTOR, CHANNELS.MCP_SERVER_V1_CONSTRUCTOR]) {
+    diagnosticsChannel.tracingChannel<ConstructorChannelContext>(channel).end.subscribe(message => {
+      safeChannelCallback(() => {
+        const { self } = message as ConstructorChannelContext;
+        if (self) {
+          wrapMcpServerWithSentry(self);
+        }
+      });
+    });
+  }
+}
+
+/**
+ * Auto-instruments `@modelcontextprotocol/server` (v2) and `@modelcontextprotocol/sdk` (v1)
+ * `McpServer` instances, so users no longer have to wrap them with `wrapMcpServerWithSentry`
+ * by hand. Enabled by default. Requires the runtime hook or a bundler plugin (orchestrion) to
+ * inject the constructor channel.
+ */
+export const mcpServerIntegration = defineIntegration(_mcpServerIntegration);
diff --git a/packages/server-utils/src/integrations/mistral.ts b/packages/server-utils/src/integrations/mistral.ts
index 7d53c2047cf8..117f0f965c0b 100644
--- a/packages/server-utils/src/integrations/mistral.ts
+++ b/packages/server-utils/src/integrations/mistral.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span, SpanAttributeValue } from '@sentry/core';
 import {
   _INTERNAL_shouldSkipAiProviderWrapping,
diff --git a/packages/server-utils/src/integrations/mongodb/index.ts b/packages/server-utils/src/integrations/mongodb/index.ts
index 777764554f00..6f492a575a6b 100644
--- a/packages/server-utils/src/integrations/mongodb/index.ts
+++ b/packages/server-utils/src/integrations/mongodb/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import type { MongodbNamespace, MongoV3Topology } from './mongodb-span';
diff --git a/packages/server-utils/src/integrations/mongoose/index.ts b/packages/server-utils/src/integrations/mongoose/index.ts
index d08ffb1e0a14..4e00635939c1 100644
--- a/packages/server-utils/src/integrations/mongoose/index.ts
+++ b/packages/server-utils/src/integrations/mongoose/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn, Span } from '@sentry/core';
 import { defineIntegration, getActiveSpan, waitForTracingChannelBinding } from '@sentry/core';
 import { subscribeMongooseDiagnosticChannels } from './mongoose-dc-subscriber';
diff --git a/packages/server-utils/src/integrations/mysql.ts b/packages/server-utils/src/integrations/mysql.ts
index f8a9b73464c8..ccbbad5a1565 100644
--- a/packages/server-utils/src/integrations/mysql.ts
+++ b/packages/server-utils/src/integrations/mysql.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import {
   DB_NAMESPACE,
   DB_QUERY_SUMMARY,
diff --git a/packages/server-utils/src/integrations/mysql2/index.ts b/packages/server-utils/src/integrations/mysql2/index.ts
index 751a3ae9c2c3..4d01b681f1ce 100644
--- a/packages/server-utils/src/integrations/mysql2/index.ts
+++ b/packages/server-utils/src/integrations/mysql2/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import type { IntegrationFn, SpanAttributes } from '@sentry/core';
 import {
   defineIntegration,
diff --git a/packages/server-utils/src/integrations/openai-compatible.ts b/packages/server-utils/src/integrations/openai-compatible.ts
index ae5c76a86135..b62764bb9473 100644
--- a/packages/server-utils/src/integrations/openai-compatible.ts
+++ b/packages/server-utils/src/integrations/openai-compatible.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { Integration, IntegrationFn, Span, SpanAttributeValue } from '@sentry/core';
 import {
   _INTERNAL_shouldSkipAiProviderWrapping,
diff --git a/packages/server-utils/src/integrations/openai.ts b/packages/server-utils/src/integrations/openai.ts
index e284d3b1bc4a..138cad048f93 100644
--- a/packages/server-utils/src/integrations/openai.ts
+++ b/packages/server-utils/src/integrations/openai.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, Span, SpanAttributeValue } from '@sentry/core';
 import {
   _INTERNAL_shouldSkipAiProviderWrapping,
diff --git a/packages/server-utils/src/integrations/postgres-js.ts b/packages/server-utils/src/integrations/postgres-js.ts
index 24cf8e6c656a..afb8d5ecc099 100644
--- a/packages/server-utils/src/integrations/postgres-js.ts
+++ b/packages/server-utils/src/integrations/postgres-js.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import {
   DB_OPERATION_NAME,
   DB_QUERY_SUMMARY,
diff --git a/packages/server-utils/src/integrations/postgres.ts b/packages/server-utils/src/integrations/postgres.ts
index 350e7d5d41a2..1e7f0fdeb018 100644
--- a/packages/server-utils/src/integrations/postgres.ts
+++ b/packages/server-utils/src/integrations/postgres.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import {
   DB_NAMESPACE,
   DB_QUERY_SUMMARY,
diff --git a/packages/server-utils/src/integrations/prisma/index.ts b/packages/server-utils/src/integrations/prisma/index.ts
index 600198f6caec..c67f13645f54 100644
--- a/packages/server-utils/src/integrations/prisma/index.ts
+++ b/packages/server-utils/src/integrations/prisma/index.ts
@@ -1,6 +1,9 @@
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
+import { prismaModuleNames } from '../../orchestrion/config/prisma';
+import { invokeOrchestrionInstrumentation } from '../../orchestrion/instrumentation';
 import { setGlobalTracingHelper } from './global';
+import { instrumentPrismaV8 } from './orchestrion';
 import { ActiveTracingHelper } from './tracing-helper';
 
 const INTEGRATION_NAME = 'Prisma' as const;
@@ -43,6 +46,12 @@ const _prismaIntegration = ((options?: PrismaOptions) => {
     setupOnce() {
       instrumentPrisma(options);
     },
+    // Prisma 8 has no tracing helper to install; its ORM terminals are instrumented via orchestrion instead.
+    setup(client) {
+      invokeOrchestrionInstrumentation(client, prismaModuleNames, instrumentPrismaV8, [
+        { ignoreSpanTypes: options?.instrumentationConfig?.ignoreSpanTypes ?? [] },
+      ]);
+    },
   };
 }) satisfies IntegrationFn;
 
@@ -50,7 +59,9 @@ const _prismaIntegration = ((options?: PrismaOptions) => {
  * Adds Sentry tracing instrumentation for the [prisma](https://www.npmjs.com/package/prisma) library.
  * For more information, see the [`prismaIntegration` documentation](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/prisma/).
  *
- * NOTE: This integration works out of the box with Prisma v6, and v7.
+ * NOTE: This integration works out of the box with Prisma v6, v7 and v8. Prisma v8 ("Prisma Next")
+ * has no tracing surface of its own, so its ORM calls are instrumented through Sentry's runtime hook
+ * or bundler plugin, like the other channel-based integrations.
  * On Prisma versions prior to v6, add `previewFeatures = ["tracing"]` to the client generator block of your Prisma schema:
  *
  *    ```
diff --git a/packages/server-utils/src/integrations/prisma/orchestrion.ts b/packages/server-utils/src/integrations/prisma/orchestrion.ts
new file mode 100644
index 000000000000..b85f7c7d8d45
--- /dev/null
+++ b/packages/server-utils/src/integrations/prisma/orchestrion.ts
@@ -0,0 +1,212 @@
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
+import type { Span } from '@sentry/core';
+import {
+  getActiveSpan,
+  getRootSpan,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  spanIsIgnored,
+  startInactiveSpan,
+  withActiveSpan,
+} from '@sentry/core';
+import { DB_COLLECTION_NAME, DB_OPERATION_NAME, SENTRY_OP } from '@sentry/conventions/attributes';
+import { DB } from '@sentry/conventions/op';
+import { prismaChannels, PRISMA_LAZY_TERMINALS } from '../../orchestrion/config/prisma';
+import type { TracingChannelLifeCycleOptions } from '../../tracing-channel';
+import { bindTracingChannelToSpan, safeChannelCallback } from '../../tracing-channel';
+import { shouldIgnoreSpan } from './tracing-helper';
+
+// Same span name as Prisma v5–v7's own operation span, so the tree looks the same across majors.
+const OPERATION_SPAN_NAME = 'prisma:client:operation';
+const PRISMA_ORIGIN = 'auto.db.prisma';
+
+// Terminals call each other (`delete` reads the row through `first`); only the outermost call is the operation.
+const operationSpans = new WeakSet<Span>();
+
+interface PrismaCollection {
+  modelName?: unknown;
+  tableName?: unknown;
+}
+
+interface PrismaTerminalChannelContext {
+  arguments: unknown[];
+  self?: PrismaCollection;
+  moduleVersion?: string;
+  result?: unknown;
+  error?: unknown;
+}
+
+// Prisma's `AsyncIterableResult`: `await`, `.then()` and `.first()` all funnel through `toArray()`; only
+// `for await` goes through the iterator.
+interface LazyResult {
+  toArray: () => Promise<unknown>;
+  [Symbol.asyncIterator]: () => AsyncIterator<unknown>;
+}
+
+interface PrismaV8InstrumentationOptions {
+  ignoreSpanTypes: (string | RegExp)[];
+}
+
+/**
+ * Opens a `prisma:client:operation` span per ORM call, kept active while the terminal runs so the `pg`
+ * query spans nest under it like the `db_query` spans did on v5–v7.
+ */
+export function instrumentPrismaV8(options: PrismaV8InstrumentationOptions): void {
+  if (shouldIgnoreSpan(OPERATION_SPAN_NAME, options.ignoreSpanTypes)) {
+    return;
+  }
+
+  for (const channelName of Object.values(prismaChannels)) {
+    const method = channelName.slice(channelName.lastIndexOf(':') + 1);
+    const isLazy = (PRISMA_LAZY_TERMINALS as readonly string[]).includes(method);
+
+    bindTracingChannelToSpan<PrismaTerminalChannelContext>(
+      diagnosticsChannel.tracingChannel<PrismaTerminalChannelContext>(channelName),
+      data => startOperationSpan(method, data),
+      {
+        // A stray query outside a request must not become a segment of its own.
+        requiresParentSpan: true,
+        ...(isLazy ? { deferSpanEnd: deferSpanEndUntilConsumed } : {}),
+      },
+    );
+  }
+}
+
+function startOperationSpan(method: string, data: PrismaTerminalChannelContext): Span | undefined {
+  const parentSpan = getActiveSpan();
+  if (parentSpan && operationSpans.has(parentSpan)) {
+    return undefined;
+  }
+
+  const model = stringOrUndefined(data.self?.modelName);
+  const table = stringOrUndefined(data.self?.tableName);
+
+  const span = startInactiveSpan({
+    name: OPERATION_SPAN_NAME,
+    parentSpan,
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: PRISMA_ORIGIN,
+      [SENTRY_OP]: DB,
+      [DB_OPERATION_NAME]: method,
+      [DB_COLLECTION_NAME]: table ?? model,
+      // Prisma v5–v7's own attributes, kept so existing queries keep matching across the major.
+      method,
+      model,
+      name: model ? `${model}.${method}` : method,
+    },
+  });
+  operationSpans.add(span);
+  return span;
+}
+
+// A lazy terminal returns before anything is queried, so the span stays open until the result is consumed,
+// with consumption re-routed through the span's context so the driver call lands under it. A result that is
+// never consumed never ran a query; its span is simply never ended.
+const deferSpanEndUntilConsumed: NonNullable<
+  TracingChannelLifeCycleOptions<PrismaTerminalChannelContext>['deferSpanEnd']
+> = ({ span, data, end }) => {
+  const result = data.result;
+  if (!isLazyResult(result)) {
+    return false;
+  }
+
+  // A throw in a channel subscriber is an uncaught exception; an unpatchable (frozen) result ends the span now.
+  return safeChannelCallback(() => patchConsumption(result, span, end)) ?? false;
+};
+
+function patchConsumption(result: LazyResult, span: Span, end: (error?: unknown) => void): boolean {
+  const toArray = result.toArray;
+  const asyncIterator = result[Symbol.asyncIterator];
+
+  // Built before either is installed, so a failed assignment can't leave a half-patched result.
+  const patchedToArray = function (this: LazyResult): Promise<unknown> {
+    const rows: Promise<unknown> = runUnderSpan(span, () => toArray.call(this));
+    // Chained, not side-observed, so a rejected fire-and-forget `toArray()` still surfaces as unhandled.
+    return rows.then(
+      value => {
+        end();
+        return value;
+      },
+      (error: unknown) => {
+        end(error);
+        throw error;
+      },
+    );
+  };
+  const patchedAsyncIterator = function (this: LazyResult): AsyncIterableIterator<unknown> {
+    return wrapIterator(
+      runUnderSpan(span, () => asyncIterator.call(this)),
+      span,
+      end,
+    );
+  };
+
+  result.toArray = patchedToArray;
+  result[Symbol.asyncIterator] = patchedAsyncIterator;
+
+  return true;
+}
+
+// An ignored child span is never emitted, so its children must keep parenting to the nearest emitted span
+// (same rule as the tracing-channel binding and core `startSpan`).
+function runUnderSpan<T>(span: Span, callback: () => T): T {
+  if (spanIsIgnored(span) && getRootSpan(span) !== span) {
+    return callback();
+  }
+  return withActiveSpan(span, callback);
+}
+
+function wrapIterator(
+  iterator: AsyncIterator<unknown>,
+  span: Span,
+  end: (error?: unknown) => void,
+): AsyncIterableIterator<unknown> {
+  const settle = (step: Promise<IteratorResult<unknown>>): Promise<IteratorResult<unknown>> =>
+    step.then(
+      result => {
+        if (result.done) {
+          end();
+        }
+        return result;
+      },
+      error => {
+        end(error);
+        throw error;
+      },
+    );
+
+  return {
+    next: (...args) => settle(runUnderSpan(span, () => iterator.next(...args))),
+    return: value => {
+      const iteratorReturn = iterator.return?.bind(iterator);
+      if (!iteratorReturn) {
+        end();
+        return Promise.resolve({ done: true, value });
+      }
+      return settle(runUnderSpan(span, () => iteratorReturn(value)));
+    },
+    throw: error => {
+      const iteratorThrow = iterator.throw?.bind(iterator);
+      if (!iteratorThrow) {
+        end(error);
+        return Promise.reject(error);
+      }
+      return settle(runUnderSpan(span, () => iteratorThrow(error)));
+    },
+    [Symbol.asyncIterator]() {
+      return this;
+    },
+  };
+}
+
+function stringOrUndefined(value: unknown): string | undefined {
+  return typeof value === 'string' ? value : undefined;
+}
+
+function isLazyResult(value: unknown): value is LazyResult {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    typeof (value as LazyResult).toArray === 'function' &&
+    typeof (value as LazyResult)[Symbol.asyncIterator] === 'function'
+  );
+}
diff --git a/packages/server-utils/src/integrations/prisma/tracing-helper.ts b/packages/server-utils/src/integrations/prisma/tracing-helper.ts
index bb17556efea1..0cfe6cf471d0 100644
--- a/packages/server-utils/src/integrations/prisma/tracing-helper.ts
+++ b/packages/server-utils/src/integrations/prisma/tracing-helper.ts
@@ -398,6 +398,7 @@ function isPromiseLike(value: unknown): value is PromiseLike<unknown> {
   return value != null && typeof (value as Record<string, unknown>)['then'] === 'function';
 }
 
-function shouldIgnoreSpan(spanName: string, ignoreSpanTypes: (string | RegExp)[]): boolean {
+/** Whether `spanName` matches one of the configured `ignoreSpanTypes` patterns. */
+export function shouldIgnoreSpan(spanName: string, ignoreSpanTypes: (string | RegExp)[]): boolean {
   return ignoreSpanTypes.some(pattern => (typeof pattern === 'string' ? pattern === spanName : pattern.test(spanName)));
 }
diff --git a/packages/server-utils/src/integrations/redis/index.ts b/packages/server-utils/src/integrations/redis/index.ts
index 05e4135ab63c..fb19018aa598 100644
--- a/packages/server-utils/src/integrations/redis/index.ts
+++ b/packages/server-utils/src/integrations/redis/index.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import {
   DB_OPERATION_BATCH_SIZE,
   DB_OPERATION_NAME,
diff --git a/packages/server-utils/src/integrations/redis/ioredis-channel-subscriber.ts b/packages/server-utils/src/integrations/redis/ioredis-channel-subscriber.ts
index ebadce735930..f50060a29a8e 100644
--- a/packages/server-utils/src/integrations/redis/ioredis-channel-subscriber.ts
+++ b/packages/server-utils/src/integrations/redis/ioredis-channel-subscriber.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../../utils/diagnosticsChannel';
 import {
   DB_OPERATION_NAME,
   DB_QUERY_TEXT,
diff --git a/packages/server-utils/src/integrations/tedious.ts b/packages/server-utils/src/integrations/tedious.ts
index 0c1cf4ca4927..a2b3ea352791 100644
--- a/packages/server-utils/src/integrations/tedious.ts
+++ b/packages/server-utils/src/integrations/tedious.ts
@@ -3,7 +3,7 @@
 /* oxlint-disable typescript/no-deprecated */
 
 import { EventEmitter } from 'node:events';
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { IntegrationFn, SpanAttributes } from '@sentry/core';
 import {
   defineIntegration,
diff --git a/packages/server-utils/src/integrations/typesafe.ts b/packages/server-utils/src/integrations/typesafe.ts
new file mode 100644
index 000000000000..594f9df7a068
--- /dev/null
+++ b/packages/server-utils/src/integrations/typesafe.ts
@@ -0,0 +1,62 @@
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
+import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
+import type { GenAiOptions } from '../ai/core/utils';
+import { resolveAIRecordingOptions } from '../ai/core/utils';
+import { addResponseAttributes, onSystemOneResponse, startEvaluateSpan } from '../ai/typesafe';
+import { TYPESAFE_INTEGRATION_NAME } from '../ai/typesafe/constants';
+import { CHANNELS } from '../orchestrion/channels';
+import { typesafeModuleNames } from '../orchestrion/config/typesafe';
+import { invokeOrchestrionInstrumentation } from '../orchestrion/instrumentation';
+import { bindTracingChannelToSpan } from '../tracing-channel';
+
+/**
+ * The context orchestrion shares across the tracing-channel lifecycle hooks: `arguments` is the live
+ * args array passed to `systemOne(request, options)`, `self` the `TypeSafeClient`, and `result` the
+ * returned `APIPromise` (replaced by the parsed response body once it arrives). `Sync` tracing keeps
+ * orchestrion from calling `.then()` on it, see `orchestrion/config/typesafe.ts`.
+ */
+interface TypeSafeChannelContext {
+  arguments: unknown[];
+  self?: unknown;
+  result?: unknown;
+}
+
+const _typesafeIntegration = ((options: GenAiOptions = {}) => {
+  return {
+    name: TYPESAFE_INTEGRATION_NAME,
+    setup(client) {
+      invokeOrchestrionInstrumentation(client, typesafeModuleNames, instrumentTypeSafe, [options]);
+    },
+  };
+}) satisfies IntegrationFn;
+
+function instrumentTypeSafe(options: GenAiOptions): void {
+  bindTracingChannelToSpan(
+    diagnosticsChannel.tracingChannel<TypeSafeChannelContext>(CHANNELS.TYPESAFE_SYSTEM_ONE),
+    data => startEvaluateSpan(data.arguments?.[0], data.self, resolveAIRecordingOptions(options).recordInputs),
+    {
+      beforeSpanEnd: (span, data) => {
+        if (!('error' in data)) {
+          addResponseAttributes(span, data.result, resolveAIRecordingOptions(options).recordOutputs);
+        }
+      },
+      deferSpanEnd: ({ data, end }) =>
+        onSystemOneResponse(
+          data.result,
+          body => {
+            data.result = body;
+            end();
+          },
+          error => end(error),
+        ),
+    },
+  );
+}
+
+/**
+ * Diagnostics-channel-based integration for the TypeSafe SDK (`@typesafe-ai/sdk` >= 0.5.0 < 1).
+ * Subscribes to the `orchestrion:@typesafe-ai/sdk:system-one` channel injected into
+ * `TypeSafeClient.systemOne`, so it requires the Sentry runtime hook or bundler plugin.
+ */
+export const typesafeIntegration = defineIntegration(_typesafeIntegration);
diff --git a/packages/server-utils/src/integrations/vercel-ai/index.ts b/packages/server-utils/src/integrations/vercel-ai/index.ts
index f0387b9ef56b..6cf24b1e70b3 100644
--- a/packages/server-utils/src/integrations/vercel-ai/index.ts
+++ b/packages/server-utils/src/integrations/vercel-ai/index.ts
@@ -1,7 +1,7 @@
 import { defineIntegration, waitForTracingChannelBinding, type IntegrationFn } from '@sentry/core';
 import type { GenAiOptions } from '../../ai/core/utils';
 import { subscribeVercelAiTracingChannel } from './vercel-ai-dc-subscriber';
-import * as dc from 'node:diagnostics_channel';
+import * as dc from '../../utils/diagnosticsChannel';
 import { invokeOrchestrionInstrumentation } from '../../orchestrion/instrumentation';
 import { vercelAiModuleNames } from '../../orchestrion/config/vercel-ai';
 import { subscribeVercelAiOrchestrionChannels } from './vercel-ai-orchestrion-subscriber';
diff --git a/packages/server-utils/src/integrations/vercel-ai/vercel-ai-dc-subscriber.ts b/packages/server-utils/src/integrations/vercel-ai/vercel-ai-dc-subscriber.ts
index 76b1ddda69fc..78b4763f0240 100644
--- a/packages/server-utils/src/integrations/vercel-ai/vercel-ai-dc-subscriber.ts
+++ b/packages/server-utils/src/integrations/vercel-ai/vercel-ai-dc-subscriber.ts
@@ -65,10 +65,14 @@ const AI_SDK_TELEMETRY_TRACING_CHANNEL = 'ai:telemetry';
 
 const ORIGIN = 'auto.vercelai.channel';
 
+// Not yet in `@sentry/conventions`.
+const GEN_AI_EVALUATE = 'gen_ai.evaluate';
+
 // `gen_ai.operation.name` values, keyed to the span op they map to.
 const GEN_AI_OPERATION_SPAN_OPS = {
   embeddings: GEN_AI_EMBEDDINGS,
   rerank: GEN_AI_RERANK,
+  evaluate: GEN_AI_EVALUATE,
   invoke_agent: GEN_AI_INVOKE_AGENT,
   execute_tool: GEN_AI_EXECUTE_TOOL,
   // The model-call op matches the Vercel AI OTel integration (`gen_ai.generate_content`) rather than
@@ -211,7 +215,8 @@ export type ChannelEventType =
   | 'executeTool'
   | 'embed'
   | 'embedMany'
-  | 'rerank';
+  | 'rerank'
+  | 'experimental_evaluate';
 
 /**
  * The context object the AI SDK passes through one tracing-channel call. It is the same object
@@ -444,6 +449,17 @@ export function createSpanFromMessage(
     }
     case 'rerank':
       return startGenAiSpan('rerank', modelId, baseAttributes);
+    case 'experimental_evaluate':
+      return startGenAiSpan('evaluate', modelId, {
+        ...baseAttributes,
+        ...(recordInputs
+          ? {
+              [GEN_AI_INPUT_MESSAGES]: stringify([
+                { type: 'evaluation', state: event.state, questions: event.questions },
+              ]),
+            }
+          : {}),
+      });
     default:
       // Unknown event type: opt out rather than open a span we can't shape correctly.
       return undefined;
@@ -608,19 +624,52 @@ export function enrichSpanOnEnd(
   span.setAttributes(providerAttributes);
 
   if (recordOutputs) {
-    // `languageModelCall` exposes the response as a `content` parts array; top-level results expose
-    // `text` + `toolCalls`. Both normalize into the OTel `gen_ai.output.messages` assistant message.
-    const parts =
-      type === 'languageModelCall' && Array.isArray(result.content)
-        ? partsFromContent(result.content)
-        : partsFromTextAndToolCalls(result.text, result.toolCalls);
-    const outputMessages = buildOutputMessages(parts, finishReason);
+    const outputMessages = getOutputMessages(type, result, finishReason);
     if (outputMessages) {
       span.setAttribute(GEN_AI_OUTPUT_MESSAGES, outputMessages);
     }
   }
 }
 
+function getOutputMessages(
+  type: ChannelEventType,
+  result: Record<string, unknown>,
+  finishReason: string | undefined,
+): string | undefined {
+  if (type === 'experimental_evaluate') {
+    return stringify([{ type: 'evaluation', answers: withProviderConfidence(result) }]);
+  }
+  // `languageModelCall` exposes the response as a `content` parts array; top-level results expose
+  // `text` + `toolCalls`. Both normalize into the OTel `gen_ai.output.messages` assistant message.
+  const parts =
+    type === 'languageModelCall' && Array.isArray(result.content)
+      ? partsFromContent(result.content)
+      : partsFromTextAndToolCalls(result.text, result.toolCalls);
+  return buildOutputMessages(parts, finishReason);
+}
+
+/**
+ * The AI SDK TypeSafe provider moves each answer's `confidence` out of the answers into
+ * `providerMetadata.typesafe.confidence` (keyed by question id). Put it back so evaluate answers keep it.
+ */
+function withProviderConfidence(result: Record<string, unknown>): unknown {
+  const { answers, providerMetadata } = result;
+  const typesafe = isObjectLike(providerMetadata) ? providerMetadata.typesafe : undefined;
+  const confidence = isObjectLike(typesafe) && isObjectLike(typesafe.confidence) ? typesafe.confidence : undefined;
+  if (!confidence || !isObjectLike(answers)) {
+    return answers;
+  }
+
+  return Object.fromEntries(
+    Object.entries(answers).map(([id, answer]) => [
+      id,
+      isObjectLike(answer) && typeof confidence[id] === 'number' && answer.confidence === undefined
+        ? { ...answer, confidence: confidence[id] }
+        : answer,
+    ]),
+  );
+}
+
 /** Maps a Vercel AI finish reason to the OTel `gen_ai.output.messages` form (`tool-calls` → `tool_call`). */
 function normalizeFinishReason(finishReason: string | undefined): string {
   return finishReason === 'tool-calls' ? 'tool_call' : (finishReason ?? 'stop');
diff --git a/packages/server-utils/src/orchestrion/channels.ts b/packages/server-utils/src/orchestrion/channels.ts
index a88495d6ed8c..13eef100a767 100644
--- a/packages/server-utils/src/orchestrion/channels.ts
+++ b/packages/server-utils/src/orchestrion/channels.ts
@@ -17,6 +17,7 @@ import { langchainChannels } from './config/langchain';
 import { langgraphChannels } from './config/langgraph';
 import { lruMemoizerChannels } from './config/lru-memoizer';
 import { mastraChannels } from './config/mastra';
+import { mcpServerChannels } from './config/mcp-server';
 import { mistralChannels } from './config/mistral';
 import { mongodbChannels } from './config/mongodb';
 import { mongooseChannels } from './config/mongoose';
@@ -26,10 +27,12 @@ import { nestjsChannels } from './config/nestjs';
 import { openaiChannels } from './config/openai';
 import { pgChannels } from './config/pg';
 import { postgresJsChannels } from './config/postgres';
+import { prismaChannels } from './config/prisma';
 import { redisChannels } from './config/redis';
 import { remixChannels } from './config/remix';
 import { tediousChannels } from './config/tedious';
 import { togetherAiChannels } from './config/together-ai';
+import { typesafeChannels } from './config/typesafe';
 import { vercelAiChannels } from './config/vercel-ai';
 
 /**
@@ -68,6 +71,7 @@ export const CHANNELS = {
   ...langgraphChannels,
   ...lruMemoizerChannels,
   ...mastraChannels,
+  ...mcpServerChannels,
   ...mistralChannels,
   ...mongodbChannels,
   ...mongooseChannels,
@@ -77,10 +81,12 @@ export const CHANNELS = {
   ...openaiChannels,
   ...pgChannels,
   ...postgresJsChannels,
+  ...prismaChannels,
   ...redisChannels,
   ...remixChannels,
   ...tediousChannels,
   ...togetherAiChannels,
+  ...typesafeChannels,
   ...vercelAiChannels,
 } as const;
 
diff --git a/packages/server-utils/src/orchestrion/config/amqplib.ts b/packages/server-utils/src/orchestrion/config/amqplib.ts
index e5e6e5439484..a8f0e4fe61b4 100644
--- a/packages/server-utils/src/orchestrion/config/amqplib.ts
+++ b/packages/server-utils/src/orchestrion/config/amqplib.ts
@@ -12,7 +12,7 @@ import { getModuleNames } from './module-names';
 //   to capture connection attributes.
 //
 // The version range mirrors `supportedVersions` in the vendored OTel instrumentation.
-const module = { name: 'amqplib', versionRange: '>=0.5.5 <2' } as const;
+const module = { name: 'amqplib', versionRange: '>=0.5.5 <3' } as const;
 
 export const amqplibConfig = [
   // Producer span + trace-header injection. `sendToQueue` delegates to `publish`, so it's covered.
diff --git a/packages/server-utils/src/orchestrion/config/channel-integration-definitions.ts b/packages/server-utils/src/orchestrion/config/channel-integration-definitions.ts
index 881a38da55fd..2f24d7865c18 100644
--- a/packages/server-utils/src/orchestrion/config/channel-integration-definitions.ts
+++ b/packages/server-utils/src/orchestrion/config/channel-integration-definitions.ts
@@ -18,6 +18,7 @@
 export const CHANNEL_INTEGRATION_DEFINITIONS = [
   { exportName: 'postgresIntegration', modules: ['pg', 'pg-pool'] },
   { exportName: 'postgresJsIntegration', modules: ['postgres'] },
+  { exportName: 'prismaIntegration', modules: ['@prisma/orm-family-sql'] },
   { exportName: 'mysqlIntegration', modules: ['mysql'] },
   { exportName: 'mysql2Integration', modules: ['mysql2'] },
   { exportName: 'mongoIntegration', modules: ['mongodb'] },
@@ -32,6 +33,7 @@ export const CHANNEL_INTEGRATION_DEFINITIONS = [
   { exportName: 'mistralAIIntegration', modules: ['@mistralai/mistralai'] },
   { exportName: 'groqIntegration', modules: ['groq-sdk'] },
   { exportName: 'togetherAIIntegration', modules: ['together-ai'] },
+  { exportName: 'typesafeIntegration', modules: ['@typesafe-ai/sdk'] },
   { exportName: 'vercelAIIntegration', modules: ['ai'] },
   {
     exportName: 'langChainIntegration',
@@ -46,6 +48,7 @@ export const CHANNEL_INTEGRATION_DEFINITIONS = [
   { exportName: 'langGraphIntegration', modules: ['@langchain/langgraph'] },
   { exportName: 'mastraIntegration', modules: ['@mastra/core'] },
   { exportName: 'flueIntegration', modules: ['@flue/runtime'] },
+  { exportName: 'mcpServerIntegration', modules: ['@modelcontextprotocol/server', '@modelcontextprotocol/sdk'] },
   { exportName: 'awsIntegration', modules: ['@aws-sdk/smithy-client', '@smithy/core', '@smithy/smithy-client'] },
   { exportName: 'firebaseIntegration', modules: ['@firebase/firestore', 'firebase-functions'] },
   { exportName: 'amqplibIntegration', modules: ['amqplib'] },
diff --git a/packages/server-utils/src/orchestrion/config/index.ts b/packages/server-utils/src/orchestrion/config/index.ts
index 0ed9055935d4..2d44898747ed 100644
--- a/packages/server-utils/src/orchestrion/config/index.ts
+++ b/packages/server-utils/src/orchestrion/config/index.ts
@@ -22,6 +22,7 @@ import { langgraphConfig } from './langgraph';
 import { lruMemoizerConfig } from './lru-memoizer';
 import { flueConfig } from './flue';
 import { mastraConfig } from './mastra';
+import { mcpServerConfig } from './mcp-server';
 import { mistralConfig } from './mistral';
 import { mongodbConfig } from './mongodb';
 import { mongooseConfig } from './mongoose';
@@ -31,10 +32,12 @@ import { nestjsConfig } from './nestjs';
 import { openaiConfig } from './openai';
 import { pgConfig } from './pg';
 import { postgresJsConfig } from './postgres';
+import { prismaConfig } from './prisma';
 import { redisConfig } from './redis';
 import { remixConfig } from './remix';
 import { tediousConfig } from './tedious';
 import { togetherAiConfig } from './together-ai';
+import { typesafeConfig } from './typesafe';
 import { vercelAiConfig } from './vercel-ai';
 // Kept sorted alphabetically by module so concurrent additions insert at different
 // points rather than all appending to the end (fewer merge conflicts).
@@ -73,6 +76,7 @@ export const SENTRY_INSTRUMENTATIONS: InstrumentationConfig[] = [
   ...lruMemoizerConfig,
   ...flueConfig,
   ...mastraConfig,
+  ...mcpServerConfig,
   ...mistralConfig,
   ...mongodbConfig,
   ...mongooseConfig,
@@ -82,10 +86,12 @@ export const SENTRY_INSTRUMENTATIONS: InstrumentationConfig[] = [
   ...openaiConfig,
   ...pgConfig,
   ...postgresJsConfig,
+  ...prismaConfig,
   ...redisConfig,
   ...remixConfig,
   ...tediousConfig,
   ...togetherAiConfig,
+  ...typesafeConfig,
   ...vercelAiConfig,
 ];
 
diff --git a/packages/server-utils/src/orchestrion/config/mcp-server.ts b/packages/server-utils/src/orchestrion/config/mcp-server.ts
new file mode 100644
index 000000000000..afa43f729878
--- /dev/null
+++ b/packages/server-utils/src/orchestrion/config/mcp-server.ts
@@ -0,0 +1,51 @@
+import type { InstrumentationConfig } from '../apmTypes';
+
+import { getModuleNames } from './module-names';
+
+// `@modelcontextprotocol/server` v2 ships pre-bundled (tsdown) in content-hashed chunks:
+// `class McpServer` lives only in `dist/mcp-<hash>.{mjs,cjs}` (2.0.0: `mcp-DXXb3Vv3.mjs`,
+// `mcp-D7GmuPnv.cjs`), while the stable `dist/index.mjs` is a pure re-export. An exact
+// `filePath` therefore cannot target the constructor, so the pattern matches any `mcp-*`
+// chunk in `dist/` and `className: 'McpServer'` stays the real selector — the same shape
+// `mastra.ts` uses for its hashed `Mastra` chunk. `McpServer.connect()` delegates to the
+// underlying `Server`/`Protocol`, so hooking the constructor is enough to reach everything.
+const mcpServerV2Config: InstrumentationConfig[] = [
+  {
+    channelName: 'mcpServerConstructor',
+    module: {
+      name: '@modelcontextprotocol/server',
+      versionRange: '>=2.0.0 <3',
+      filePath: /^dist\/mcp-[\w-]+\.(?:cjs|mjs)$/,
+    },
+    // No `methodName` → class constructor. The `end` message's `self` is the new instance.
+    functionQuery: { className: 'McpServer' },
+  },
+];
+
+// `@modelcontextprotocol/sdk` v1 ships unbundled, so `McpServer` sits at a stable path — the
+// subpath export `.../server/mcp.js` resolves to `dist/{cjs,esm}/server/mcp.js`. The regex
+// matches both build flavors from the module root without hard-coding the `dist/esm` vs
+// `dist/cjs` prefix, and `className: 'McpServer'` stays the real selector.
+const mcpServerV1Config: InstrumentationConfig[] = [
+  {
+    channelName: 'mcpServerConstructor',
+    module: {
+      name: '@modelcontextprotocol/sdk',
+      versionRange: '>=1.9.0 <2',
+      filePath: /(?:^|\/)server\/mcp\.js$/,
+    },
+    functionQuery: { className: 'McpServer' },
+  },
+];
+
+export const mcpServerConfig = [...mcpServerV2Config, ...mcpServerV1Config] satisfies InstrumentationConfig[];
+
+export const mcpServerModuleNames = getModuleNames(mcpServerConfig);
+
+export const mcpServerChannels = {
+  // Orchestrion prefixes each `channelName` with `orchestrion:${module.name}:`, so v1 and v2
+  // publish to distinct channels even though the suffix is shared — the integration subscribes
+  // to both.
+  MCP_SERVER_V2_CONSTRUCTOR: 'orchestrion:@modelcontextprotocol/server:mcpServerConstructor',
+  MCP_SERVER_V1_CONSTRUCTOR: 'orchestrion:@modelcontextprotocol/sdk:mcpServerConstructor',
+} as const;
diff --git a/packages/server-utils/src/orchestrion/config/prisma.ts b/packages/server-utils/src/orchestrion/config/prisma.ts
new file mode 100644
index 000000000000..73d6b1a77607
--- /dev/null
+++ b/packages/server-utils/src/orchestrion/config/prisma.ts
@@ -0,0 +1,59 @@
+import type { InstrumentationConfig } from '../apmTypes';
+import { getModuleNames } from './module-names';
+
+// Prisma 8 has no tracing surface, so its ORM terminals are wrapped directly. Apps install
+// `@prisma/orm-postgres`, but `CollectionImpl` lives in the transitive `@prisma/orm-family-sql`.
+const MODULE_NAME = '@prisma/orm-family-sql';
+const ORM_CLIENT_FILE = 'dist/orm-client.mjs';
+
+// The range matcher admits every `8.0.0-rc.*`, not just rc.8 and later; the terminals were verified on rc.8.
+const VERSION_RANGE = '>=8.0.0-rc.8 <9';
+
+export const PRISMA_ASYNC_TERMINALS = [
+  'aggregate',
+  'first',
+  'create',
+  'createAndCount',
+  'upsert',
+  'update',
+  'updateAndCount',
+  'delete',
+  'deleteAndCount',
+] as const;
+
+// These return a single-use thenable whose query runs on consumption. `Sync` on purpose: the `Async`/`Auto`
+// wrapper calls `.then()` on non-native thenables and would consume the result before the app does.
+export const PRISMA_LAZY_TERMINALS = ['all', 'createAll', 'updateAll', 'deleteAll'] as const;
+
+type PrismaTerminal = (typeof PRISMA_ASYNC_TERMINALS)[number] | (typeof PRISMA_LAZY_TERMINALS)[number];
+
+function terminalConfig(methodName: PrismaTerminal, kind: 'Async' | 'Sync'): InstrumentationConfig {
+  return {
+    channelName: methodName,
+    module: { name: MODULE_NAME, versionRange: VERSION_RANGE, filePath: ORM_CLIENT_FILE },
+    functionQuery: { className: 'CollectionImpl', methodName, kind },
+  };
+}
+
+export const prismaConfig: InstrumentationConfig[] = [
+  ...PRISMA_ASYNC_TERMINALS.map(methodName => terminalConfig(methodName, 'Async')),
+  ...PRISMA_LAZY_TERMINALS.map(methodName => terminalConfig(methodName, 'Sync')),
+];
+
+export const prismaModuleNames = getModuleNames(prismaConfig);
+
+export const prismaChannels = {
+  PRISMA_AGGREGATE: 'orchestrion:@prisma/orm-family-sql:aggregate',
+  PRISMA_FIRST: 'orchestrion:@prisma/orm-family-sql:first',
+  PRISMA_CREATE: 'orchestrion:@prisma/orm-family-sql:create',
+  PRISMA_CREATE_AND_COUNT: 'orchestrion:@prisma/orm-family-sql:createAndCount',
+  PRISMA_UPSERT: 'orchestrion:@prisma/orm-family-sql:upsert',
+  PRISMA_UPDATE: 'orchestrion:@prisma/orm-family-sql:update',
+  PRISMA_UPDATE_AND_COUNT: 'orchestrion:@prisma/orm-family-sql:updateAndCount',
+  PRISMA_DELETE: 'orchestrion:@prisma/orm-family-sql:delete',
+  PRISMA_DELETE_AND_COUNT: 'orchestrion:@prisma/orm-family-sql:deleteAndCount',
+  PRISMA_ALL: 'orchestrion:@prisma/orm-family-sql:all',
+  PRISMA_CREATE_ALL: 'orchestrion:@prisma/orm-family-sql:createAll',
+  PRISMA_UPDATE_ALL: 'orchestrion:@prisma/orm-family-sql:updateAll',
+  PRISMA_DELETE_ALL: 'orchestrion:@prisma/orm-family-sql:deleteAll',
+} as const;
diff --git a/packages/server-utils/src/orchestrion/config/tedious.ts b/packages/server-utils/src/orchestrion/config/tedious.ts
index 61af25ca2570..943d27cb476b 100644
--- a/packages/server-utils/src/orchestrion/config/tedious.ts
+++ b/packages/server-utils/src/orchestrion/config/tedious.ts
@@ -8,7 +8,7 @@ const MODULE_NAME = 'tedious';
 // OTel `supportedVersions`). Orchestrion never matches a file that doesn't exist, so a single entry is
 // safe even for versions that shipped extra layouts.
 const FILE_PATH = 'lib/connection.js';
-const VERSION_RANGE = '>=1.11.0 <20';
+const VERSION_RANGE = '>=1.11.0 <21';
 
 // `Connection` methods that dispatch a request (each traced as one db span) plus `connect`, which the
 // subscriber wraps for bookkeeping only (tracking the connection's active database, read into `db.name`).
diff --git a/packages/server-utils/src/orchestrion/config/typesafe.ts b/packages/server-utils/src/orchestrion/config/typesafe.ts
new file mode 100644
index 000000000000..b62e97d2fd23
--- /dev/null
+++ b/packages/server-utils/src/orchestrion/config/typesafe.ts
@@ -0,0 +1,18 @@
+import type { InstrumentationConfig } from '../apmTypes';
+
+import { getModuleNames } from './module-names';
+
+// `systemOne` returns a lazy `APIPromise` whose body is parsed on the first `.then()`. `kind: 'Sync'`
+// keeps orchestrion from calling `.then()` on it (which `Auto` would), so a caller's `asResponse()`
+// still gets an unread body. The SDK ships one bundled file per module format.
+export const typesafeConfig = ['dist/index.mjs', 'dist/index.cjs'].map(filePath => ({
+  channelName: 'system-one',
+  module: { name: '@typesafe-ai/sdk', versionRange: '>=0.5.0 <1', filePath },
+  functionQuery: { className: 'TypeSafeClient', methodName: 'systemOne', kind: 'Sync' as const },
+})) satisfies InstrumentationConfig[];
+
+export const typesafeModuleNames = getModuleNames(typesafeConfig);
+
+export const typesafeChannels = {
+  TYPESAFE_SYSTEM_ONE: 'orchestrion:@typesafe-ai/sdk:system-one',
+} as const;
diff --git a/packages/server-utils/src/orchestrion/instrumentation.ts b/packages/server-utils/src/orchestrion/instrumentation.ts
index 304d65d402a6..ded8aa30ac68 100644
--- a/packages/server-utils/src/orchestrion/instrumentation.ts
+++ b/packages/server-utils/src/orchestrion/instrumentation.ts
@@ -1,4 +1,4 @@
-import * as diagnosticsChannel from 'node:diagnostics_channel';
+import * as diagnosticsChannel from '../utils/diagnosticsChannel';
 import type { Client } from '@sentry/core';
 import { addNonEnumerableProperty, debug, waitForTracingChannelBinding } from '@sentry/core';
 import { DEBUG_BUILD } from '../debug-build';
diff --git a/packages/server-utils/src/utils/diagnosticsChannel.ts b/packages/server-utils/src/utils/diagnosticsChannel.ts
new file mode 100644
index 000000000000..0fe8638eb25b
--- /dev/null
+++ b/packages/server-utils/src/utils/diagnosticsChannel.ts
@@ -0,0 +1,52 @@
+// oxlint-disable-next-line no-restricted-imports
+import * as nodeDiagnosticsChannel from 'node:diagnostics_channel';
+
+// Bun garbage-collects a diagnostics channel that no code references, together with its
+// subscribers, so a subscription made at `init()` can stop receiving messages after the next GC.
+// Node and Deno keep a channel alive while it has subscribers. On Bun these wrappers of the
+// `node:diagnostics_channel` functions keep a reference to every channel they return, so the SDK's
+// subscriptions stay active. Other runtimes get the original functions.
+// See https://github.com/oven-sh/bun/issues/43086
+const keepChannelsReferenced = typeof (globalThis as { Bun?: unknown }).Bun !== 'undefined';
+
+const channelsByName = new Map<string | symbol, nodeDiagnosticsChannel.Channel>();
+const tracingChannelsByName = new Map<string, nodeDiagnosticsChannel.TracingChannel>();
+
+/** `diagnostics_channel.channel()`, with the returned channel kept referenced on Bun. */
+export const channel: typeof nodeDiagnosticsChannel.channel = keepChannelsReferenced
+  ? name => {
+      let result = channelsByName.get(name);
+      if (!result) {
+        result = nodeDiagnosticsChannel.channel(name);
+        channelsByName.set(name, result);
+      }
+      return result;
+    }
+  : nodeDiagnosticsChannel.channel;
+
+/** `diagnostics_channel.subscribe()`, on Bun on a channel kept referenced by {@link channel}. */
+export const subscribe: typeof nodeDiagnosticsChannel.subscribe = keepChannelsReferenced
+  ? (name, onMessage) => {
+      channel(name).subscribe(onMessage);
+    }
+  : nodeDiagnosticsChannel.subscribe;
+
+/**
+ * `diagnostics_channel.tracingChannel()`, with the returned tracing channel (and so its five
+ * channels) kept referenced on Bun when it is created by name. `undefined` where the runtime has
+ * no `tracingChannel` (Node < 18.19), like the original export.
+ */
+export const tracingChannel: typeof nodeDiagnosticsChannel.tracingChannel =
+  keepChannelsReferenced && nodeDiagnosticsChannel.tracingChannel
+    ? (((nameOrChannels: Parameters<typeof nodeDiagnosticsChannel.tracingChannel>[0]) => {
+        if (typeof nameOrChannels !== 'string') {
+          return nodeDiagnosticsChannel.tracingChannel(nameOrChannels);
+        }
+        let result = tracingChannelsByName.get(nameOrChannels);
+        if (!result) {
+          result = nodeDiagnosticsChannel.tracingChannel(nameOrChannels);
+          tracingChannelsByName.set(nameOrChannels, result);
+        }
+        return result;
+      }) as typeof nodeDiagnosticsChannel.tracingChannel)
+    : nodeDiagnosticsChannel.tracingChannel;
diff --git a/packages/server-utils/test/ai/lib/tracing/google-genai-streaming.test.ts b/packages/server-utils/test/ai/lib/tracing/google-genai-streaming.test.ts
new file mode 100644
index 000000000000..924dc7b8df18
--- /dev/null
+++ b/packages/server-utils/test/ai/lib/tracing/google-genai-streaming.test.ts
@@ -0,0 +1,128 @@
+import { describe, expect, it } from 'vitest';
+import type { Span } from '@sentry/core';
+import { GEN_AI_RESPONSE_TOOL_CALLS } from '@sentry/conventions/attributes';
+import { addResponseAttributes } from '../../../../src/ai/google-genai/index';
+import { instrumentStream } from '../../../../src/ai/google-genai/streaming';
+import type { ContentPart, GoogleGenAIResponse } from '../../../../src/ai/google-genai/types';
+
+function createMockSpan(): { span: Span; attributes: Record<string, unknown> } {
+  const attributes: Record<string, unknown> = {};
+  let isEnded = false;
+  const span = {
+    isRecording: () => !isEnded,
+    setAttribute: (key: string, value: unknown) => {
+      attributes[key] = value;
+    },
+    setAttributes: (attrs: Record<string, unknown>) => {
+      Object.assign(attributes, attrs);
+    },
+    setStatus: () => {},
+    end: () => {
+      isEnded = true;
+    },
+  } as unknown as Span;
+  return { span, attributes };
+}
+
+// Mirrors the real `@google/genai` response object: `functionCalls` is a getter that reads the
+// function-call parts of the first candidate, i.e. the very same parts exposed under
+// `candidates[].content.parts`. A chunk therefore surfaces each tool call through both accessors.
+function chunkWithParts(parts: ContentPart[], extra: Record<string, unknown> = {}): GoogleGenAIResponse {
+  const chunk = {
+    candidates: [{ content: { parts, role: 'model' }, index: 0 }],
+    ...extra,
+  } as Record<string, unknown>;
+  Object.defineProperty(chunk, 'functionCalls', {
+    enumerable: false,
+    get() {
+      const calls = parts.map(part => part.functionCall).filter(fc => fc !== undefined);
+      return calls.length ? calls : undefined;
+    },
+  });
+  return chunk as GoogleGenAIResponse;
+}
+
+async function* streamOf(chunks: GoogleGenAIResponse[]): AsyncGenerator<GoogleGenAIResponse> {
+  for (const chunk of chunks) {
+    yield chunk;
+  }
+}
+
+async function drain(stream: AsyncGenerator<GoogleGenAIResponse>): Promise<void> {
+  for await (const _ of stream) {
+    void _;
+  }
+}
+
+describe('instrumentStream (google-genai tool calls)', () => {
+  it('records exactly one entry per streamed tool call, in the native function-call shape', async () => {
+    const { span, attributes } = createMockSpan();
+
+    const functionCall = {
+      id: 'call_light_stream_1',
+      name: 'controlLight',
+      args: { brightness: 0.5, colorTemperature: 'cool' },
+    };
+
+    const chunks = [
+      chunkWithParts([{ text: 'Let me control the lights for you.' }], { responseId: 'resp-1' }),
+      chunkWithParts([{ functionCall }]),
+      chunkWithParts([{ text: ' Done!' }], {
+        candidates: [{ content: { parts: [{ text: ' Done!' }], role: 'model' }, finishReason: 'STOP', index: 0 }],
+        usageMetadata: { promptTokenCount: 12, candidatesTokenCount: 10, totalTokenCount: 22 },
+      }),
+    ];
+
+    await drain(instrumentStream(streamOf(chunks), span, true));
+
+    const raw = attributes[GEN_AI_RESPONSE_TOOL_CALLS];
+    expect(raw).toBeDefined();
+    const toolCalls = JSON.parse(raw as string) as Array<Record<string, unknown>>;
+
+    // A single real tool call must yield a single entry (the pre-fix code double-dipped and produced two).
+    expect(toolCalls).toHaveLength(1);
+    expect(toolCalls[0]).toEqual(functionCall);
+    // No entry should carry the divergent `arguments` shape the duplicate push used to emit.
+    expect(toolCalls.every(call => !('arguments' in call))).toBe(true);
+  });
+
+  it('records one entry per call when several tool calls arrive across chunks', async () => {
+    const { span, attributes } = createMockSpan();
+
+    const first = { id: 'c1', name: 'controlLight', args: { brightness: 0.2 } };
+    const second = { id: 'c2', name: 'setColor', args: { color: 'red' } };
+
+    const chunks = [chunkWithParts([{ functionCall: first }]), chunkWithParts([{ functionCall: second }])];
+
+    await drain(instrumentStream(streamOf(chunks), span, true));
+
+    const toolCalls = JSON.parse(attributes[GEN_AI_RESPONSE_TOOL_CALLS] as string) as Array<Record<string, unknown>>;
+    expect(toolCalls).toEqual([first, second]);
+  });
+
+  it('does not record tool calls when recordOutputs is false', async () => {
+    const { span, attributes } = createMockSpan();
+
+    const chunks = [chunkWithParts([{ functionCall: { id: 'c1', name: 'controlLight', args: { brightness: 1 } } }])];
+
+    await drain(instrumentStream(streamOf(chunks), span, false));
+
+    expect(attributes[GEN_AI_RESPONSE_TOOL_CALLS]).toBeUndefined();
+  });
+
+  it('non-streaming addResponseAttributes still records one entry per call in the same shape', () => {
+    const { span, attributes } = createMockSpan();
+
+    const functionCall = {
+      id: 'call_light_control_1',
+      name: 'controlLight',
+      args: { brightness: 0.3, colorTemperature: 'warm' },
+    };
+    const response = chunkWithParts([{ text: 'I need to check the light status first.' }, { functionCall }]);
+
+    addResponseAttributes(span, response, true);
+
+    const toolCalls = JSON.parse(attributes[GEN_AI_RESPONSE_TOOL_CALLS] as string) as Array<Record<string, unknown>>;
+    expect(toolCalls).toEqual([functionCall]);
+  });
+});
diff --git a/packages/server-utils/test/integrations/prisma-orchestrion.test.ts b/packages/server-utils/test/integrations/prisma-orchestrion.test.ts
new file mode 100644
index 000000000000..78a1e3bf1988
--- /dev/null
+++ b/packages/server-utils/test/integrations/prisma-orchestrion.test.ts
@@ -0,0 +1,365 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { tracingChannel } from 'node:diagnostics_channel';
+import type { Client, Scope, Span } from '@sentry/core';
+import * as SentryCore from '@sentry/core';
+import {
+  addChildSpanToSpan,
+  getActiveSpan,
+  getDefaultCurrentScope,
+  getDefaultIsolationScope,
+  GLOBAL_OBJ,
+  SentryNonRecordingSpan,
+  setAsyncContextStrategy,
+  withActiveSpan,
+} from '@sentry/core';
+import type { MockInstance } from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { prismaIntegration } from '../../src/integrations/prisma';
+import { instrumentPrismaV8 } from '../../src/integrations/prisma/orchestrion';
+import { CHANNELS } from '../../src/orchestrion/channels';
+import {
+  PRISMA_ASYNC_TERMINALS,
+  PRISMA_LAZY_TERMINALS,
+  prismaChannels,
+  prismaConfig,
+} from '../../src/orchestrion/config/prisma';
+
+interface TestStore {
+  scope: Scope;
+  isolationScope: Scope;
+}
+
+// `setup` only subscribes once an async-context strategy exposes `getTracingChannelBinding`.
+function installTestAsyncContextStrategy(): void {
+  const asyncStorage = new AsyncLocalStorage<TestStore>();
+
+  function getScopes(): TestStore {
+    return asyncStorage.getStore() || { scope: getDefaultCurrentScope(), isolationScope: getDefaultIsolationScope() };
+  }
+
+  setAsyncContextStrategy({
+    withScope: callback => {
+      const scope = getScopes().scope.clone();
+      const isolationScope = getScopes().isolationScope;
+      return asyncStorage.run({ scope, isolationScope }, () => callback(scope));
+    },
+    withSetScope: (scope, callback) => {
+      const isolationScope = getScopes().isolationScope;
+      return asyncStorage.run({ scope, isolationScope }, () => callback(scope));
+    },
+    withIsolationScope: callback => {
+      const scope = getScopes().scope;
+      const isolationScope = getScopes().isolationScope.clone();
+      return asyncStorage.run({ scope, isolationScope }, () => callback(isolationScope));
+    },
+    withSetIsolationScope: (isolationScope, callback) => {
+      const scope = getScopes().scope;
+      return asyncStorage.run({ scope, isolationScope }, () => callback(isolationScope));
+    },
+    getCurrentScope: () => getScopes().scope,
+    getIsolationScope: () => getScopes().isolationScope,
+    getTracingChannelBinding: () => ({ asyncLocalStorage: asyncStorage }),
+  });
+}
+
+function makeSpan(name: string): Span {
+  return {
+    end: vi.fn(),
+    setStatus: vi.fn(),
+    setAttributes: vi.fn(),
+    isRecording: () => true,
+    spanContext: () => ({ spanId: name, traceId: 'trace', traceFlags: 1 }),
+  } as unknown as Span;
+}
+
+// Stand-in for Prisma's `AsyncIterableResult`: `then` funnels through `toArray`, `query` runs on consumption.
+function makeLazyResult(query: () => unknown[]): {
+  then: Promise<unknown[]>['then'];
+  toArray: () => Promise<unknown[]>;
+  [Symbol.asyncIterator]: () => AsyncGenerator<unknown>;
+} {
+  return {
+    toArray() {
+      return Promise.resolve().then(query);
+    },
+    then(onFulfilled, onRejected) {
+      return this.toArray().then(onFulfilled, onRejected);
+    },
+    async *[Symbol.asyncIterator]() {
+      yield* query();
+    },
+  };
+}
+
+const PARENT_SPAN = makeSpan('parent');
+
+describe('prisma orchestrion config', () => {
+  it('has one config per terminal, lazy terminals wrapped as Sync', () => {
+    const byMethod = new Map(
+      prismaConfig.map(config => [
+        (config.functionQuery as { methodName: string }).methodName,
+        (config.functionQuery as { kind: string }).kind,
+      ]),
+    );
+
+    expect([...byMethod.keys()].sort()).toEqual([...PRISMA_ASYNC_TERMINALS, ...PRISMA_LAZY_TERMINALS].sort());
+    PRISMA_ASYNC_TERMINALS.forEach(method => expect(byMethod.get(method)).toBe('Async'));
+    PRISMA_LAZY_TERMINALS.forEach(method => expect(byMethod.get(method)).toBe('Sync'));
+    expect(Object.values(prismaChannels).sort()).toEqual(
+      prismaConfig.map(config => `orchestrion:${config.module.name}:${config.channelName}`).sort(),
+    );
+  });
+});
+
+describe('instrumentPrismaV8', () => {
+  let startInactiveSpanSpy: MockInstance;
+  let span: Span;
+
+  beforeAll(() => {
+    installTestAsyncContextStrategy();
+  });
+
+  afterAll(() => {
+    setAsyncContextStrategy(undefined);
+    delete GLOBAL_OBJ.__SENTRY_ORCHESTRION__;
+  });
+
+  beforeEach(() => {
+    span = makeSpan('operation');
+    startInactiveSpanSpy = vi.spyOn(SentryCore, 'startInactiveSpan').mockReturnValue(span);
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  // Subscriptions are process-global, so this has to run before anything subscribes.
+  it('does not subscribe at all when the operation span type is ignored', () => {
+    instrumentPrismaV8({ ignoreSpanTypes: [/^prisma:client:operation$/] });
+
+    expect(tracingChannel(CHANNELS.PRISMA_CREATE).start.hasSubscribers).toBe(false);
+    expect(tracingChannel(CHANNELS.PRISMA_ALL).start.hasSubscribers).toBe(false);
+  });
+
+  it('subscribes through the integration once the Prisma module is injected', () => {
+    GLOBAL_OBJ.__SENTRY_ORCHESTRION__ = { runtime: ['@prisma/orm-family-sql'] };
+    prismaIntegration().setup?.({ on: () => () => undefined } as unknown as Client);
+
+    Object.values(prismaChannels).forEach(channel => {
+      expect(tracingChannel(channel).start.hasSubscribers).toBe(true);
+    });
+  });
+
+  it('async terminal: opens an operation span for the call and ends it when the promise settles', async () => {
+    const ctx = { arguments: [{ email: 'a@b.c' }], self: { modelName: 'User', tableName: 'user' } };
+
+    let activeDuringCall: Span | undefined;
+    await withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_CREATE).tracePromise(async () => {
+        activeDuringCall = getActiveSpan();
+        return { id: 1 };
+      }, ctx),
+    );
+
+    expect(startInactiveSpanSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'prisma:client:operation',
+        parentSpan: PARENT_SPAN,
+        attributes: {
+          'sentry.origin': 'auto.db.prisma',
+          'sentry.op': 'db',
+          'db.operation.name': 'create',
+          'db.collection.name': 'user',
+          method: 'create',
+          model: 'User',
+          name: 'User.create',
+        },
+      }),
+    );
+    expect(activeDuringCall).toBe(span);
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('reuses the outer operation span when a terminal calls another terminal', async () => {
+    const self = { modelName: 'User' };
+
+    let activeDuringInnerCall: Span | undefined;
+    await withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_DELETE).tracePromise(
+        () =>
+          tracingChannel(CHANNELS.PRISMA_FIRST).tracePromise(
+            async () => {
+              activeDuringInnerCall = getActiveSpan();
+              return { id: 1 };
+            },
+            { arguments: [], self },
+          ),
+        { arguments: [], self },
+      ),
+    );
+
+    expect(startInactiveSpanSpy).toHaveBeenCalledTimes(1);
+    expect(startInactiveSpanSpy).toHaveBeenCalledWith(
+      expect.objectContaining({ attributes: expect.objectContaining({ method: 'delete' }) }),
+    );
+    expect(activeDuringInnerCall).toBe(span);
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not open a span without a parent', async () => {
+    await tracingChannel(CHANNELS.PRISMA_CREATE).tracePromise(async () => ({ id: 1 }), {
+      arguments: [],
+      self: { modelName: 'User' },
+    });
+
+    expect(startInactiveSpanSpy).not.toHaveBeenCalled();
+  });
+
+  it('async terminal: marks the span as errored when the promise rejects', async () => {
+    await expect(
+      withActiveSpan(PARENT_SPAN, () =>
+        tracingChannel(CHANNELS.PRISMA_DELETE).tracePromise(
+          async () => {
+            throw new Error('boom');
+          },
+          { arguments: [], self: { modelName: 'User' } },
+        ),
+      ),
+    ).rejects.toThrow('boom');
+
+    expect(span.setStatus).toHaveBeenCalledWith({ code: expect.anything(), message: 'boom' });
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('lazy terminal: keeps the span open until the result is awaited, and runs the query under it', async () => {
+    let activeDuringQuery: Span | undefined;
+    const result = withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_ALL).traceSync(
+        () =>
+          makeLazyResult(() => {
+            activeDuringQuery = getActiveSpan();
+            return [{ id: 1 }];
+          }),
+        { arguments: [], self: { modelName: 'User' } },
+      ),
+    );
+
+    expect(startInactiveSpanSpy).toHaveBeenCalledWith(
+      expect.objectContaining({ attributes: expect.objectContaining({ method: 'all', model: 'User' }) }),
+    );
+    expect(span.end).not.toHaveBeenCalled();
+
+    await expect(result).resolves.toEqual([{ id: 1 }]);
+
+    expect(activeDuringQuery).toBe(span);
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('lazy terminal: ends the span when a `for await` loop finishes', async () => {
+    let activeDuringQuery: Span | undefined;
+    const result = withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_ALL).traceSync(
+        () =>
+          makeLazyResult(() => {
+            activeDuringQuery = getActiveSpan();
+            return [1, 2];
+          }),
+        { arguments: [], self: { modelName: 'User' } },
+      ),
+    );
+
+    const rows: unknown[] = [];
+    for await (const row of result) {
+      rows.push(row);
+      expect(span.end).not.toHaveBeenCalled();
+    }
+
+    expect(rows).toEqual([1, 2]);
+    expect(activeDuringQuery).toBe(span);
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('lazy terminal: ends the span when a `for await` loop breaks early', async () => {
+    const result = withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_ALL).traceSync(() => makeLazyResult(() => [1, 2, 3]), {
+        arguments: [],
+        self: { modelName: 'User' },
+      }),
+    );
+
+    for await (const row of result) {
+      if (row === 2) {
+        break;
+      }
+    }
+
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('lazy terminal: marks the span as errored when consuming the result rejects', async () => {
+    const result = withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_ALL).traceSync(
+        () =>
+          makeLazyResult(() => {
+            throw new Error('query failed');
+          }),
+        { arguments: [], self: { modelName: 'User' } },
+      ),
+    );
+
+    await expect(result).rejects.toThrow('query failed');
+
+    expect(span.setStatus).toHaveBeenCalledWith({ code: expect.anything(), message: 'query failed' });
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+
+  it('lazy terminal: does not activate an ignored operation span while the query runs', async () => {
+    const ignoredSpan = new SentryNonRecordingSpan({ dropReason: 'ignored' });
+    addChildSpanToSpan(PARENT_SPAN, ignoredSpan);
+    const ignoredSpanEnd = vi.spyOn(ignoredSpan, 'end');
+    startInactiveSpanSpy.mockReturnValue(ignoredSpan);
+
+    let activeDuringQuery: Span | undefined;
+    const result = withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_ALL).traceSync(
+        () =>
+          makeLazyResult(() => {
+            activeDuringQuery = getActiveSpan();
+            return [1];
+          }),
+        { arguments: [], self: { modelName: 'User' } },
+      ),
+    );
+
+    await expect(withActiveSpan(PARENT_SPAN, () => result.toArray())).resolves.toEqual([1]);
+    expect(activeDuringQuery).toBe(PARENT_SPAN);
+    expect(ignoredSpanEnd).toHaveBeenCalledTimes(1);
+  });
+
+  it('lazy terminal: ends the span right away when the result cannot be patched', async () => {
+    const result = withActiveSpan(PARENT_SPAN, () =>
+      tracingChannel(CHANNELS.PRISMA_ALL).traceSync(() => Object.freeze(makeLazyResult(() => [1])), {
+        arguments: [],
+        self: { modelName: 'User' },
+      }),
+    );
+
+    expect(span.end).toHaveBeenCalledTimes(1);
+    await expect(result).resolves.toEqual([1]);
+  });
+
+  it('lazy terminal: ends the span right away when the call itself throws', () => {
+    expect(() =>
+      withActiveSpan(PARENT_SPAN, () =>
+        tracingChannel(CHANNELS.PRISMA_ALL).traceSync(
+          () => {
+            throw new Error('bad filter');
+          },
+          { arguments: [], self: { modelName: 'User' } },
+        ),
+      ),
+    ).toThrow('bad filter');
+
+    expect(span.end).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/packages/server-utils/test/utils/diagnosticsChannel.test.ts b/packages/server-utils/test/utils/diagnosticsChannel.test.ts
new file mode 100644
index 000000000000..31c0e49e5df5
--- /dev/null
+++ b/packages/server-utils/test/utils/diagnosticsChannel.test.ts
@@ -0,0 +1,76 @@
+import * as nodeDiagnosticsChannel from 'node:diagnostics_channel';
+import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
+import type * as DiagnosticsChannelModule from '../../src/utils/diagnosticsChannel';
+
+describe('diagnosticsChannel', () => {
+  describe('outside of Bun', () => {
+    it('exports the original functions', async () => {
+      vi.resetModules();
+      const diagnosticsChannel = await import('../../src/utils/diagnosticsChannel');
+
+      expect(diagnosticsChannel.channel).toBe(nodeDiagnosticsChannel.channel);
+      expect(diagnosticsChannel.subscribe).toBe(nodeDiagnosticsChannel.subscribe);
+      expect(diagnosticsChannel.tracingChannel).toBe(nodeDiagnosticsChannel.tracingChannel);
+    });
+  });
+
+  describe('on Bun', () => {
+    let diagnosticsChannel: typeof DiagnosticsChannelModule;
+
+    beforeAll(async () => {
+      vi.stubGlobal('Bun', {});
+      vi.resetModules();
+      diagnosticsChannel = await import('../../src/utils/diagnosticsChannel');
+    });
+
+    afterAll(() => {
+      vi.unstubAllGlobals();
+    });
+
+    it('wraps the original functions', () => {
+      expect(diagnosticsChannel.channel).not.toBe(nodeDiagnosticsChannel.channel);
+      expect(diagnosticsChannel.subscribe).not.toBe(nodeDiagnosticsChannel.subscribe);
+      expect(diagnosticsChannel.tracingChannel).not.toBe(nodeDiagnosticsChannel.tracingChannel);
+    });
+
+    it('returns the same channel object for a name', () => {
+      expect(diagnosticsChannel.channel('sentry-test:channel')).toBe(diagnosticsChannel.channel('sentry-test:channel'));
+    });
+
+    it('returns the same tracing channel object for a name', () => {
+      expect(diagnosticsChannel.tracingChannel('sentry-test:tracing')).toBe(
+        diagnosticsChannel.tracingChannel('sentry-test:tracing'),
+      );
+    });
+
+    it('delivers messages to a handler subscribed by name', () => {
+      const messages: unknown[] = [];
+      diagnosticsChannel.subscribe('sentry-test:subscribe', message => messages.push(message));
+
+      nodeDiagnosticsChannel.channel('sentry-test:subscribe').publish('hello');
+
+      expect(messages).toEqual(['hello']);
+    });
+
+    it('delivers tracing events to subscribers of a tracing channel created by name', () => {
+      const events: string[] = [];
+      diagnosticsChannel.tracingChannel('sentry-test:tracing-events').subscribe({
+        start: () => events.push('start'),
+        end: () => events.push('end'),
+        asyncStart: () => undefined,
+        asyncEnd: () => undefined,
+        error: () => undefined,
+      });
+
+      nodeDiagnosticsChannel.tracingChannel('sentry-test:tracing-events').traceSync(() => undefined, {});
+
+      expect(events).toEqual(['start', 'end']);
+    });
+
+    it('creates a tracing channel from channel objects without caching it', () => {
+      const channels = nodeDiagnosticsChannel.tracingChannel('sentry-test:objects');
+
+      expect(diagnosticsChannel.tracingChannel(channels).start).toBe(channels.start);
+    });
+  });
+});
diff --git a/packages/solid/README.md b/packages/solid/README.md
index c1406cf495e8..384501e1887e 100644
--- a/packages/solid/README.md
+++ b/packages/solid/README.md
@@ -10,112 +10,20 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/solid.svg)](https://www.npmjs.com/package/@sentry/solid)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/solid.svg)](https://www.npmjs.com/package/@sentry/solid)
 
-This SDK is in **Beta**. The API is stable but updates may include minor changes in behavior. Please reach out on
-[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns. This
-SDK is for [Solid](https://www.solidjs.com/). If you're using [SolidStart](https://start.solidjs.com/) see our
-[SolidStart SDK here](https://github.com/getsentry/sentry-javascript/tree/develop/packages/solidstart).
-
-# Solid Router
-
-The Solid Router instrumentation uses the Solid Router library to create navigation spans to ensure you collect
-meaningful performance data about the health of your page loads and associated requests.
-
-Add `solidRouterBrowserTracingIntegration` instead of the regular `Sentry.browserTracingIntegration`.
-
-Make sure `solidRouterBrowserTracingIntegration` is initialized by your `Sentry.init` call. Otherwise, the routing
-instrumentation will not work properly.
-
-Wrap `Router`, `MemoryRouter` or `HashRouter` from `@solidjs/router` using `withSentryRouterRouting`. This creates a
-higher order component, which will enable Sentry to reach your router context.
-
-```js
-import * as Sentry from '@sentry/solid';
-import { solidRouterBrowserTracingIntegration, withSentryRouterRouting } from '@sentry/solid/solidrouter';
-import { Route, Router } from '@solidjs/router';
-
-Sentry.init({
-  dsn: '__PUBLIC_DSN__',
-  integrations: [solidRouterBrowserTracingIntegration()],
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-});
-
-const SentryRouter = withSentryRouterRouting(Router);
-
-render(
-  () => (
-    <SentryRouter>
-      <Route path="/" component={App} />
-      ...
-    </SentryRouter>
-  ),
-  document.getElementById('root'),
-);
-```
-
-### Tanstack Router
-
-The Tanstack Router instrumentation uses the Tanstack Router library to create navigation spans to ensure you collect
-meaningful performance data about the health of your page loads and associated requests.
+The official Sentry SDK for monitoring Solid applications.
 
-Add `tanstackRouterBrowserTracingIntegration` instead of the regular `Sentry.browserTracingIntegration`.
+For SolidStart applications, use the [SolidStart SDK](https://docs.sentry.io/platforms/javascript/guides/solidstart/).
 
-Make sure `tanstackRouterBrowserTracingIntegration` is initialized by your `Sentry.init` call. Otherwise, the routing
-instrumentation will not work properly.
-
-Pass your router instance from `createRouter` to the integration.
-
-```js
-import * as Sentry from '@sentry/solid';
-import { tanstackRouterBrowserTracingIntegration } from '@sentry/solid/tanstackrouter';
-
-const router = createRouter({
-  // your router config
-  // ...
-});
-
-declare module '@tanstack/solid-router' {
-  interface Register {
-    router: typeof router;
-  }
-}
-
-Sentry.init({
-  dsn: '__PUBLIC_DSN__',
-  integrations: [tanstackRouterBrowserTracingIntegration(router)],
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-});
-
-render(() => <App />, document.getElementById('root'));
-```
-
-# Solid ErrorBoundary
-
-To automatically capture exceptions from inside a component tree and render a fallback component, wrap the native Solid
-JS `ErrorBoundary` component with `Sentry.withSentryErrorBoundary`.
-
-```js
-import * as Sentry from '@sentry/solid';
-import { ErrorBoundary } from 'solid-js';
-
-Sentry.init({
-  dsn: '__PUBLIC_DSN__',
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-});
+This SDK is in **Beta**. The API is stable but updates may include minor changes in behavior. Please reach out on
+[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns.
 
-const SentryErrorBoundary = Sentry.withSentryErrorBoundary(ErrorBoundary);
+## Documentation
 
-render(
-  () => (
-    <SentryErrorBoundary fallback={err => <div>Error: {err.message}</div>}>
-      <ProblematicComponent />
-    </SentryErrorBoundary>
-  ),
-  document.getElementById('root'),
-);
-```
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/solid/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/solid/configuration/)
+- [Solid-specific features](https://docs.sentry.io/platforms/javascript/guides/solid/features/)
 
-# Sourcemaps and Releases
+## Support
 
-To generate and upload source maps of your Solid JS app bundle, check our guide
-[how to configure your bundler](https://docs.sentry.io/platforms/javascript/guides/solid/sourcemaps/#uploading-source-maps)
-to emit source maps.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 9c46d37e664f..466a61689833 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -56,7 +56,7 @@
   "dependencies": {
     "@sentry/browser": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0"
+    "@sentry/conventions": "^0.24.0"
   },
   "peerDependencies": {
     "@solidjs/router": ">=0.13.4 <2.0.0-0",
diff --git a/packages/solidstart/README.md b/packages/solidstart/README.md
index 81526664052b..591fa7209b1a 100644
--- a/packages/solidstart/README.md
+++ b/packages/solidstart/README.md
@@ -10,292 +10,18 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/solidstart.svg)](https://www.npmjs.com/package/@sentry/solidstart)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/solidstart.svg)](https://www.npmjs.com/package/@sentry/solidstart)
 
-This SDK is in **Beta**. The API is stable but updates may include minor changes in behavior. Please reach out on
-[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns. This
-SDK is for [SolidStart](https://start.solidjs.com/). If you're using [Solid](https://www.solidjs.com/) see our
-[Solid SDK here](https://github.com/getsentry/sentry-javascript/tree/develop/packages/solid).
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/solidstart/)
-
-## General
-
-This package is a wrapper around `@sentry/node` for the server and `@sentry/solid` for the client side, with added
-functionality related to SolidStart.
-
-## SolidStart version support
-
-The setup differs by SolidStart major, because SolidStart 2 dropped vinxi and `app.config.ts`:
-
-- **SolidStart 1** — configure the SDK with `withSentry` in `app.config.ts`. This is what the "Manual Setup" section
-  below describes.
-- **SolidStart 2** — configure the SDK with the `sentrySolidStart` Vite plugin in `vite.config.ts`. See
-  [SolidStart 2 setup](#solidstart-2-setup).
-
-## Manual Setup
-
-If the setup through the wizard doesn't work for you, you can also set up the SDK manually.
-
-### 1. Prerequisites & Installation
-
-Install the Sentry SolidStart SDK:
-
-```bash
-# Using npm
-npm install @sentry/solidstart
-
-# Using yarn
-yarn add @sentry/solidstart
-```
-
-### 2. Client-side Setup
-
-Initialize the SDK in `entry-client.jsx`
-
-```jsx
-import * as Sentry from '@sentry/solidstart';
-import { solidRouterBrowserTracingIntegration } from '@sentry/solidstart/solidrouter';
-import { mount, StartClient } from '@solidjs/start/client';
-
-Sentry.init({
-  dsn: '__PUBLIC_DSN__',
-  integrations: [solidRouterBrowserTracingIntegration()],
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-});
-
-mount(() => <StartClient />, document.getElementById('app'));
-```
-
-### 3. Server-side Setup
-
-Create an instrument file named `src/instrument.server.ts` and add your initialization code for the server-side SDK.
-
-```javascript
-import * as Sentry from '@sentry/solidstart';
-
-Sentry.init({
-  dsn: '__PUBLIC_DSN__',
-  tracesSampleRate: 1.0, //  Capture 100% of the transactions
-});
-```
-
-### 4. Server instrumentation
-
-Complete the setup by adding the Sentry middleware to your `src/middleware.ts` file:
-
-```typescript
-import { sentryBeforeResponseMiddleware } from '@sentry/solidstart';
-import { createMiddleware } from '@solidjs/start/middleware';
-
-export default createMiddleware({
-  onBeforeResponse: [
-    sentryBeforeResponseMiddleware(),
-    // Add your other middleware handlers after `sentryBeforeResponseMiddleware`
-  ],
-});
-```
-
-And don't forget to specify `./src/middleware.ts` in your `app.config.ts`:
-
-```typescript
-import { defineConfig } from '@solidjs/start/config';
-
-export default defineConfig({
-  // ...
-  middleware: './src/middleware.ts',
-});
-```
-
-The Sentry middleware enhances the data collected by Sentry on the server side by enabling distributed tracing between
-the client and server.
-
-### 5. Configure your application
-
-For Sentry to work properly, SolidStart's `app.config.ts` has to be modified. Wrap your config with `withSentry` and
-configure it to upload source maps.
-
-If your `instrument.server.ts` file is not located in the `src` folder, you can specify the path via the
-`instrumentation` option to `withSentry`.
+The official Sentry SDK for monitoring SolidStart applications.
 
-To upload source maps, configure an auth token. Auth tokens can be passed explicitly with the `authToken` option, with a
-`SENTRY_AUTH_TOKEN` environment variable, or with an `.env.sentry-build-plugin` file in the working directory when
-building your project. We recommend adding the auth token to your CI/CD environment as an environment variable.
-
-Learn more about configuring the plugin in our
-[Sentry Vite Plugin documentation](https://www.npmjs.com/package/@sentry/vite-plugin).
-
-```typescript
-import { defineConfig } from '@solidjs/start/config';
-import { withSentry } from '@sentry/solidstart';
-
-export default defineConfig(
-  withSentry(
-    {
-      // SolidStart config
-      middleware: './src/middleware.ts',
-    },
-    {
-      // Sentry `withSentry` options
-      org: process.env.SENTRY_ORG,
-      project: process.env.SENTRY_PROJECT,
-      authToken: process.env.SENTRY_AUTH_TOKEN,
-      debug: true,
-      // optional: if your `instrument.server.ts` file is not located inside `src`
-      instrumentation: './mypath/instrument.server.ts',
-    },
-  ),
-);
-```
-
-### 6. Run your application
-
-Then run your app
-
-```bash
-NODE_OPTIONS='--import=./.output/server/instrument.server.mjs' yarn start
-```
-
-⚠️ **Note build presets** ⚠️  
-Depending on [build preset](https://nitro.unjs.io/deploy), the location of `instrument.server.mjs` differs. To find out
-where `instrument.server.mjs` is located, monitor the build log output for
-
-```bash
-[Sentry SolidStart withSentry] Successfully created /my/project/path/.output/server/instrument.server.mjs.
-```
-
-⚠️ **Note for platforms without the ability to modify `NODE_OPTIONS` or use `--import`** ⚠️  
-Depending on where the application is deployed to, it might not be possible to modify or use `NODE_OPTIONS` to import
-`instrument.server.mjs`.
-
-For such platforms, we offer the option `autoInjectServerSentry: 'top-level-import'` to add a top level import of
-`instrument.server.mjs` to the server entry file.
-
-```typescript
-import { defineConfig } from '@solidjs/start/config';
-import { withSentry } from '@sentry/solidstart';
-
-export default defineConfig(
-  withSentry(
-    {
-      // ...
-      middleware: './src/middleware.ts',
-    },
-    {
-      org: process.env.SENTRY_ORG,
-      project: process.env.SENTRY_PROJECT,
-      authToken: process.env.SENTRY_AUTH_TOKEN,
-      debug: true,
-      // optional: if your `instrument.server.ts` file is not located inside `src`
-      instrumentation: './mypath/instrument.server.ts',
-      // optional: if NODE_OPTIONS or --import is not avaiable
-      autoInjectServerSentry: 'top-level-import',
-    },
-  ),
-);
-```
-
-This has a **fundamental restriction**: It only supports limited performance instrumentation. **Only basic http
-instrumentation** will work, and no DB or framework-specific instrumentation will be available.
-
-# SolidStart 2 setup
-
-SolidStart 2 has no `app.config.ts`, so `withSentry` does not apply. Configure the SDK with the `sentrySolidStart`
-Vite plugin instead. Client-side setup (`Sentry.init` in `entry-client.tsx`) and the Solid Router and
-`ErrorBoundary` wrappers below are unchanged.
-
-### 1. Add the Vite plugin
-
-```typescript
-// vite.config.ts
-import { sentrySolidStart } from '@sentry/solidstart/vite';
-import { solidStart } from '@solidjs/start/config';
-import { nitro } from 'nitro/vite';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  plugins: [
-    solidStart(),
-    sentrySolidStart({
-      org: process.env.SENTRY_ORG,
-      project: process.env.SENTRY_PROJECT,
-      authToken: process.env.SENTRY_AUTH_TOKEN,
-    }),
-    // `serverDir` is required for Nitro to pick up the Sentry plugin below.
-    nitro({ serverDir: './server' }),
-  ],
-});
-```
-
-### 2. Initialize Sentry on the server
-
-Create a Nitro plugin. Nitro runs it once at server startup, before any request is handled:
-
-```typescript
-// server/plugins/sentry.ts
-import * as Sentry from '@sentry/solidstart';
-import { definePlugin } from 'nitro';
-
-export default definePlugin(() => {
-  Sentry.init({
-    dsn: '__PUBLIC_DSN__',
-    tracesSampleRate: 1.0,
-  });
-});
-```
-
-Nitro's `serverDir` defaults to `false`, which disables plugin scanning entirely. If it is not set (step 1), this
-file is silently ignored and Sentry never initializes on the server.
-
-Unlike SolidStart 1, there is **no `--import` flag and no instrumentation file to copy** into the build output. The
-SDK instruments your server dependencies at build time, so a plain start command is all that is needed:
-
-```bash
-node .output/server/index.mjs
-```
-
-# Solid Router
-
-The Solid Router instrumentation uses the Solid Router library to create navigation spans to ensure you collect
-meaningful performance data about the health of your page loads and associated requests.
-
-Wrap `Router`, `MemoryRouter` or `HashRouter` from `@solidjs/router` using `withSentryRouterRouting`. This creates a
-higher order component, which will enable Sentry to reach your router context.
-
-```js
-import { withSentryRouterRouting } from '@sentry/solidstart/solidrouter';
-import { Route, Router } from '@solidjs/router';
-
-const SentryRouter = withSentryRouterRouting(Router);
-
-render(
-  () => (
-    <SentryRouter>
-      <Route path="/" component={App} />
-      ...
-    </SentryRouter>
-  ),
-  document.getElementById('root'),
-);
-```
-
-# Solid ErrorBoundary
+This SDK is in **Beta**. The API is stable but updates may include minor changes in behavior. Please reach out on
+[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns.
 
-To automatically capture exceptions from inside a component tree and render a fallback component, wrap the native Solid
-JS `ErrorBoundary` component with `Sentry.withSentryErrorBoundary`.
+## Documentation
 
-```js
-import * as Sentry from '@sentry/solidstart';
-import { ErrorBoundary } from 'solid-js';
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/solidstart/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/solidstart/configuration/)
+- [SolidStart-specific features](https://docs.sentry.io/platforms/javascript/guides/solidstart/features/)
 
-const SentryErrorBoundary = Sentry.withSentryErrorBoundary(ErrorBoundary);
+## Support
 
-render(
-  () => (
-    <SentryErrorBoundary fallback={err => <div>Error: {err.message}</div>}>
-      <ProblematicComponent />
-    </SentryErrorBoundary>
-  ),
-  document.getElementById('root'),
-);
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 1ea843848864..04b2e5ff5074 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -87,7 +87,7 @@
     "@sentry/server-utils": "11.0.0",
     "@sentry/solid": "11.0.0",
     "@sentry/bundler-plugins": "11.0.0",
-    "@sentry/conventions": "0.23.0"
+    "@sentry/conventions": "0.24.0"
   },
   "devDependencies": {
     "@solidjs/router": "^1.0.0",
diff --git a/packages/svelte/README.md b/packages/svelte/README.md
index bccd18a3c744..f46a8f834f07 100644
--- a/packages/svelte/README.md
+++ b/packages/svelte/README.md
@@ -10,78 +10,17 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/svelte.svg)](https://www.npmjs.com/package/@sentry/svelte)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/svelte.svg)](https://www.npmjs.com/package/@sentry/svelte)
 
-This SDK currently only supports [Svelte](https://svelte.dev/) apps in the browser. If you're using SvelteKit, we
-recommend using our dedicated
-[Sentry SvelteKit SDK](https://github.com/getsentry/sentry-javascript/tree/develop/packages/sveltekit).
+The official Sentry SDK for monitoring Svelte applications in the browser.
 
-## General
+For SvelteKit applications, use the [SvelteKit SDK](https://docs.sentry.io/platforms/javascript/guides/sveltekit/).
 
-This package is a wrapper around `@sentry/browser`, providing error monitoring and basic performance monitoring features
-for [Svelte](https://svelte.dev/).
+## Documentation
 
-To use the SDK, initialize Sentry in your Svelte entry point `main.js` before you bootstrap your Svelte app:
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/svelte/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/svelte/configuration/)
+- [Svelte-specific features](https://docs.sentry.io/platforms/javascript/guides/svelte/features/)
 
-```ts
-// main.js / main.ts
+## Support
 
-import App from './App.svelte';
-
-import * as Sentry from '@sentry/svelte';
-
-// Initialize the Sentry SDK here
-Sentry.init({
-  dsn: '__DSN__',
-  release: 'my-project-name@2.3.12',
-  integrations: [Sentry.browserTracingIntegration()],
-
-  // Set tracesSampleRate to 1.0 to capture 100%
-  // of transactions for performance monitoring.
-  // We recommend adjusting this value in production
-  tracesSampleRate: 1.0,
-});
-
-// Then bootstrap your Svelte app
-const app = new App({
-  target: document.getElementById('app'),
-});
-
-export default app;
-```
-
-The Sentry Svelte SDK supports all features from the `@sentry/browser` SDK. Until it becomes more stable, please refer
-to the Sentry [Browser SDK documentation](https://docs.sentry.io/platforms/javascript/) for more information and usage
-instructions.
-
-## Sourcemaps and Releases
-
-To generate source maps of your Svelte app bundle, check our guide
-[how to configure your bundler](https://docs.sentry.io/platforms/javascript/guides/svelte/sourcemaps/generating/) to
-emit source maps.
-
-To [create releases and upload source maps](https://docs.sentry.io/platforms/javascript/sourcemaps/uploading/cli/) to
-Sentry, we recommend using [`sentry-cli`](https://github.com/getsentry/sentry-cli). You can for instance create a bash
-script to take care of creating a release, uploading source maps and finalizing the release:
-
-```bash
-#!/bin/bash
-
-VERSION=<your version>
-ORG=<your org-slug>
-PROJECT=<your project-slug>
-
-SOURCEMAPS_PATH=./dist
-
-sentry-cli releases new $VERSION --org $ORG --project $PROJECT
-sentry-cli releases files $VERSION upload-sourcemaps $SOURCEMAPS_PATH --org $ORG --project $PROJECT
-sentry-cli releases finalize $VERSION  --org $ORG --project $PROJECT
-```
-
-Please note that the paths provided in this example work for a typical Svelte project that adheres to the project
-structure set by [create-vite](https://www.npmjs.com/package/create-vite) with the `svelte(-ts)` template. If your
-project setup differs from this template, your configuration may need adjustments. Please refer to our documentation of
-[Advanced `sentry-cli` Sourcemaps Options](https://docs.sentry.io/product/cli/releases/#sentry-cli-sourcemaps) and to
-our [Sourcemaps Troubleshooting Guide](https://docs.sentry.io/platforms/javascript/sourcemaps/troubleshooting_js/).
-
-Check out our
-[Svelte source maps uploading](https://docs.sentry.io/platforms/javascript/guides/svelte/sourcemaps/uploading/) guide
-for more information.
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 7610d90470bd..3489a05466e2 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@sentry/browser": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "magic-string": "~0.30.0"
   },
diff --git a/packages/sveltekit/README.md b/packages/sveltekit/README.md
index a7a51e695255..5a8fa50ff780 100644
--- a/packages/sveltekit/README.md
+++ b/packages/sveltekit/README.md
@@ -10,33 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/sveltekit.svg)](https://www.npmjs.com/package/@sentry/sveltekit)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/sveltekit.svg)](https://www.npmjs.com/package/@sentry/sveltekit)
 
-## Compatibility
+The official Sentry SDK for monitoring SvelteKit applications.
 
-The minimum supported version of SvelteKit is `2.0.0`. The SDK works best with Vite 4.2 and newer. Older Vite versions
-might not generate source maps correctly.
+## Documentation
 
-Check our docs for [SvelteKit adapter](https://docs.sentry.io/platforms/javascript/guides/sveltekit/#prerequisites) compatibility.
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/sveltekit/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/sveltekit/configuration/)
 
-## General
+## Support
 
-This package is a wrapper around `@sentry/node` for the server and `@sentry/svelte` for the client side, with added
-functionality related to SvelteKit.
-
-## Installation
-
-To get started installing the SDK, use the Sentry Next.js Wizard by running the following command in your terminal or
-read the [Getting Started Docs](https://docs.sentry.io/platforms/javascript/guides/sveltekit/):
-
-```sh
-npx @sentry/wizard@latest -i sveltekit
-```
-
-The wizard will guide you throuhg logging in to Sentry and setting up the SDK. After the wizard setup is completed, the SDK will automatically capture
-unhandled errors, and optionally, traces and replays.
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/sveltekit/)
-- [Sentry.io](https://sentry.io/?utm_source=github&utm_medium=npm_sveltekit)
-- [Sentry Discord Server](https://discord.gg/Ww9hbqr)
-- [Stack Overflow](https://stackoverflow.com/questions/tagged/sentry)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index a79de8062bef..74e180506c91 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -46,6 +46,11 @@
         "require": "./build/cjs/index.server.js"
       }
     },
+    "./opentelemetry-api": {
+      "types": "./build/types/opentelemetryApi.d.ts",
+      "import": "./build/esm/opentelemetryApi.js",
+      "require": "./build/cjs/opentelemetryApi.js"
+    },
     "./vite": {
       "types": "./build/types/vite/index.d.ts",
       "import": "./build/esm/vite/index.js",
@@ -65,9 +70,10 @@
     }
   },
   "dependencies": {
+    "@opentelemetry/api": "^1.9.1",
     "@sentry/cloudflare": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/node": "11.0.0",
     "@sentry/server-runtime-injection": "11.0.0",
     "@sentry/server-utils": "11.0.0",
diff --git a/packages/sveltekit/rollup.npm.config.mjs b/packages/sveltekit/rollup.npm.config.mjs
index 331f396b7075..b6da582e41fc 100644
--- a/packages/sveltekit/rollup.npm.config.mjs
+++ b/packages/sveltekit/rollup.npm.config.mjs
@@ -15,6 +15,7 @@ export default makeNPMConfigVariants(
       'src/server/index.ts',
       'src/worker/index.ts',
       'src/vite/index.ts',
+      'src/opentelemetryApi.ts',
     ],
     packageSpecificConfig: {
       // Keep the variant subpath external so the transpiled output preserves the import for the
diff --git a/packages/sveltekit/src/opentelemetryApi.ts b/packages/sveltekit/src/opentelemetryApi.ts
new file mode 100644
index 000000000000..904712f1699e
--- /dev/null
+++ b/packages/sveltekit/src/opentelemetryApi.ts
@@ -0,0 +1,3 @@
+// Re-exported under `@sentry/sveltekit/opentelemetry-api` so the `sentrySvelteKit()` plugin can point
+// SvelteKit's `@opentelemetry/api` import here. See `makeOpenTelemetryApiResolverPlugin`.
+export * from '@opentelemetry/api';
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index c2074839dfbc..0dc4dcc20c26 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -130,6 +130,8 @@ export {
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
+  instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentStateGraph,
   instrumentStateGraphCompile,
   zodErrorsIntegration,
diff --git a/packages/sveltekit/src/vite/sentryVitePlugins.ts b/packages/sveltekit/src/vite/sentryVitePlugins.ts
index ede0aab0db89..a390e3abf2ba 100644
--- a/packages/sveltekit/src/vite/sentryVitePlugins.ts
+++ b/packages/sveltekit/src/vite/sentryVitePlugins.ts
@@ -52,7 +52,11 @@ export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}
 
   // First so the config settles as early as possible. The plugins below read it in `configResolved`,
   // which Vite runs concurrently, so their order relative to the resolver doesn't matter.
-  const sentryPlugins: Plugin[] = [kitConfigResolver.plugin, makeBrowserTracingVariantResolverPlugin()];
+  const sentryPlugins: Plugin[] = [
+    kitConfigResolver.plugin,
+    makeBrowserTracingVariantResolverPlugin(),
+    makeOpenTelemetryApiResolverPlugin(),
+  ];
 
   if (mergedOptions.autoInstrument) {
     const pluginOptions: AutoInstrumentSelection = {
@@ -144,6 +148,44 @@ function makeBrowserTracingVariantResolverPlugin(): Plugin {
   };
 }
 
+const OTEL_API_ID = '@opentelemetry/api';
+const OTEL_API_REEXPORT_ID = '@sentry/sveltekit/opentelemetry-api';
+const OTEL_API_REEXPORT_FILE_REGEX = /[\\/]opentelemetryApi\.js$/;
+
+/**
+ * SvelteKit 3 externalizes `@opentelemetry/api` in server builds, so its runtime imports it at runtime
+ * from the app root. That only resolves if the app depends on it directly: under pnpm (or Yarn PnP),
+ * the copy installed through `@sentry/sveltekit` isn't reachable, and Kit fails every request once
+ * `tracing.server` is enabled.
+ *
+ * We redirect the import to our re-export instead, which resolves because the app always depends on
+ * `@sentry/sveltekit` directly. It stays external, so the Kit runtime and `instrumentation.server.js`
+ * still share a single module instance, which is why Kit externalizes it in the first place.
+ */
+function makeOpenTelemetryApiResolverPlugin(): Plugin {
+  let isKit3Promise: Promise<boolean> | undefined;
+
+  return {
+    name: 'sentry-sveltekit-opentelemetry-api',
+    enforce: 'pre',
+    // In dev, Kit's import resolves from Kit's own install location, where pnpm links the peer dep.
+    apply: 'build',
+    async resolveId(id, importer, options) {
+      // Skip our own re-export, in case it gets bundled, so it doesn't re-export itself.
+      if (id !== OTEL_API_ID || !options?.ssr || (importer && OTEL_API_REEXPORT_FILE_REGEX.test(importer))) {
+        return null;
+      }
+
+      isKit3Promise ??= isSvelteKit3(id => this.resolve(id, undefined, { skipSelf: true }));
+      if (!(await isKit3Promise)) {
+        return null;
+      }
+
+      return { id: OTEL_API_REEXPORT_ID, external: true };
+    },
+  };
+}
+
 /**
  * Whether to use the SvelteKit 3 (`$app/state`) variant, from the installed `@sveltejs/kit` version
  * (resolved via the bundler, not `process.cwd()`).
diff --git a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
index 8a4c22597c2c..5221b323d056 100644
--- a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
+++ b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
@@ -1,3 +1,6 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
 import type { Plugin } from 'vite';
 import { describe, expect, it, vi } from 'vitest';
 import * as autoInstrument from '../../src/vite/autoInstrument';
@@ -64,10 +67,11 @@ describe('sentrySvelteKit()', () => {
     const plugins = await getSentrySvelteKitPlugins();
 
     expect(plugins).toBeInstanceOf(Array);
-    // 1 kit config resolver + 1 browser-tracing variant resolver + 1 auto instrument plugin
+    // 1 kit config resolver + 1 browser-tracing variant resolver + 1 OpenTelemetry API resolver
+    // + 1 auto instrument plugin
     // + 1 orchestrion plugin + 1 global values injection plugin + 1 modified main plugin
     // + 3 custom plugins
-    expect(plugins).toHaveLength(9);
+    expect(plugins).toHaveLength(10);
   });
 
   it('returns the custom sentry source maps upload plugin, unmodified sourcemaps plugins and the auto-instrument plugin by default', async () => {
@@ -78,6 +82,8 @@ describe('sentrySvelteKit()', () => {
       'sentry-sveltekit-kit-config-resolver',
       // browser-tracing variant resolver:
       'sentry-sveltekit-browser-tracing-variant',
+      // OpenTelemetry API resolver:
+      'sentry-sveltekit-opentelemetry-api',
       // auto instrument plugin:
       'sentry-auto-instrumentation',
       // orchestrion build-time instrumentation plugin:
@@ -95,7 +101,7 @@ describe('sentrySvelteKit()', () => {
 
   it("doesn't return the sentry source maps plugins if autoUploadSourcemaps is `false`", async () => {
     const plugins = await getSentrySvelteKitPlugins({ autoUploadSourceMaps: false });
-    expect(plugins).toHaveLength(4); // kit config resolver + browser-tracing variant resolver + auto instrument + orchestrion
+    expect(plugins).toHaveLength(5); // kit config resolver + browser-tracing variant resolver + OpenTelemetry API resolver + auto instrument + orchestrion
   });
 
   it("doesn't return the sentry source maps plugins if `NODE_ENV` is development", async () => {
@@ -103,9 +109,9 @@ describe('sentrySvelteKit()', () => {
 
     process.env.NODE_ENV = 'development';
     const plugins = await getSentrySvelteKitPlugins({ autoUploadSourceMaps: true, autoInstrument: true });
-    const instrumentPlugin = plugins[2];
+    const instrumentPlugin = plugins[3];
 
-    expect(plugins).toHaveLength(5); // kit config resolver + browser-tracing variant resolver + auto instrument + orchestrion + global values injection
+    expect(plugins).toHaveLength(6); // kit config resolver + browser-tracing variant resolver + OpenTelemetry API resolver + auto instrument + orchestrion + global values injection
     expect(instrumentPlugin?.name).toEqual('sentry-auto-instrumentation');
 
     process.env.NODE_ENV = previousEnv;
@@ -114,7 +120,7 @@ describe('sentrySvelteKit()', () => {
   it("doesn't return the auto instrument plugin if autoInstrument is `false`", async () => {
     const plugins = await getSentrySvelteKitPlugins({ autoInstrument: false });
     const pluginNames = plugins.map(plugin => plugin.name);
-    expect(plugins).toHaveLength(8); // kit config resolver + browser-tracing variant resolver + orchestrion + global values injection + 1 modified main plugin + 3 custom plugins
+    expect(plugins).toHaveLength(9); // kit config resolver + browser-tracing variant resolver + OpenTelemetry API resolver + orchestrion + global values injection + 1 modified main plugin + 3 custom plugins
     expect(pluginNames).not.toContain('sentry-auto-instrumentation');
   });
 
@@ -226,7 +232,7 @@ describe('sentrySvelteKit()', () => {
       // just to ignore the source maps plugin:
       autoUploadSourceMaps: false,
     });
-    const plugin = plugins[2]!;
+    const plugin = plugins[3]!;
 
     expect(plugin.name).toEqual('sentry-auto-instrumentation');
     expect(makePluginSpy).toHaveBeenCalledWith({
@@ -238,6 +244,55 @@ describe('sentrySvelteKit()', () => {
   });
 });
 
+describe('OpenTelemetry API resolver plugin', () => {
+  async function getResolver(kitVersion: string) {
+    const plugins = await getSentrySvelteKitPlugins({ autoUploadSourceMaps: false });
+    const plugin = plugins.find(p => p.name === 'sentry-sveltekit-opentelemetry-api')!;
+
+    const kitPackageJson = path.join(fs.mkdtempSync(path.join(os.tmpdir(), 'sentry-kit-')), 'package.json');
+    fs.writeFileSync(kitPackageJson, JSON.stringify({ version: kitVersion }));
+    const context = { resolve: vi.fn().mockResolvedValue({ id: kitPackageJson }) };
+
+    const resolveId = (id: string, importer: string | undefined, ssr = true) =>
+      // @ts-expect-error - minimal plugin context
+      plugin.resolveId.call(context, id, importer, { ssr });
+
+    return { plugin, resolveId };
+  }
+
+  it('only applies to builds', async () => {
+    const { plugin } = await getResolver('3.0.0');
+    expect(plugin.apply).toBe('build');
+  });
+
+  it('redirects `@opentelemetry/api` to the external re-export on SvelteKit 3', async () => {
+    const { resolveId } = await getResolver('3.0.0-next.28');
+
+    await expect(resolveId('@opentelemetry/api', '/app/node_modules/@sveltejs/kit/src/instance.js')).resolves.toEqual({
+      id: '@sentry/sveltekit/opentelemetry-api',
+      external: true,
+    });
+  });
+
+  it('leaves `@opentelemetry/api` alone on SvelteKit 2', async () => {
+    const { resolveId } = await getResolver('2.70.2');
+
+    await expect(resolveId('@opentelemetry/api', '/app/src/instrumentation.server.js')).resolves.toBeNull();
+  });
+
+  it('leaves client builds, other ids and the re-export itself alone', async () => {
+    const { resolveId } = await getResolver('3.0.0');
+
+    await expect(resolveId('@opentelemetry/api', '/app/src/hooks.client.js', false)).resolves.toBeNull();
+    await expect(
+      resolveId('@opentelemetry/api/experimental', '/app/src/instrumentation.server.js'),
+    ).resolves.toBeNull();
+    await expect(
+      resolveId('@opentelemetry/api', '/app/node_modules/@sentry/sveltekit/build/esm/opentelemetryApi.js'),
+    ).resolves.toBeNull();
+  });
+});
+
 describe('generateVitePluginOptions', () => {
   it('returns null if no relevant options are provided', () => {
     const options: SentrySvelteKitPluginOptions = {};
diff --git a/packages/tanstackstart-react/README.md b/packages/tanstackstart-react/README.md
index d2eebec0b5b8..c16a1d85d7fa 100644
--- a/packages/tanstackstart-react/README.md
+++ b/packages/tanstackstart-react/README.md
@@ -10,41 +10,18 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/tanstackstart-react.svg)](https://www.npmjs.com/package/@sentry/tanstackstart-react)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/tanstackstart-react.svg)](https://www.npmjs.com/package/@sentry/tanstackstart-react)
 
+The official Sentry SDK for monitoring TanStack Start React applications.
+
 > This SDK is currently in **BETA**. Beta features are still in progress and may have bugs. Please reach out on
 > [GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns.
 
-> See the [Official Sentry TanStack Start SDK Docs](https://docs.sentry.io/platforms/javascript/guides/tanstackstart-react/) to get started.
-
-## Compatibility
-
-The minimum supported version of TanStack Start is `1.111.12`.
-
-## Custom Usage
-
-To set context information or to send manual events, you can use `@sentry/tanstackstart-react` as follows:
-
-```ts
-import * as Sentry from '@sentry/tanstackstart-react';
-
-// Set user information, as well as tags and further extras
-Sentry.setTag('user_mode', 'admin');
-Sentry.setUser({ id: '4711' });
-Sentry.setContext('application_area', { location: 'checkout' });
-
-// Add a breadcrumb for future events
-Sentry.addBreadcrumb({
-  message: '"Add to cart" clicked',
-  // ...
-});
+## Documentation
 
-// Capture exceptions or messages
-Sentry.captureException(new Error('Oh no.'));
-Sentry.captureMessage('Hello, world!');
-```
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/tanstackstart-react/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/tanstackstart-react/configuration/)
+- [TanStack Start React-specific features](https://docs.sentry.io/platforms/javascript/guides/tanstackstart-react/features/)
 
-## Links
+## Support
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/tanstackstart-react/)
-- [Sentry.io](https://sentry.io/?utm_source=github&utm_medium=npm_tanstackstartreact)
-- [Sentry Discord Server](https://discord.gg/Ww9hbqr)
-- [Stack Overflow](https://stackoverflow.com/questions/tagged/sentry)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index bc76a5ba2b3b..bb70edfcc2b8 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -53,7 +53,7 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.1",
     "@sentry/browser-utils": "11.0.0",
-    "@sentry/conventions": "^0.23.0",
+    "@sentry/conventions": "^0.24.0",
     "@sentry/core": "11.0.0",
     "@sentry/node": "11.0.0",
     "@sentry/react": "11.0.0",
diff --git a/packages/typescript/README.md b/packages/typescript/README.md
index 746cf132c841..860302047ad1 100644
--- a/packages/typescript/README.md
+++ b/packages/typescript/README.md
@@ -10,19 +10,13 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/typescript.svg)](https://www.npmjs.com/package/@sentry/typescript)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/typescript.svg)](https://www.npmjs.com/package/@sentry/typescript)
 
+Shared typescript configuration used at Sentry.
+
 > [!NOTE]
 > This package is an internal library published for use by Sentry-owned JavaScript SDK packages and repositories. It is
 > not part of the public API contract and may change in any release. Do not rely on SemVer compatibility if you depend on
 > it directly.
 
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
-
-## General
-
-Shared typescript configuration used at Sentry.
-
 ## Installation
 
 ```sh
@@ -52,3 +46,8 @@ Add the following config files to your project's root directory:
 
 For an example of how to use this package in a monorepo, check out this package's own parent repo,
 https://github.com/getsentry/sentry-javascript.
+
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/vercel-edge/README.md b/packages/vercel-edge/README.md
index 56a6ca051887..1929209d02d5 100644
--- a/packages/vercel-edge/README.md
+++ b/packages/vercel-edge/README.md
@@ -6,16 +6,21 @@
 
 # Internal Sentry Utilities for Vercel Edge Runtime
 
+[![npm version](https://img.shields.io/npm/v/@sentry/vercel-edge.svg)](https://www.npmjs.com/package/@sentry/vercel-edge)
+[![npm dm](https://img.shields.io/npm/dm/@sentry/vercel-edge.svg)](https://www.npmjs.com/package/@sentry/vercel-edge)
+[![npm dt](https://img.shields.io/npm/dt/@sentry/vercel-edge.svg)](https://www.npmjs.com/package/@sentry/vercel-edge)
+
+Internal Sentry SDK for the Vercel Edge Runtime.
+
 > **NOTICE:** It is discouraged to depend on this package directly. `@sentry/vercel-edge` is used as building block for
 > higher level Sentry SDKs like `@sentry/nextjs`. The API of this `@sentry/vercel-edge` may break with any major and
 > non-major version!
 
-[![npm version](https://img.shields.io/npm/v/@sentry/vercel-edge.svg)](https://www.npmjs.com/package/@sentry/vercel-edge)
-[![npm dm](https://img.shields.io/npm/dm/@sentry/vercel-edge.svg)](https://www.npmjs.com/package/@sentry/vercel-edge)
-[![npm dt](https://img.shields.io/npm/dt/@sentry/vercel-edge.svg)](https://www.npmjs.com/package/@sentry/vercel-edge)
+## Documentation
+
+- [Next.js SDK documentation](https://docs.sentry.io/platforms/javascript/guides/nextjs/)
 
-## Links
+## Support
 
-- [Sentry.io](https://sentry.io/?utm_source=github&utm_medium=npm_vercel_edge)
-- [Sentry Discord Server](https://discord.gg/Ww9hbqr)
-- [Stack Overflow](https://stackoverflow.com/questions/tagged/sentry)
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index 9d32602e0c76..30d4a428eefb 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -105,6 +105,7 @@ export {
   openTelemetryIntegration,
   getOtlpTracesEndpoint,
   instrumentMistralAiClient,
+  instrumentTypeSafeClient,
   instrumentOpenAiClient,
   instrumentAnthropicAiClient,
   instrumentGoogleGenAIClient,
diff --git a/packages/vue/README.md b/packages/vue/README.md
index 7573e61e115c..12c89db9dbee 100644
--- a/packages/vue/README.md
+++ b/packages/vue/README.md
@@ -6,87 +6,15 @@
 
 # Official Sentry SDK for Vue.js
 
-## Links
+The official Sentry SDK for monitoring Vue applications.
 
-- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/vue/)
+## Documentation
 
-## General
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/vue/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/vue/configuration/)
+- [Vue-specific features](https://docs.sentry.io/platforms/javascript/guides/vue/features/)
 
-This package is a wrapper around `@sentry/browser`, with added functionality related to Vue.js. All methods available in
-`@sentry/browser` can be imported from `@sentry/vue`.
+## Support
 
-To use this SDK, call `Sentry.init(options)` as early in your application as possible.
-
-### Vue 3
-
-```javascript
-const app = createApp({
-  // ...
-});
-
-Sentry.init({
-  app,
-  dsn: '__PUBLIC_DSN__',
-  integrations: [
-    // Or omit `router` if you're not using vue-router
-    Sentry.browserTracingIntegration({ router }),
-  ],
-});
-```
-
-### Vue 2
-
-```javascript
-import Vue from 'vue';
-import App from './App';
-import router from './router';
-import * as Sentry from '@sentry/vue';
-
-Sentry.init({
-  Vue: Vue,
-  dsn: '__PUBLIC_DSN__',
-  integrations: [
-    // Or omit `router` if you're not using vue-router
-    Sentry.browserTracingIntegration({ router }),
-  ],
-});
-
-new Vue({
-  el: '#app',
-  router,
-  components: { App },
-  template: '<App/>',
-});
-```
-
-### TanStack Router
-
-If you use TanStack Router for Vue instead of Vue Router, you can use the TanStack Router instrumentation to create
-navigation spans and collect meaningful performance data about the health of your page loads and associated requests.
-
-Add `tanstackRouterBrowserTracingIntegration` from `@sentry/vue/tanstackrouter` instead of the regular
-`Sentry.browserTracingIntegration`.
-
-Make sure `tanstackRouterBrowserTracingIntegration` is initialized by your `Sentry.init` call. Otherwise, the routing
-instrumentation will not work properly.
-
-Pass your router instance from `createRouter` to the integration.
-
-```javascript
-import { createApp } from 'vue';
-import { createRouter } from '@tanstack/vue-router';
-import * as Sentry from '@sentry/vue';
-import { tanstackRouterBrowserTracingIntegration } from '@sentry/vue/tanstackrouter';
-
-const router = createRouter({
-  // your router config
-  // ...
-});
-
-Sentry.init({
-  app,
-  dsn: '__PUBLIC_DSN__',
-  integrations: [tanstackRouterBrowserTracingIntegration(router)],
-  tracesSampleRate: 1.0, // Capture 100% of the transactions
-});
-```
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 0ed59f1a490e..6aef15406d8d 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "@sentry/browser": "11.0.0",
     "@sentry/core": "11.0.0",
-    "@sentry/conventions": "^0.23.0"
+    "@sentry/conventions": "^0.24.0"
   },
   "peerDependencies": {
     "@tanstack/vue-router": "^1.64.0",
diff --git a/packages/wasm/README.md b/packages/wasm/README.md
index 3343f6b9730c..a31e43d71ce5 100644
--- a/packages/wasm/README.md
+++ b/packages/wasm/README.md
@@ -10,10 +10,14 @@
 [![npm dm](https://img.shields.io/npm/dm/@sentry/wasm.svg)](https://www.npmjs.com/package/@sentry/wasm)
 [![npm dt](https://img.shields.io/npm/dt/@sentry/wasm.svg)](https://www.npmjs.com/package/@sentry/wasm)
 
-## Links
+WebAssembly stack-trace support for the Sentry JavaScript SDK.
 
-- [Official SDK Docs](https://docs.sentry.io/quickstart/)
+## Documentation
 
-## General
+- [Getting started](https://docs.sentry.io/platforms/javascript/guides/wasm/)
+- [Configuration](https://docs.sentry.io/platforms/javascript/guides/wasm/configuration/)
 
-This package provides support for WebAssembly in stack traces.
+## Support
+
+- [Report a bug](https://github.com/getsentry/sentry-javascript/issues/new/choose)
+- [Contributing](https://github.com/getsentry/sentry-javascript/blob/develop/CONTRIBUTING.md)
diff --git a/packages/wasm/src/index.ts b/packages/wasm/src/index.ts
index d5982201d069..d2568eb774fb 100644
--- a/packages/wasm/src/index.ts
+++ b/packages/wasm/src/index.ts
@@ -1,7 +1,8 @@
-import type { DebugImage, Event, IntegrationFn, StackFrame } from '@sentry/core';
+import type { Event, IntegrationFn, StackFrame } from '@sentry/core';
 import { defineIntegration, GLOBAL_OBJ } from '@sentry/core';
+import { uniqueImageForSyntheticFilename } from './matchSyntheticWasmFilename';
 import { patchWebAssembly } from './patchWebAssembly';
-import { getImage, getImages, registerModule } from './registry';
+import { getImage, getImages, registerModule, toProtocolDebugImage, type RegisteredWasmImage } from './registry';
 
 const INTEGRATION_NAME = 'Wasm';
 
@@ -32,7 +33,7 @@ interface WasmIntegrationOptions {
 
 // Access WINDOW with proper typing for _sentryWasmImages
 const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
-  _sentryWasmImages?: Array<DebugImage>;
+  _sentryWasmImages?: Array<RegisteredWasmImage>;
 };
 
 const _wasmIntegration = ((options: WasmIntegrationOptions = {}) => {
@@ -58,8 +59,8 @@ const _wasmIntegration = ((options: WasmIntegrationOptions = {}) => {
 
       if (hasAtLeastOneWasmFrameWithImage) {
         event.debug_meta = event.debug_meta || {};
-        const mainThreadImages = getImages();
-        const workerImages = WINDOW._sentryWasmImages || [];
+        const mainThreadImages = getImages().map(toProtocolDebugImage);
+        const workerImages = (WINDOW._sentryWasmImages || []).map(toProtocolDebugImage);
         event.debug_meta.images = [...(event.debug_meta.images || []), ...mainThreadImages, ...workerImages];
       }
 
@@ -109,9 +110,11 @@ export function patchFrames(
       match = frame.filename.match(PARSER_REGEX) as null | [string, string, string];
     }
 
+    // `<url>` is the fetch URL, or `wasm://wasm/<name>-<hash>` when Chrome
+    // compiled the module from bytes.
     if (match) {
-      const index = getImage(match[1]);
-      const workerImageIndex = getWorkerImage(match[1]);
+      let index = getImage(match[1]);
+      let workerImageIndex = getWorkerImage(match[1]);
       frame.instruction_addr = match[2];
       frame.filename = match[1];
       frame.platform = 'native';
@@ -123,6 +126,19 @@ export function patchFrames(
         };
       }
 
+      // Exact `code_file` miss: `match[1]` is `wasm://wasm/…`, not the registered http URL.
+      if (index < 0 && workerImageIndex < 0) {
+        const unique = uniqueImageForSyntheticFilename(match[1], getImages(), WINDOW._sentryWasmImages || []);
+        if (unique) {
+          frame.filename = unique.codeFile;
+          if (unique.worker) {
+            workerImageIndex = unique.index;
+          } else {
+            index = unique.index;
+          }
+        }
+      }
+
       if (index >= 0) {
         frame.addr_mode = `rel:${existingImagesOffset + index}`;
         hasAtLeastOneWasmFrameWithImage = true;
diff --git a/packages/wasm/src/matchSyntheticWasmFilename.ts b/packages/wasm/src/matchSyntheticWasmFilename.ts
new file mode 100644
index 000000000000..bad38e020475
--- /dev/null
+++ b/packages/wasm/src/matchSyntheticWasmFilename.ts
@@ -0,0 +1,63 @@
+import type { RegisteredWasmImage } from './registry';
+
+/**
+ * Maps Chrome `wasm://wasm/<name>-<hash>` frames to a registered `code_file`.
+ *
+ * V8 builds the label from the wasm `name` section, which is parsed into
+ * `moduleName` at registration. A hit is accepted only when every image with
+ * that name shares one `debug_id`, since a page and a worker can register the
+ * same binary under different URLs.
+ *
+ * Hash-only `wasm://wasm/<hash>` labels carry no name and are not mapped
+ * (see #23781).
+ */
+
+export type SyntheticWasmImageHit = {
+  index: number;
+  worker: boolean;
+  codeFile: string;
+};
+
+/**
+ * Module name from Chrome's label: `wasm://wasm/demo.wasm-000197f6` → `demo.wasm`.
+ *
+ * V8 appends the `-<hash>` suffix only after a module name. A label without
+ * it is hash-only and yields `undefined`, so a hex-looking module name such
+ * as `ed25519` is still returned.
+ */
+export function syntheticModuleName(filename: string): string | undefined {
+  const body = filename.match(/^wasm:\/\/wasm\/(.+)$/i)?.[1];
+  if (!body) {
+    return undefined;
+  }
+  const name = body.replace(/-[0-9a-fA-F]{6,16}$/, '');
+  return name === body ? undefined : name;
+}
+
+export function uniqueImageForSyntheticFilename(
+  filename: string,
+  pageImages: ReadonlyArray<RegisteredWasmImage>,
+  workerImages: ReadonlyArray<RegisteredWasmImage>,
+): SyntheticWasmImageHit | undefined {
+  const name = syntheticModuleName(filename);
+  if (!name) {
+    return undefined;
+  }
+
+  const hits: Array<SyntheticWasmImageHit & { debugId: string }> = [];
+  const consider = (images: ReadonlyArray<RegisteredWasmImage>, worker: boolean): void => {
+    images.forEach((image, index) => {
+      if (image.moduleName === name) {
+        hits.push({ index, worker, codeFile: image.code_file, debugId: image.debug_id });
+      }
+    });
+  };
+  consider(pageImages, false);
+  consider(workerImages, true);
+
+  const hit = hits[0];
+  if (!hit || hits.some(other => other.debugId !== hit.debugId)) {
+    return undefined;
+  }
+  return { index: hit.index, worker: hit.worker, codeFile: hit.codeFile };
+}
diff --git a/packages/wasm/src/registry.ts b/packages/wasm/src/registry.ts
index 2ca6d66754dc..0b606451d7fa 100644
--- a/packages/wasm/src/registry.ts
+++ b/packages/wasm/src/registry.ts
@@ -1,10 +1,17 @@
 import type { DebugImage } from '@sentry/core';
+import { parseNameSectionModuleName } from './wasmNameSection';
 
-export const IMAGES: Array<DebugImage> = [];
+export type RegisteredWasmImage = Extract<DebugImage, { type: 'wasm' }> & {
+  /** Internal: wasm `name` section. Used to link `wasm://` stacks; stripped before the event is sent. */
+  moduleName?: string;
+};
+
+export const IMAGES: Array<RegisteredWasmImage> = [];
 
 export interface ModuleInfo {
   buildId: string | null;
   debugFile: string | null;
+  moduleName: string | null;
 }
 
 /**
@@ -34,14 +41,25 @@ export function getModuleInfo(module: WebAssembly.Module): ModuleInfo {
     debugFile = decoder.decode(firstExternalDebugInfo);
   }
 
-  return { buildId, debugFile };
+  let moduleName = null;
+  try {
+    const nameSections = WebAssembly.Module.customSections(module, 'name');
+    const nameSection0 = nameSections[0];
+    if (nameSection0) {
+      moduleName = parseNameSectionModuleName(nameSection0);
+    }
+  } catch {
+    moduleName = null;
+  }
+
+  return { buildId, debugFile, moduleName };
 }
 
 /**
  * Records a module and returns the created debug image.
  */
-export function registerModule(module: WebAssembly.Module, url: string): DebugImage | null {
-  const { buildId, debugFile } = getModuleInfo(module);
+export function registerModule(module: WebAssembly.Module, url: string): RegisteredWasmImage | null {
+  const { buildId, debugFile, moduleName } = getModuleInfo(module);
   if (!buildId) {
     return null;
   }
@@ -61,13 +79,16 @@ export function registerModule(module: WebAssembly.Module, url: string): DebugIm
     }
   }
 
-  const image: DebugImage = {
+  const image: RegisteredWasmImage = {
     type: 'wasm',
     code_id: buildId,
     code_file: url,
     debug_file: debugFileUrl,
     debug_id: `${buildId.padEnd(32, '0').slice(0, 32)}0`,
   };
+  if (moduleName) {
+    image.moduleName = moduleName;
+  }
 
   IMAGES.push(image);
   return image;
@@ -76,10 +97,18 @@ export function registerModule(module: WebAssembly.Module, url: string): DebugIm
 /**
  * Returns all known images.
  */
-export function getImages(): Array<DebugImage> {
+export function getImages(): Array<RegisteredWasmImage> {
   return IMAGES;
 }
 
+/**
+ * Debug image payload for Sentry: protocol fields only (no internal `moduleName`).
+ */
+export function toProtocolDebugImage(image: RegisteredWasmImage): DebugImage {
+  const { moduleName: _moduleName, ...protocol } = image;
+  return protocol;
+}
+
 /**
  * Looks up an image by URL.
  *
diff --git a/packages/wasm/src/wasmNameSection.ts b/packages/wasm/src/wasmNameSection.ts
new file mode 100644
index 000000000000..14878655cc3c
--- /dev/null
+++ b/packages/wasm/src/wasmNameSection.ts
@@ -0,0 +1,86 @@
+/* eslint-disable no-bitwise -- LEB128 is a bitwise encoding */
+
+/**
+ * Parses the wasm `name` custom section payload — the bytes
+ * `WebAssembly.Module.customSections(module, 'name')` returns.
+ *
+ * Chrome's buffer-compiled stacks use this module name as `wasm://wasm/<name>-<hash>`,
+ * which often differs from the fetch URL (wasm-bindgen `demo.wasm` vs `demo_bg.wasm`).
+ * Missing, stripped, or malformed sections return null. Callers then guess from
+ * the fetch URL basename if the name is missing or does not match the stack.
+ *
+ * @see https://webassembly.github.io/spec/core/appendix/custom.html#name-section
+ */
+export function parseNameSectionModuleName(source: ArrayBuffer | Uint8Array): string | null {
+  try {
+    return readModuleName(toBytes(source));
+  } catch {
+    return null;
+  }
+}
+
+function toBytes(source: ArrayBuffer | Uint8Array): Uint8Array {
+  if (source instanceof ArrayBuffer) {
+    return new Uint8Array(source);
+  }
+  return new Uint8Array(source.buffer, source.byteOffset, source.byteLength);
+}
+
+function readModuleName(bytes: Uint8Array): string | null {
+  const cursor = { offset: 0 };
+  while (cursor.offset < bytes.length) {
+    const id = bytes[cursor.offset];
+    cursor.offset += 1;
+    if (id === undefined) {
+      return null;
+    }
+
+    const size = readU32Leb(bytes, cursor);
+    if (size === undefined || cursor.offset + size > bytes.length) {
+      return null;
+    }
+
+    const start = cursor.offset;
+    cursor.offset += size;
+    if (id === 0) {
+      return readName(bytes.subarray(start, start + size));
+    }
+  }
+
+  return null;
+}
+
+function readName(bytes: Uint8Array): string | null {
+  const cursor = { offset: 0 };
+  const length = readU32Leb(bytes, cursor);
+  if (length === undefined || length === 0 || cursor.offset + length !== bytes.length) {
+    return null;
+  }
+
+  try {
+    return new TextDecoder('utf-8', { fatal: true }).decode(bytes.subarray(cursor.offset));
+  } catch {
+    return null;
+  }
+}
+
+function readU32Leb(bytes: Uint8Array, cursor: { offset: number }): number | undefined {
+  let result = 0;
+  let shift = 0;
+
+  while (cursor.offset < bytes.length) {
+    const byte = bytes[cursor.offset];
+    cursor.offset += 1;
+    if (byte === undefined || shift >= 35) {
+      return undefined;
+    }
+
+    result |= (byte & 0x7f) << shift;
+    if ((byte & 0x80) === 0) {
+      return result >>> 0;
+    }
+    shift += 7;
+  }
+
+  return undefined;
+}
diff --git a/packages/wasm/test/matchSyntheticWasmFilename.test.ts b/packages/wasm/test/matchSyntheticWasmFilename.test.ts
new file mode 100644
index 000000000000..13775818c72a
--- /dev/null
+++ b/packages/wasm/test/matchSyntheticWasmFilename.test.ts
@@ -0,0 +1,103 @@
+import { describe, expect, it } from 'vitest';
+import { syntheticModuleName, uniqueImageForSyntheticFilename } from '../src/matchSyntheticWasmFilename';
+import type { RegisteredWasmImage } from '../src/registry';
+
+const DEMO_BG_URL = 'http://localhost:8080/web/assets/rust/demo_bg.wasm';
+const DEBUG_ID_A = 'aaa00000000000000000000000000000';
+const DEBUG_ID_B = 'bbb00000000000000000000000000000';
+
+function wasmImage(overrides: Partial<RegisteredWasmImage>): RegisteredWasmImage {
+  return {
+    type: 'wasm',
+    code_id: 'aaa',
+    code_file: DEMO_BG_URL,
+    debug_file: null,
+    debug_id: DEBUG_ID_A,
+    moduleName: 'demo.wasm',
+    ...overrides,
+  };
+}
+
+describe('syntheticModuleName()', () => {
+  it('strips the Chrome isolate hash', () => {
+    expect(syntheticModuleName('wasm://wasm/demo.wasm-000197f6')).toBe('demo.wasm');
+  });
+
+  it('returns undefined for a hash-only label', () => {
+    expect(syntheticModuleName('wasm://wasm/0bee4c4e')).toBeUndefined();
+  });
+
+  it('keeps a hex-looking module name that carries a hash suffix', () => {
+    expect(syntheticModuleName('wasm://wasm/ed25519-000197f6')).toBe('ed25519');
+  });
+
+  it('returns undefined for a fetch URL', () => {
+    expect(syntheticModuleName(DEMO_BG_URL)).toBeUndefined();
+  });
+});
+
+describe('uniqueImageForSyntheticFilename()', () => {
+  it('matches the image whose moduleName equals the label', () => {
+    expect(uniqueImageForSyntheticFilename('wasm://wasm/demo.wasm-000197f6', [wasmImage({})], [])).toEqual({
+      index: 0,
+      worker: false,
+      codeFile: DEMO_BG_URL,
+    });
+  });
+
+  it('accepts a hit when every image with that name shares one debug_id', () => {
+    const pageImages = [
+      wasmImage({ code_file: 'http://localhost:8001/v1/demo_bg.wasm' }),
+      wasmImage({ code_file: 'http://cdn.example/demo_bg.wasm' }),
+    ];
+
+    expect(uniqueImageForSyntheticFilename('wasm://wasm/demo.wasm-000197f6', pageImages, [])).toEqual({
+      index: 0,
+      worker: false,
+      codeFile: 'http://localhost:8001/v1/demo_bg.wasm',
+    });
+  });
+
+  it('does not guess when two modules share a moduleName but not debug_id', () => {
+    const pageImages = [
+      wasmImage({ code_file: 'http://localhost:8001/v1/demo_bg.wasm' }),
+      wasmImage({ code_id: 'bbb', debug_id: DEBUG_ID_B, code_file: 'http://localhost:8001/v2/demo_bg.wasm' }),
+    ];
+
+    expect(uniqueImageForSyntheticFilename('wasm://wasm/demo.wasm-000197f6', pageImages, [])).toBeUndefined();
+  });
+
+  it('does not match an image whose moduleName differs', () => {
+    expect(
+      uniqueImageForSyntheticFilename('wasm://wasm/demo.wasm-000197f6', [wasmImage({ moduleName: 'crate' })], []),
+    ).toBeUndefined();
+  });
+
+  it('does not match an image without a name section', () => {
+    expect(
+      uniqueImageForSyntheticFilename('wasm://wasm/demo.wasm-000197f6', [wasmImage({ moduleName: undefined })], []),
+    ).toBeUndefined();
+  });
+
+  it('matches a hex-looking module name', () => {
+    const image = wasmImage({ moduleName: 'ed25519', code_file: 'http://localhost:8080/ed25519_bg.wasm' });
+
+    expect(uniqueImageForSyntheticFilename('wasm://wasm/ed25519-000197f6', [image], [])).toEqual({
+      index: 0,
+      worker: false,
+      codeFile: 'http://localhost:8080/ed25519_bg.wasm',
+    });
+  });
+
+  it('does not map a hash-only wasm:// label', () => {
+    expect(uniqueImageForSyntheticFilename('wasm://wasm/0bee4c4e', [wasmImage({})], [])).toBeUndefined();
+  });
+
+  it('matches a worker image by module name', () => {
+    expect(uniqueImageForSyntheticFilename('wasm://wasm/demo.wasm-000197f6', [], [wasmImage({})])).toEqual({
+      index: 0,
+      worker: true,
+      codeFile: DEMO_BG_URL,
+    });
+  });
+});
diff --git a/packages/wasm/test/processEvent.test.ts b/packages/wasm/test/processEvent.test.ts
index d855b97b8185..d8d1f05a6a9e 100644
--- a/packages/wasm/test/processEvent.test.ts
+++ b/packages/wasm/test/processEvent.test.ts
@@ -1,7 +1,13 @@
-import type { Event } from '@sentry/core';
+import type { DebugImage, Event } from '@sentry/core';
+import { GLOBAL_OBJ } from '@sentry/core';
 import { afterEach, describe, expect, it } from 'vitest';
 import { wasmIntegration } from '../src/index';
-import { IMAGES } from '../src/registry';
+import { IMAGES, registerModule } from '../src/registry';
+import { wasmWithBuildIdAndModuleName, compileFixture } from './wasmModuleFixtures';
+
+const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+  _sentryWasmImages?: Array<DebugImage>;
+};
 
 const WASM_FILENAME = 'http://localhost:8001/main.wasm:wasm-function[10]:0x1234';
 
@@ -12,6 +18,7 @@ function exceptionValue(): NonNullable<NonNullable<Event['exception']>['values']
 describe('processEvent()', () => {
   afterEach(() => {
     IMAGES.length = 0;
+    delete WINDOW._sentryWasmImages;
   });
 
   it('patches frames of all exception values, not only the first matching one', () => {
@@ -35,4 +42,258 @@ describe('processEvent()', () => {
     expect(frames?.[1]?.addr_mode).toBe('rel:0');
     expect(event.debug_meta?.images).toHaveLength(1);
   });
+
+  it('attaches a wasm:// image when page and worker registered the same moduleName and debug_id', () => {
+    const image = {
+      type: 'wasm' as const,
+      code_id: 'abc123',
+      code_file: 'http://localhost:8080/web/assets/emscripten-raycast/maze.split.wasm',
+      debug_file: null,
+      debug_id: 'abc12300000000000000000000000000',
+      moduleName: 'maze.split.wasm',
+    };
+    IMAGES.push(image);
+    WINDOW._sentryWasmImages = [image];
+
+    const integration = wasmIntegration();
+    const event = integration.processEvent?.(
+      {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [
+                  {
+                    filename: 'wasm://wasm/maze.split.wasm-000197f6:wasm-function[10]:0x283d',
+                    function: 'trigger_crash_divzero',
+                    in_app: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      {},
+      {} as never,
+    ) as Event;
+
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.addr_mode).toBe('rel:0');
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.filename).toBe(
+      'http://localhost:8080/web/assets/emscripten-raycast/maze.split.wasm',
+    );
+    expect(event.debug_meta?.images).toHaveLength(2);
+  });
+
+  it('attaches a wasm:// image when the same debug_id is registered under two URLs', () => {
+    IMAGES.push(
+      {
+        type: 'wasm',
+        code_id: 'abc123',
+        code_file: 'http://localhost:8001/v1/app.wasm',
+        debug_file: null,
+        debug_id: 'abc12300000000000000000000000000',
+        moduleName: 'app.wasm',
+      },
+      {
+        type: 'wasm',
+        code_id: 'abc123',
+        code_file: 'http://cdn.example/app.wasm',
+        debug_file: null,
+        debug_id: 'abc12300000000000000000000000000',
+        moduleName: 'app.wasm',
+      },
+    );
+
+    const integration = wasmIntegration();
+    const event = integration.processEvent?.(
+      {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [
+                  {
+                    filename: 'wasm://wasm/app.wasm-abc123:wasm-function[10]:0x10',
+                    function: 'run',
+                    in_app: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      {},
+      {} as never,
+    ) as Event;
+
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.addr_mode).toBe('rel:0');
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.filename).toBe('http://localhost:8001/v1/app.wasm');
+    expect(event.debug_meta?.images).toHaveLength(2);
+  });
+
+  it('attaches a wasm:// image when the name section differs from the fetch basename', () => {
+    const module = compileFixture(wasmWithBuildIdAndModuleName([0xaa, 0xbb], 'demo.wasm'));
+    registerModule(module, 'http://localhost:8080/web/assets/rust/demo_bg.wasm');
+
+    const integration = wasmIntegration();
+    const event = integration.processEvent?.(
+      {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [
+                  {
+                    filename: 'wasm://wasm/demo.wasm-000197f6:wasm-function[10]:0x283d',
+                    function: 'trigger_crash_divzero',
+                    in_app: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      {},
+      {} as never,
+    ) as Event;
+
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.addr_mode).toBe('rel:0');
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.filename).toBe(
+      'http://localhost:8080/web/assets/rust/demo_bg.wasm',
+    );
+    expect(event.debug_meta?.images).toHaveLength(1);
+    expect(event.debug_meta?.images?.[0]).toEqual({
+      type: 'wasm',
+      code_id: 'aabb',
+      code_file: 'http://localhost:8080/web/assets/rust/demo_bg.wasm',
+      debug_file: null,
+      debug_id: 'aabb00000000000000000000000000000',
+    });
+  });
+  it('does not guess a wasm:// image when two modules share a name-section name', () => {
+    IMAGES.push(
+      {
+        type: 'wasm',
+        code_id: 'aaa',
+        code_file: 'http://localhost:8001/v1/demo_bg.wasm',
+        debug_file: null,
+        debug_id: 'aaa00000000000000000000000000000',
+        moduleName: 'demo.wasm',
+      },
+      {
+        type: 'wasm',
+        code_id: 'bbb',
+        code_file: 'http://localhost:8001/v2/demo_bg.wasm',
+        debug_file: null,
+        debug_id: 'bbb00000000000000000000000000000',
+        moduleName: 'demo.wasm',
+      },
+    );
+
+    const integration = wasmIntegration();
+    const event = integration.processEvent?.(
+      {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [
+                  {
+                    filename: 'wasm://wasm/demo.wasm-000197f6:wasm-function[10]:0x10',
+                    function: 'run',
+                    in_app: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      {},
+      {} as never,
+    ) as Event;
+
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.addr_mode).toBeUndefined();
+    expect(event.debug_meta?.images).toBeUndefined();
+  });
+
+  it('does not attach debug_meta for a hash-only wasm:// frame', () => {
+    IMAGES.push({
+      type: 'wasm',
+      code_id: 'abc123',
+      code_file: 'http://localhost:8080/web/assets/rust/demo_bg.wasm',
+      debug_file: null,
+      debug_id: 'abc12300000000000000000000000000',
+      moduleName: 'demo.wasm',
+    });
+
+    const integration = wasmIntegration();
+    const event = integration.processEvent?.(
+      {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [
+                  {
+                    filename: 'wasm://wasm/0bee4c4e:wasm-function[10]:0x10',
+                    function: 'run',
+                    in_app: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      {},
+      {} as never,
+    ) as Event;
+
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.filename).toBe('wasm://wasm/0bee4c4e');
+    expect(event.debug_meta?.images).toBeUndefined();
+  });
+
+  it('matches http://…/demo_bg.wasm:wasm-function frames via exact code_file', () => {
+    IMAGES.push({
+      type: 'wasm',
+      code_id: 'aabb',
+      code_file: 'http://localhost:8080/web/assets/rust/demo_bg.wasm',
+      debug_file: null,
+      debug_id: 'aabb00000000000000000000000000000',
+    });
+
+    const integration = wasmIntegration();
+    const event = integration.processEvent?.(
+      {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [
+                  {
+                    filename: 'http://localhost:8080/web/assets/rust/demo_bg.wasm:wasm-function[10]:0x283d',
+                    function: 'trigger_crash_divzero',
+                    in_app: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+      {},
+      {} as never,
+    ) as Event;
+
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.filename).toBe(
+      'http://localhost:8080/web/assets/rust/demo_bg.wasm',
+    );
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.instruction_addr).toBe('0x283d');
+    expect(event.exception?.values?.[0]?.stacktrace?.frames?.[0]?.addr_mode).toBe('rel:0');
+    expect(event.debug_meta?.images).toHaveLength(1);
+  });
 });
diff --git a/packages/wasm/test/registry.test.ts b/packages/wasm/test/registry.test.ts
new file mode 100644
index 000000000000..ae0b030148de
--- /dev/null
+++ b/packages/wasm/test/registry.test.ts
@@ -0,0 +1,62 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import { getModuleInfo, IMAGES, registerModule, toProtocolDebugImage } from '../src/registry';
+import {
+  compileFixture,
+  wasmWithBuildIdAndFunctionNamesOnly,
+  wasmWithBuildIdAndModuleName,
+  wasmWithBuildIdOnly,
+} from './wasmModuleFixtures';
+
+const CODE_FILE = 'http://localhost:8080/web/assets/rust/demo_bg.wasm';
+
+describe('registerModule() name section', () => {
+  afterEach(() => {
+    IMAGES.length = 0;
+  });
+
+  it('stores the name-section module name on the debug image', () => {
+    const module = compileFixture(wasmWithBuildIdAndModuleName([0xaa, 0xbb], 'demo.wasm'));
+
+    const image = registerModule(module, CODE_FILE);
+
+    expect(image).toEqual({
+      type: 'wasm',
+      code_id: 'aabb',
+      code_file: CODE_FILE,
+      debug_file: null,
+      debug_id: 'aabb00000000000000000000000000000',
+      moduleName: 'demo.wasm',
+    });
+  });
+
+  it('omits moduleName when the name section is stripped', () => {
+    const module = compileFixture(wasmWithBuildIdOnly([0xaa, 0xbb]));
+
+    const image = registerModule(module, CODE_FILE);
+
+    expect(image?.moduleName).toBeUndefined();
+    expect(getModuleInfo(module).moduleName).toBeNull();
+  });
+
+  it('omits moduleName when the name section has no module name', () => {
+    const module = compileFixture(wasmWithBuildIdAndFunctionNamesOnly([0xaa, 0xbb]));
+
+    const image = registerModule(module, CODE_FILE);
+
+    expect(image?.moduleName).toBeUndefined();
+  });
+
+  it('omits moduleName from the protocol debug image', () => {
+    const module = compileFixture(wasmWithBuildIdAndModuleName([0xaa, 0xbb], 'demo.wasm'));
+    const image = registerModule(module, CODE_FILE);
+
+    expect(image).not.toBeNull();
+    expect(toProtocolDebugImage(image!)).toEqual({
+      type: 'wasm',
+      code_id: 'aabb',
+      code_file: CODE_FILE,
+      debug_file: null,
+      debug_id: 'aabb00000000000000000000000000000',
+    });
+  });
+});
diff --git a/packages/wasm/test/wasmModuleFixtures.ts b/packages/wasm/test/wasmModuleFixtures.ts
new file mode 100644
index 000000000000..ed5a648ce1d8
--- /dev/null
+++ b/packages/wasm/test/wasmModuleFixtures.ts
@@ -0,0 +1,56 @@
+/* eslint-disable no-bitwise -- LEB128 is a bitwise encoding */
+
+const WASM_MAGIC = [0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00];
+
+export function u32leb(n: number): number[] {
+  const bytes: number[] = [];
+  let value = n >>> 0;
+  do {
+    let byte = value & 0x7f;
+    value >>>= 7;
+    if (value !== 0) {
+      byte |= 0x80;
+    }
+    bytes.push(byte);
+  } while (value !== 0);
+  return bytes;
+}
+
+export function encodeUtf8(text: string): number[] {
+  return Array.from(new TextEncoder().encode(text));
+}
+
+export function customSection(sectionName: string, payload: number[]): number[] {
+  const nameBytes = encodeUtf8(sectionName);
+  const body = [...u32leb(nameBytes.length), ...nameBytes, ...payload];
+  return [0, ...u32leb(body.length), ...body];
+}
+
+/** Payload of a `name` custom section containing only the module-name subsection. */
+export function nameSectionPayload(moduleName: string): number[] {
+  const nameBytes = encodeUtf8(moduleName);
+  const subsection = [...u32leb(nameBytes.length), ...nameBytes];
+  return [0, ...u32leb(subsection.length), ...subsection];
+}
+
+export function wasmModuleBytes(sections: number[][]): Uint8Array {
+  return Uint8Array.from([...WASM_MAGIC, ...sections.flat()]);
+}
+
+export function compileFixture(bytes: Uint8Array): WebAssembly.Module {
+  const buffer = new ArrayBuffer(bytes.byteLength);
+  new Uint8Array(buffer).set(bytes);
+  return new WebAssembly.Module(buffer);
+}
+
+export function wasmWithBuildIdAndModuleName(buildId: number[], moduleName: string): Uint8Array {
+  return wasmModuleBytes([customSection('build_id', buildId), customSection('name', nameSectionPayload(moduleName))]);
+}
+
+export function wasmWithBuildIdOnly(buildId: number[]): Uint8Array {
+  return wasmModuleBytes([customSection('build_id', buildId)]);
+}
+
+export function wasmWithBuildIdAndFunctionNamesOnly(buildId: number[]): Uint8Array {
+  return wasmModuleBytes([customSection('build_id', buildId), customSection('name', [1, ...u32leb(1), 0])]);
+}
diff --git a/packages/wasm/test/wasmNameSection.test.ts b/packages/wasm/test/wasmNameSection.test.ts
new file mode 100644
index 000000000000..3f21c7792cc5
--- /dev/null
+++ b/packages/wasm/test/wasmNameSection.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from 'vitest';
+import { parseNameSectionModuleName } from '../src/wasmNameSection';
+import {
+  compileFixture,
+  customSection,
+  nameSectionPayload,
+  u32leb,
+  wasmModuleBytes,
+  wasmWithBuildIdAndFunctionNamesOnly,
+  wasmWithBuildIdAndModuleName,
+  wasmWithBuildIdOnly,
+} from './wasmModuleFixtures';
+
+describe('parseNameSectionModuleName()', () => {
+  it('reads the module name from fixture bytes', () => {
+    expect(parseNameSectionModuleName(Uint8Array.from(nameSectionPayload('demo.wasm')))).toBe('demo.wasm');
+  });
+
+  it('reads the name section Chrome would see on a compiled module', () => {
+    const module = compileFixture(wasmWithBuildIdAndModuleName([0xaa, 0xbb], 'demo.wasm'));
+    const sections = WebAssembly.Module.customSections(module, 'name');
+
+    expect(sections).toHaveLength(1);
+    expect(parseNameSectionModuleName(sections[0] as ArrayBuffer)).toBe('demo.wasm');
+  });
+
+  it('returns null when the name section is missing', () => {
+    const module = compileFixture(wasmWithBuildIdOnly([0xaa]));
+    const sections = WebAssembly.Module.customSections(module, 'name');
+
+    expect(sections).toHaveLength(0);
+    expect(parseNameSectionModuleName(new Uint8Array())).toBeNull();
+  });
+
+  it('returns null when only function names are present', () => {
+    const module = compileFixture(wasmWithBuildIdAndFunctionNamesOnly([0xaa]));
+    const sections = WebAssembly.Module.customSections(module, 'name');
+
+    expect(sections).toHaveLength(1);
+    expect(parseNameSectionModuleName(sections[0] as ArrayBuffer)).toBeNull();
+  });
+
+  it('skips later subsections after the module name', () => {
+    const moduleName = nameSectionPayload('demo.wasm');
+    const functionNames = [1, ...u32leb(1), 0];
+    expect(parseNameSectionModuleName(Uint8Array.from([...moduleName, ...functionNames]))).toBe('demo.wasm');
+  });
+
+  it('returns null for a truncated subsection', () => {
+    expect(parseNameSectionModuleName(Uint8Array.from([0, 10]))).toBeNull();
+  });
+
+  it('returns null for an empty module name', () => {
+    expect(parseNameSectionModuleName(Uint8Array.from([0, ...u32leb(1), 0]))).toBeNull();
+  });
+
+  it('returns null for invalid UTF-8', () => {
+    expect(parseNameSectionModuleName(Uint8Array.from([0, ...u32leb(2), 1, 0xff]))).toBeNull();
+  });
+
+  it('does not throw on a full wasm binary passed by mistake', () => {
+    const bytes = wasmModuleBytes([customSection('build_id', [0xaa])]);
+    expect(parseNameSectionModuleName(bytes)).toBeNull();
+  });
+});
diff --git a/packages/wasm/test/webworker.test.ts b/packages/wasm/test/webworker.test.ts
index a4b42aefd77c..ce559cb75d0e 100644
--- a/packages/wasm/test/webworker.test.ts
+++ b/packages/wasm/test/webworker.test.ts
@@ -2,6 +2,7 @@ import type { DebugImage, StackFrame } from '@sentry/core';
 import { GLOBAL_OBJ } from '@sentry/core';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { patchFrames, registerWebWorkerWasm } from '../src/index';
+import { IMAGES } from '../src/registry';
 import { restoreWasmGlobals, saveWasmGlobals } from './wasmTestHelpers';
 
 const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
@@ -48,6 +49,7 @@ describe('registerWebWorkerWasm()', () => {
 
 describe('patchFrames() with worker images', () => {
   afterEach(() => {
+    IMAGES.length = 0;
     delete WINDOW._sentryWasmImages;
   });
 
@@ -150,4 +152,58 @@ describe('patchFrames() with worker images', () => {
     expect(result).toBe(true);
     expect(frames[0]?.addr_mode).toBe('rel:3');
   });
+
+  it('matches wasm:// frames when page and worker registered the same moduleName', () => {
+    const image = {
+      type: 'wasm' as const,
+      code_id: 'abc123',
+      code_file: 'http://localhost:8080/web/assets/emscripten-raycast/maze.split.wasm',
+      debug_file: null,
+      debug_id: 'abc12300000000000000000000000000',
+      moduleName: 'maze.split.wasm',
+    };
+    IMAGES.push(image);
+    WINDOW._sentryWasmImages = [image];
+
+    const frames: StackFrame[] = [
+      {
+        filename: 'wasm://wasm/maze.split.wasm-000197f6:wasm-function[10]:0x283d',
+        function: 'trigger_crash_divzero',
+        in_app: true,
+      },
+    ];
+
+    const result = patchFrames(frames);
+
+    expect(result).toBe(true);
+    expect(frames[0]?.filename).toBe('http://localhost:8080/web/assets/emscripten-raycast/maze.split.wasm');
+    expect(frames[0]?.addr_mode).toBe('rel:0');
+  });
+
+  it('matches wasm:// frames to a worker image by name-section module name', () => {
+    WINDOW._sentryWasmImages = [
+      {
+        type: 'wasm',
+        code_id: 'aabb',
+        code_file: 'http://localhost:8080/web/assets/rust/demo_bg.wasm',
+        debug_file: null,
+        debug_id: 'aabb00000000000000000000000000000',
+        moduleName: 'demo.wasm',
+      },
+    ];
+
+    const frames: StackFrame[] = [
+      {
+        filename: 'wasm://wasm/demo.wasm-000197f6:wasm-function[10]:0x283d',
+        function: 'trigger_crash_divzero',
+        in_app: true,
+      },
+    ];
+
+    const result = patchFrames(frames);
+
+    expect(result).toBe(true);
+    expect(frames[0]?.filename).toBe('http://localhost:8080/web/assets/rust/demo_bg.wasm');
+    expect(frames[0]?.addr_mode).toBe('rel:0');
+  });
 });
diff --git a/scripts/report-ci-failures.mjs b/scripts/report-ci-failures.mjs
deleted file mode 100644
index 58278b4b5a8f..000000000000
--- a/scripts/report-ci-failures.mjs
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * CI Failure Reporter script.
- *
- * Creates GitHub issues for tests that fail on the develop branch.
- * For each failed job in the workflow run, it fetches check run annotations
- * to identify individual failing tests, then creates one issue per failing
- * test using the FLAKY_CI_FAILURE_TEMPLATE.md template. Existing open issues
- * with matching titles are skipped to avoid duplicates.
- *
- * Intended to be called from a GitHub Actions workflow via actions/github-script:
- *
- *   const { default: run } = await import(
- *     `${process.env.GITHUB_WORKSPACE}/scripts/report-ci-failures.mjs`
- *   );
- *   await run({ github, context, core });
- */
-
-import { readFileSync } from 'node:fs';
-
-/**
- * Collapse matrix variants of a job name so the same test failing across the matrix dedupes to a
- * single issue instead of one per variant. We strip version-like parenthetical groups — a bare
- * number (node version), a `TS x.y` bracket, a `Node xx` bracket, or a `n/m` shard — and fold the
- * Playwright bundle/esm build configs and E2E `-node-xx` app suffixes into a single bucket, leaving
- * other parentheticals (e.g. `(nextjs-app, 20)`) intact:
- *
- *   "Node (22) Integration Tests"              -> "Node Integration Tests"
- *   "Node (24) (TS 5.0) Integration Tests"     -> "Node Integration Tests"
- *   "aws-serverless-layer (Node 22) Test"      -> "aws-serverless-layer Test"
- *   "Playwright bundle_tracing_replay Tests"   -> "Playwright Tests"
- *   "Playwright esm (1/4) Tests"               -> "Playwright Tests"
- *   "E2E some-app-node-20-18 Test"             -> "E2E some-app Test"
- */
-function normalizeJobName(name) {
-  return name
-    .replace(/\(\s*(?:\d+|TS\s+[\d.]+|Node\s+\d+|\d+\/\d+)\s*\)/gi, ' ')
-    .replace(/Playwright\s+(?:bundle\w*|esm|cjs)\s+Tests/gi, 'Playwright Tests')
-    .replace(/-node-\d+(?:-\d+)*/gi, '')
-    .replace(/\s+/g, ' ')
-    .trim();
-}
-
-/**
- * Collapse variants of a test name so the same test failing under different module formats, browser
- * projects, or (for Playwright) at a different source line dedupes to a single issue. We strip:
- *
- *   - Playwright browser prefix:   "[chromium] › suites/... " -> "suites/... "
- *   - Playwright file line/column: "test.ts:33:11 › ..."      -> "test.ts › ..." (drifts on edits)
- *   - old esm/cjs describe block:  "... > esm/cjs > esm > x"  -> "... > x"
- *   - bare esm/cjs describe block: "... > esm/cjs > x"        -> "... > x"
- *   - trailing module suffix:      "... should send [esm]"    -> "... should send"
- */
-function normalizeTestName(name) {
-  return name
-    .replace(/^\[(?:chromium|firefox|webkit)\]\s*›\s*/i, '')
-    .replace(/(\.[cm]?[jt]sx?):\d+:\d+/gi, '$1')
-    .replace(/esm\/cjs\s*>\s*(?:esm|cjs)\b/gi, 'esm/cjs')
-    .replace(/\besm\/cjs\s*>\s*/gi, '')
-    .replace(/\s*\[(?:esm|cjs)\]/gi, '')
-    .replace(/\s+/g, ' ')
-    .trim();
-}
-
-function applyVars(text, vars) {
-  let result = text;
-  for (const [key, value] of Object.entries(vars)) {
-    result = result.replace(new RegExp(`\\{\\{\\s*env\\.${key}\\s*\\}\\}`, 'g'), value);
-  }
-  return result;
-}
-
-export default async function run({ github, context, core }) {
-  const { owner, repo } = context.repo;
-
-  // Fetch actual job details from the API to get descriptive names
-  const jobs = await github.paginate(github.rest.actions.listJobsForWorkflowRun, {
-    owner,
-    repo,
-    run_id: context.runId,
-    per_page: 100,
-  });
-
-  const failedJobs = jobs.filter(job => job.conclusion === 'failure' && !job.name.includes('(optional)'));
-
-  if (failedJobs.length === 0) {
-    core.info('No failed jobs found');
-    return;
-  }
-
-  // Read and parse template
-  const template = readFileSync('.github/FLAKY_CI_FAILURE_TEMPLATE.md', 'utf8');
-  const [, frontmatter, bodyTemplate] = template.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/);
-  const titleTemplate = frontmatter.match(/title:\s*'(.*)'/)[1];
-
-  // Titles we've already created or matched in this run, so the same flaky test failing on
-  // multiple matrix jobs within a single run doesn't open duplicate issues (the `existing` list
-  // below is fetched once and won't include issues created earlier in this same run).
-  const handledTitles = new Set();
-
-  // Get existing open issues with Tests label
-  const existing = await github.paginate(github.rest.issues.listForRepo, {
-    owner,
-    repo,
-    state: 'open',
-    labels: 'Tests',
-    per_page: 100,
-  });
-
-  for (const job of failedJobs) {
-    const jobName = job.name;
-    const normalizedJobName = normalizeJobName(jobName);
-    const jobUrl = job.html_url;
-
-    // Fetch annotations from the check run to extract failed test names
-    let testNames = [];
-    try {
-      const annotations = await github.paginate(github.rest.checks.listAnnotations, {
-        owner,
-        repo,
-        check_run_id: job.id,
-        per_page: 100,
-      });
-
-      const testAnnotations = annotations.filter(a => a.annotation_level === 'failure' && a.path !== '.github');
-      testNames = [...new Set(testAnnotations.map(a => a.title || a.path))];
-    } catch (e) {
-      core.info(`Could not fetch annotations for ${jobName}: ${e.message}`);
-    }
-
-    // If no test names found, abort - this could mean something else, e.g. cache restoration or similar fails
-    // and also the issue is not super helpful in this case
-    if (testNames.length === 0) {
-      continue;
-    }
-
-    // Create one issue per failing test for proper deduplication
-    for (const testName of testNames) {
-      const normalizedTestName = normalizeTestName(testName);
-
-      // The title is keyed on the *normalized* job name + test name so the same test failing across
-      // matrix variants (different node / TS versions) or module formats (esm / cjs) dedupes to a
-      // single issue.
-      const title = applyVars(titleTemplate, { JOB_NAME: normalizedJobName, TEST_NAME: normalizedTestName });
-      // The body keeps the concrete job name + run link of the variant that actually failed.
-      const issueBody = applyVars(bodyTemplate, { JOB_NAME: jobName, RUN_LINK: jobUrl, TEST_NAME: testName });
-
-      if (handledTitles.has(title)) {
-        continue;
-      }
-      handledTitles.add(title);
-
-      const existingIssue = existing.find(i => i.title === title);
-      if (existingIssue) {
-        core.info(`Issue already exists for "${normalizedTestName}" in ${normalizedJobName}: #${existingIssue.number}`);
-        continue;
-      }
-
-      const newIssue = await github.rest.issues.create({
-        owner,
-        repo,
-        title,
-        body: issueBody.trim(),
-        labels: ['Tests', 'Flaky Test'],
-      });
-      core.info(`Created issue #${newIssue.data.number} for "${normalizedTestName}" in ${normalizedJobName}`);
-    }
-  }
-}
diff --git a/scripts/weekly-flaky-tests.mjs b/scripts/weekly-flaky-tests.mjs
new file mode 100644
index 000000000000..f3ab63d8016a
--- /dev/null
+++ b/scripts/weekly-flaky-tests.mjs
@@ -0,0 +1,188 @@
+const LOOKBACK_DAYS = 7;
+const CONCURRENT_RUNS = 4;
+
+function normalizeJobName(name) {
+  return name
+    .replace(/\(\s*(?:(?:(?:Node|TS)\s+)?\d+(?:\.\d+)*|\d+\/\d+)\s*\)/gi, ' ')
+    .replace(/Playwright\s+(?:bundle\w*|esm|cjs)(?:\s+(?:chromium|firefox|webkit))?\s+Tests/gi, 'Playwright Tests')
+    .replace(/-node-\d+(?:-\d+)*/gi, '')
+    .replace(/\s+/g, ' ')
+    .trim();
+}
+
+function normalizeTestName(name) {
+  return name
+    .replace(/^\[(?:chromium|firefox|webkit)\]\s*›\s*/i, '')
+    .replace(/(\.[cm]?[jt]sx?):\d+:\d+/gi, '$1')
+    .replace(/esm\/cjs\s*>\s*(?:esm|cjs)\b/gi, 'esm/cjs')
+    .replace(/\besm\/cjs\s*>\s*/gi, '')
+    .replace(/\s*\[(?:esm|cjs)\]/gi, '')
+    .replace(/\s+/g, ' ')
+    .trim();
+}
+
+function markdownCell(value) {
+  return String(value)
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/[\\`*_[\]|]/g, '\\$&')
+    .replace(/[\r\n]+/g, ' ');
+}
+
+export async function collectReport({ github, context, core, now = new Date() }) {
+  const until = now.toISOString();
+  const since = new Date(now.getTime() - LOOKBACK_DAYS * 24 * 60 * 60 * 1000).toISOString();
+  const repo = context.repo;
+  core.info(`Listing develop CI runs from ${since} to ${until}.`);
+  const listedRuns = await github.paginate(github.rest.actions.listWorkflowRuns, {
+    ...repo,
+    workflow_id: 'build.yml',
+    branch: 'develop',
+    created: `${since}..${until}`,
+    per_page: 100,
+  });
+  const warnings = [];
+  if (listedRuns.length >= 1000) {
+    warnings.push('GitHub limits this query to 1,000 runs; this report may be incomplete.');
+  }
+  const runs = listedRuns.filter(run => ['push', 'schedule', 'workflow_dispatch'].includes(run.event));
+  const tests = new Map();
+  let failedJobsWithoutTests = 0;
+  let failedJobs = 0;
+  let completedRuns = 0;
+  const pendingRuns = runs.filter(run => run.conclusion !== 'success' || run.run_attempt > 1);
+  const runsToInspect = pendingRuns.length;
+  core.info(
+    `Found ${runs.length} runs; ${runsToInspect} need inspection, ${runs.length - runsToInspect} passed on the first attempt.`,
+  );
+
+  async function worker() {
+    while (pendingRuns.length > 0) {
+      const run = pendingRuns.shift();
+      core.info(`Run ${run.id}: fetching jobs across ${run.run_attempt} attempt(s).`);
+
+      const jobs = await github.paginate(github.rest.actions.listJobsForWorkflowRun, {
+        ...repo,
+        run_id: run.id,
+        filter: 'all',
+        per_page: 100,
+      });
+      const jobsToInspect = jobs.filter(job => job.conclusion === 'failure' && !job.name.includes('(optional)'));
+      core.info(`Run ${run.id}: ${jobs.length} job attempts, ${jobsToInspect.length} failures to inspect.`);
+      for (const job of jobsToInspect) {
+        failedJobs++;
+
+        let annotations;
+        try {
+          annotations = await github.paginate(github.rest.checks.listAnnotations, {
+            ...repo,
+            check_run_id: Number(job.check_run_url.split('/').pop()),
+            per_page: 100,
+          });
+        } catch (error) {
+          if (error.status !== 404 && error.status !== 410) {
+            throw error;
+          }
+          warnings.push(`Annotations unavailable for job ${job.id} in run ${run.id}.`);
+          continue;
+        }
+
+        const failures = annotations.filter(
+          annotation =>
+            annotation.annotation_level === 'failure' &&
+            annotation.title &&
+            /(?:^|\/)(?:tests?|__tests__|suites)\/|(?:^|[/.])(?:test|spec)\.[cm]?[jt]sx?$/i.test(annotation.path),
+        );
+        if (failures.length === 0) {
+          failedJobsWithoutTests++;
+        }
+
+        for (const annotation of failures) {
+          const family = normalizeJobName(job.name);
+          const name = normalizeTestName(annotation.title);
+          const key = JSON.stringify([family, annotation.path, name]);
+          let test = tests.get(key);
+          if (!test) {
+            test = { family, path: annotation.path, name, runs: new Map() };
+            tests.set(key, test);
+          }
+          if (!test.runs.has(run.id)) {
+            test.runs.set(run.id, job.html_url);
+          }
+        }
+      }
+      completedRuns++;
+      core.info(
+        `Completed ${completedRuns}/${runsToInspect} runs; ${failedJobs} failed jobs inspected, ${tests.size} failing tests found.`,
+      );
+    }
+  }
+  await Promise.all(Array.from({ length: CONCURRENT_RUNS }, () => worker()));
+
+  return {
+    since,
+    until,
+    runs: runs.length,
+    failedJobs,
+    failedJobsWithoutTests,
+    warnings,
+    tests: [...tests.values()].sort(
+      (a, b) =>
+        b.runs.size - a.runs.size ||
+        a.name.localeCompare(b.name) ||
+        a.family.localeCompare(b.family) ||
+        a.path.localeCompare(b.path),
+    ),
+  };
+}
+
+export function renderReport(report, context) {
+  const repositoryUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}`;
+  const reportUrl = `${repositoryUrl}/actions/runs/${context.runId}`;
+  const lines = [
+    '## Weekly test failures',
+    '',
+    `Develop · ${report.since.slice(0, 10)}–${report.until.slice(0, 10)} · ${report.runs} CI runs.`,
+    '',
+  ];
+
+  if (report.tests.length === 0) {
+    lines.push('No test failures found.');
+  } else {
+    lines.push('| Test | Job | Affected runs | Links to runs | Issue |', '| --- | --- | ---: | --- | --- |');
+    for (const test of report.tests) {
+      const runs = [...test.runs].sort(([a], [b]) => b - a);
+      const links = runs.map(([id, url]) => `[${id}](${url})`).join(', ');
+      const issueParams = new URLSearchParams({
+        template: 'flaky.yml',
+        title: `[Flaky CI]: ${test.name}`,
+        'job-name': test.family,
+        'test-name': test.name,
+        'test-run-link': runs[0][1],
+        details: `${markdownCell(test.path)}\n\nFailed in ${test.runs.size} CI runs on develop during ${report.since.slice(0, 10)}–${report.until.slice(0, 10)}.\n\n[Weekly report](${reportUrl})`,
+      });
+      const issueUrl = `${repositoryUrl}/issues/new?${issueParams}`;
+      lines.push(
+        `| ${markdownCell(test.name)} | ${markdownCell(test.family)} | ${test.runs.size} | ${links} | [Create issue](${issueUrl}) |`,
+      );
+    }
+  }
+
+  lines.push(
+    '',
+    `${report.failedJobs} failed job attempts; ${report.failedJobsWithoutTests} without test annotations. Optional jobs excluded.`,
+    '',
+    ...report.warnings.map(warning => `- ${markdownCell(warning)}`),
+  );
+  return `${lines.join('\n')}\n`;
+}
+
+export default async function run({ github, context, core }) {
+  const report = await collectReport({ github, context, core });
+  for (const warning of report.warnings) {
+    core.warning(warning);
+  }
+  await core.summary.addRaw(renderReport(report, context)).write();
+  return report;
+}
diff --git a/yarn.lock b/yarn.lock
index 2ecc5bfcf63a..2796b4ef923e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -426,10 +426,10 @@
     semifies "^1.0.0"
     source-map "^0.6.0"
 
-"@apm-js-collab/tracing-hooks@^0.13.2":
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/@apm-js-collab/tracing-hooks/-/tracing-hooks-0.13.2.tgz#c219d04bf115bf7828a8887e437c0d6c888159f0"
-  integrity sha512-jk3acBAJecK8ctMGlkappcX5CtymTxmd0GGnUqh4ZX3Pk1RbXei/vzGEDTeOHcXJ6wsRkm8PhHsfOba0jxB67A==
+"@apm-js-collab/tracing-hooks@^0.13.3":
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/@apm-js-collab/tracing-hooks/-/tracing-hooks-0.13.3.tgz#44b9c3d6a0beb41b75c36f516113205cc078aea2"
+  integrity sha512-l/ScKzA7sg1hZKc3QMtbnA3blVkTteN3Yq97AejfFrEiR0S0lay3KmyJJ44p45EEVIGP85fLfki4a6OD/7Jb8w==
   dependencies:
     "@apm-js-collab/code-transformer" "^0.18.0"
     debug "^4.4.1"
@@ -6901,100 +6901,100 @@
   resolved "https://registry.yarnpkg.com/@oxc-transform/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.143.0.tgz#610499b65647322b816200864814e414ea5e4fb8"
   integrity sha512-8AaiwIM4M/gEcvXWD71SZDCpY70z7J99G110+fSBws/MHa9PaaWu0IVp5clEG/0alWPQiPZcZRFE3ZIhSd5fng==
 
-"@oxfmt/binding-android-arm-eabi@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm-eabi/-/binding-android-arm-eabi-0.63.0.tgz#136176dc94fdc41e21415cc770d86f5066282e0f"
-  integrity sha512-YmRth4ZPGgEXcgmkhvANbC9uD67dxmSobW7DQuyt5tOBOKvPnIpk5SVHBj88E+7wMNRI2FhqaDbOhQFBix+b8A==
-
-"@oxfmt/binding-android-arm64@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm64/-/binding-android-arm64-0.63.0.tgz#10bc42457179210061c801122a64304619e3bdab"
-  integrity sha512-icbahX8X2X3sRamOMecvdYeZXWjPDazRDIfvWfy7Ca1nc/ZDT2Y9k5Nt7s46EqFd7NQPdgk+CM3/SgIT5LPCaQ==
-
-"@oxfmt/binding-darwin-arm64@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-arm64/-/binding-darwin-arm64-0.63.0.tgz#5f9084d9a760a1836387f8970a7f9d614ec3d909"
-  integrity sha512-WV+Ze5v5gI2qoj8jpAovt8KBTW8pjEz/AiMXXjeTQS+Bmf/MmZXTS40S8xNPDszX+W8WDv2Bbk6qKrMTtUGu1A==
-
-"@oxfmt/binding-darwin-x64@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-x64/-/binding-darwin-x64-0.63.0.tgz#badd4a02218a9a62319817d5c337b30159a54a21"
-  integrity sha512-CJGSBdDxXOWIpoFXHpverimCvz084KA7L483rqJ44c3jDtzv6d4qOSoR/V9ywSHfV+Ks1lwIj2P49BFhunLNAA==
-
-"@oxfmt/binding-freebsd-x64@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-freebsd-x64/-/binding-freebsd-x64-0.63.0.tgz#a17261e95c8ebef1f76d8aaac746a64fdb6ba51e"
-  integrity sha512-BDfKY+KhL2078cgswBBFQPAYuxCy93bS/iC5frdSeSbTLcGrR6VC2hsuPTanoJmg84+wSyWl0wWC1eR+uTnkRg==
-
-"@oxfmt/binding-linux-arm-gnueabihf@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.63.0.tgz#baeee34bb08e0769af878623f442e83bc0aacd7a"
-  integrity sha512-Ov1cQEXT4mj7cojAokWSS1eoxkoyvbDfAbxNsGIKY2o36kvdAaFzPxRN6NxFRk9fD72B8oCoTTX/NuYTUWlpsg==
-
-"@oxfmt/binding-linux-arm-musleabihf@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.63.0.tgz#e70d5697ec4b6bb5f87a3f019e01b3f956b8e44b"
-  integrity sha512-0LE7ro3+6L79jcMANycAZfRaC7zxr9YZ2+vEL5uMD9QlEep+rS/r1kSJsnuLl991NXJZD60euh0PC1GHrR20vw==
-
-"@oxfmt/binding-linux-arm64-gnu@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.63.0.tgz#638a8ed4f3d256c50aeb6d2c19cfc65792c902e1"
-  integrity sha512-izPk+2Z4gjuZK32Fqh5qXoMpT/2NXzLh++ob57HiEiVSQZ1iYXu8EKMzb+K5AvWyIEXhdDIt7ADjGGtFhkT9Bw==
-
-"@oxfmt/binding-linux-arm64-musl@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.63.0.tgz#af5a9b787f5233f27a3360ad56235fc1b011f760"
-  integrity sha512-alPmbOuWXFXiSo+lOtv6X71C7SYMEDW2WVvywOvf9BwKgEhSNGhMTLeFVSjKUMCamcjbbgVdsWF8GN1uy8xshg==
-
-"@oxfmt/binding-linux-ppc64-gnu@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.63.0.tgz#c1a211206134a5577e355a495989e0d733218d60"
-  integrity sha512-BdzCPvolJc4AWZ+YMzgUDJcDzbQWrFjYuqBHoNHNqP1aCaluQRJNs4k3vNU5IG7vTpjf9zeD73D7MFM1TecZpg==
-
-"@oxfmt/binding-linux-riscv64-gnu@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.63.0.tgz#4863f0311e5c1b88f75ef822959b3ca4fd938937"
-  integrity sha512-7sIgfLzqtNKSkMGsGVyRpHwpjNezRg2XONvUOheFZs95TSZpM0JAuPpA8KrQFsWc4wPU95roX2O69JgH8igOgw==
-
-"@oxfmt/binding-linux-riscv64-musl@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.63.0.tgz#ad05a017d12553e2f544743c4940adb552aa1d1c"
-  integrity sha512-9Tcg0y0WcVa6Mm9AgcgFMseDS+VkFJZpKZ8We9SpDY4gg5jewSwln+0sO04QLcTS1BtfDl9MwR+NfID8L7PUTg==
-
-"@oxfmt/binding-linux-s390x-gnu@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.63.0.tgz#2803f539db15bc66db115888fa8f84d6531ed2b9"
-  integrity sha512-qWKC1pEOpx1qYhXaugPhHUeXwSfqEOk2wJH2LqVXGPV5iQYfdAZdt+d2XDiX4DTSWA2QDMUcFB+wEORh3Xn/sA==
-
-"@oxfmt/binding-linux-x64-gnu@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.63.0.tgz#c22a06a60ae2d6b3de522095e0c50a816040a033"
-  integrity sha512-S9wXYOiGSqYGS4Fx/TFsY+xDd/7dE5s+rUgbA4TsHiVF9e8J3ZcKmP7dsP/7iqLI9Wz7Ic7TzEr3mdthRCTdrA==
-
-"@oxfmt/binding-linux-x64-musl@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-musl/-/binding-linux-x64-musl-0.63.0.tgz#48d3eeaf8e3757f638cf92de5ee4858befc9c0a3"
-  integrity sha512-5eGyTJuMZNwBSHCivXt8Yuta6GeTYksOPXRk2MIhajiyFGQx7bjaHIwY+ZusAoFHhT157A9x6sktLjYo9D5oMQ==
-
-"@oxfmt/binding-openharmony-arm64@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-openharmony-arm64/-/binding-openharmony-arm64-0.63.0.tgz#02be9e140ae35ba30f52bdce27612fece4a01ab3"
-  integrity sha512-Rz7hx+Dv3DoW/S6pwVAyjfFXp7/trdQ1zg+vNmsdsdDNlUccugp4XNqambSuEAeP0DaG9k72AtNyfDXCEg0AGw==
-
-"@oxfmt/binding-win32-arm64-msvc@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.63.0.tgz#2226eaf52b6345a2cb926499216b2486cf0dbec2"
-  integrity sha512-T/IuizKN9mr4Xw6YYnptkXRNdLkyIlUZ7c8zfTOBpoytZyJ1BAsMUvsMDEx0X4YvSMpaivm+DR8112rQfzC25g==
-
-"@oxfmt/binding-win32-ia32-msvc@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.63.0.tgz#58d263bb5ecd7330c02f9dcd8cda10f66e42e74b"
-  integrity sha512-XjrO5FJ5Wl9vsAxtCP1G/eaeT6y1K2s9CICUHGE42cEjou32/J6S+B1KnrOAboj6E7uhJnwPbRSvznWcxNdA0g==
-
-"@oxfmt/binding-win32-x64-msvc@0.63.0":
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.63.0.tgz#02a166c8a8049c55d0096d1ba9d8e73f3a4d26a7"
-  integrity sha512-sgsHCQy432OTQH4Ikk3tZptp3GqwnhwUDuY0loBH41zyHWfMZY9v8Dy78wsnSofHejvFozZGgJgBB1A0LQRwMQ==
+"@oxfmt/binding-android-arm-eabi@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm-eabi/-/binding-android-arm-eabi-0.70.0.tgz#5d6dd157053bdbd0d68a3675168154b6fb2d5418"
+  integrity sha512-Xd7YO4/T2axEj6FTLcj4Why3mTBqFMg+x24xtorT4Lb2+1g82090GH0a/4U1m0pABGYiix2bq1pqkYrmV3f0Sw==
+
+"@oxfmt/binding-android-arm64@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-android-arm64/-/binding-android-arm64-0.70.0.tgz#c9e50082dafffe941bf4b420da0a5dccd31e767e"
+  integrity sha512-x9rlMYyKXdgKdYyUJzGsK1ZV8P4di/J32ipzcS6Jet6p9r9UAh28neXIMtdlSaJJycdi61Z4YkcLKLpk8ueFjg==
+
+"@oxfmt/binding-darwin-arm64@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-arm64/-/binding-darwin-arm64-0.70.0.tgz#0dbec02a9a308d9b87850e0e2ff7669a58356cf2"
+  integrity sha512-IUTUPvrBVYy7POh4stXzRdz4IVC/1QSaviCWoyenSlOhGu0X9j5K07vCTM9biLjAA2Zs31l0Rj5vvRpj9n95wA==
+
+"@oxfmt/binding-darwin-x64@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-darwin-x64/-/binding-darwin-x64-0.70.0.tgz#c4db6b9590a8583459f841b8dd6a7c26cc986c73"
+  integrity sha512-vw745q870oTd6J517O24asoX4/E+eK0nxYIFoedSLqgJ+nI5En7+ZS82iZSHZ69zevQrnOXiyHP01dA+t8xD8w==
+
+"@oxfmt/binding-freebsd-x64@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-freebsd-x64/-/binding-freebsd-x64-0.70.0.tgz#805061e8ab82799fcf117c7ae9220b848f8bfce0"
+  integrity sha512-NO14EgSM9dFkcg+MfGPxvsKqXYs9LKaxPrOKXpv1R0rLokGGFDcCq6dBMq18dE4wlpFOovX0UZY2uh1P30O7QA==
+
+"@oxfmt/binding-linux-arm-gnueabihf@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.70.0.tgz#28e556690ea436bf0009c1b2803074e120ddc081"
+  integrity sha512-139OEhHarj9CYoJ/i9gXlPv4KLBGtLj2toseOWYFf09QwlhklaZk+wW3aOvlqoeZtuayvkoSNVWra7WJ21s3VQ==
+
+"@oxfmt/binding-linux-arm-musleabihf@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.70.0.tgz#4ed12fa35757b65be903a0dc3887e3d427c2e13a"
+  integrity sha512-GEh2PY3IWTE0M24eNhTduountANSbWyDmMnzFSQE/nGg/bjPugbUgiGuFu+xdqcQSd/HKSwH80/F2yVVD48yhA==
+
+"@oxfmt/binding-linux-arm64-gnu@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.70.0.tgz#0f8f27950de02d59de31d262c2e7ed18f2eff581"
+  integrity sha512-En5i+UJmZSPxuSf47F2Hl5YOzKB0bicQLnGQkeTCMQ35cWLtbrSwACJKfiLqRZrk05DwSnsJkhBRaM3OURtIaA==
+
+"@oxfmt/binding-linux-arm64-musl@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.70.0.tgz#18e97f3701d79a9af1ecc0e7e80dd3322ca2f4ba"
+  integrity sha512-WWOoV5W9Im3flVwOVrWn/2DUlOF8v5vcCip+kcNuaMpulRCh6nzzt1Su2vcL2F908YJIXNV3HvegbBHuyLwKHg==
+
+"@oxfmt/binding-linux-ppc64-gnu@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.70.0.tgz#2bbdfa964870fe6b79ad8b648f6bbcc5fdce16d3"
+  integrity sha512-YUouneIqW+5n7aE8xx/zeZ6/utr/KH7oykcGoFyd8Uz8uh591T1oKlnoWA3BsRq/ZR42oY1w4MUYvS/0e/MQOA==
+
+"@oxfmt/binding-linux-riscv64-gnu@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.70.0.tgz#601a7fcdf219d2849762d5f0a6917d0c3441f268"
+  integrity sha512-iEnMf21S5aGVa4hViDGY8sAQ/AHyCu2JPyrQF8P06wtHhSkD1YJBeT4m/KiGewgf7+a5XCYSCRIPcRQa1xwEoQ==
+
+"@oxfmt/binding-linux-riscv64-musl@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.70.0.tgz#7c8887cfa0919accc2329a997dfce0679f63ec3b"
+  integrity sha512-91Sdniaj20fQzyMeCxMDzTP4c9s4RB8dGQ308xHhDR0n6U7+1Xq7N9klE7mfXq8iV3lRmIGSXi5X23Hn/0XX/g==
+
+"@oxfmt/binding-linux-s390x-gnu@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.70.0.tgz#b931222fb0ec8840b28682172ceed6ce56739128"
+  integrity sha512-uUV30M6E+2TKKGMaKiwfeL4RZrviHXlUxsrYJ/jFBb+1EZy+pnFT+hF73eeWdzh5NqPOAnw0iiMAIqjqiLZPFg==
+
+"@oxfmt/binding-linux-x64-gnu@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.70.0.tgz#74537c62404adb4afef96c988d034a31cf10c0a1"
+  integrity sha512-ivMcX6kNDPhqtbOaBt/ItFlLlTlXNHLgRuNmxP6Na6UuYXRT10llpJcAPbGeRgjjb3Qzv4jwPp3fB0hui50WNQ==
+
+"@oxfmt/binding-linux-x64-musl@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-linux-x64-musl/-/binding-linux-x64-musl-0.70.0.tgz#980d3b991cf373c863a25e0609775b314750c354"
+  integrity sha512-w+S+fERxYmlZSyZlJK/U292FjyBoH8cCEj21/tYJX6atX5kNSn+HDkhlFQKT2zcMwUW0uAtUL/bOrlwJZwqRdA==
+
+"@oxfmt/binding-openharmony-arm64@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-openharmony-arm64/-/binding-openharmony-arm64-0.70.0.tgz#ce0a871550e425bb7a8f70c466c07cd873441a16"
+  integrity sha512-Zlom1Xkx257R8bk4ZI4zJsrGno2opknz1+5v5baka3nn4FPyvNSdh8JUL4CdN1S1OWRMvJ9UJQ+RfIqGGCUEfA==
+
+"@oxfmt/binding-win32-arm64-msvc@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.70.0.tgz#edf478004e7510b3ac663b1395acb32c2e725ceb"
+  integrity sha512-FQgPW5R17vzt7cgrJ8eG/dqX00o2xHsqFeLfw4xzA9FRHpN/DjFo9YDonvIIXGxiEuS9F/jZPnGO+KHNKuCo4Q==
+
+"@oxfmt/binding-win32-ia32-msvc@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.70.0.tgz#9f932ef9768ce7e6a731033a0fcc7e0da7872554"
+  integrity sha512-ZfZublNhZ+XBndMiXhkiLlPE+XyGRDa0CweeTL6t1fZypfCh1LTg7e5CvnOeTBunq15MskOcRempumSPGAaCQA==
+
+"@oxfmt/binding-win32-x64-msvc@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@oxfmt/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.70.0.tgz#6d8d33d38063498ad9ead3b3f9f1dd2aa6ce03be"
+  integrity sha512-HlIZEn+WzLQL0DszNzldiRl/DPRCX5R0Vkt6qeUPR1YHwy52hZZo4x6HoTOVmKRP2wUiwPGtKsihNY/f8KRaBg==
 
 "@oxlint-tsgolint/darwin-arm64@7.0.2001":
   version "7.0.2001"
@@ -8061,10 +8061,10 @@
     "@angular-devkit/schematics" "14.2.13"
     jsonc-parser "3.1.0"
 
-"@sentry/conventions@0.23.0", "@sentry/conventions@^0.23.0":
-  version "0.23.0"
-  resolved "https://sfw.security.sentry.io/npm/@sentry/conventions/-/conventions-0.23.0.tgz#26ecad45f91bcf70940325ab9af2b9544fa18242"
-  integrity sha512-+Euyo7CNVecoOusgUnq27oV97oshifgceKfnGnuKfXrPUVWA/cisvii3E1rlvy2yBrKvl9K1gCEo1Jqog5zjEQ==
+"@sentry/conventions@0.24.0", "@sentry/conventions@^0.24.0":
+  version "0.24.0"
+  resolved "https://sfw.security.sentry.io/npm/@sentry/conventions/-/conventions-0.24.0.tgz#b65931682a7150ffe7914e34af908b7afb2b87ab"
+  integrity sha512-pmmF2mLy7A23z8gnLRG87lYu4SSPIBColtfqu9cfkh1omn/0CI3w0/AqZ/uf/VGAtM/wJMN61J58Ks/IWBCHpQ==
 
 "@sentry/node-cpu-profiler@^2.4.4":
   version "2.4.4"
@@ -14279,10 +14279,10 @@ electron-to-chromium@^1.5.402:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.404.tgz#9f34e6d20ae29575fbae701680c2e9f292a92929"
   integrity sha512-3WJtd7/lVq2Jnuz6wed1l9+1ZD2u2Tet1/1NBc4Iedkmgbu+I7YuAqdAQ8T+VZtnwysMsAf3IqSq9D1gyZjA2g==
 
-elysia@^1.4.0:
-  version "1.4.27"
-  resolved "https://registry.yarnpkg.com/elysia/-/elysia-1.4.27.tgz#709f07f54c0d0400aab8a18bac4d94223203ec45"
-  integrity sha512-2UlmNEjPJVA/WZVPYKy+KdsrfFwwNlqSBW1lHz6i2AHc75k7gV4Rhm01kFeotH7PDiHIX2G8X3KnRPc33SGVIg==
+elysia@^1.4.29:
+  version "1.4.29"
+  resolved "https://registry.yarnpkg.com/elysia/-/elysia-1.4.29.tgz#c55ad4a30babbb3bc5b9b49ab3f808f5cba71ec7"
+  integrity sha512-GwMRGGwSdjfPt+w3LA0fqTuYJtS8uVRJicvoar98/HrO5qdFKDc9CwjIb6Kja+v39lkY+58hr2JvdR9jQzlUuA==
   dependencies:
     cookie "^1.1.1"
     exact-mirror "^0.2.7"
@@ -21723,32 +21723,32 @@ oxc-walker@^1.1.1:
   resolved "https://registry.yarnpkg.com/oxc-walker/-/oxc-walker-1.1.1.tgz#23d4a900f789bc537095442537cd2a7670fbc8dd"
   integrity sha512-Hwd7dq28zu/Er99+bpWp16CGwFrhyalJh0W3JOB7XpPvgWo3MqMi2ksWGKuzzA9zt50mJ2pIUwR5lpAdZ9ACNQ==
 
-oxfmt@^0.63.0:
-  version "0.63.0"
-  resolved "https://registry.yarnpkg.com/oxfmt/-/oxfmt-0.63.0.tgz#c7338e6c43a68d5cf8dc61c08b617d77cb54e323"
-  integrity sha512-kgdDwv35wvVf6554U2Ab8Jnd0zTM+TsEQWwaB70RAjK3gICFAFGO+2Hd3Be27GMoXj3XRL9IKSNRVl7KBQL6iw==
+oxfmt@^0.70.0:
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/oxfmt/-/oxfmt-0.70.0.tgz#c91168b85ff74c53c7cfeb230a145c233c6e0aff"
+  integrity sha512-IsHxZ4y0wQLLMhnrJblBJgZsLDzfULrJnAw5j/QqsTlMa/m3AqsbToi+W71uhBGaqlqq/PbbjvHc09TJwdv3Tw==
   dependencies:
-    tinypool "2.1.0"
+    tinypool "2.1.2"
   optionalDependencies:
-    "@oxfmt/binding-android-arm-eabi" "0.63.0"
-    "@oxfmt/binding-android-arm64" "0.63.0"
-    "@oxfmt/binding-darwin-arm64" "0.63.0"
-    "@oxfmt/binding-darwin-x64" "0.63.0"
-    "@oxfmt/binding-freebsd-x64" "0.63.0"
-    "@oxfmt/binding-linux-arm-gnueabihf" "0.63.0"
-    "@oxfmt/binding-linux-arm-musleabihf" "0.63.0"
-    "@oxfmt/binding-linux-arm64-gnu" "0.63.0"
-    "@oxfmt/binding-linux-arm64-musl" "0.63.0"
-    "@oxfmt/binding-linux-ppc64-gnu" "0.63.0"
-    "@oxfmt/binding-linux-riscv64-gnu" "0.63.0"
-    "@oxfmt/binding-linux-riscv64-musl" "0.63.0"
-    "@oxfmt/binding-linux-s390x-gnu" "0.63.0"
-    "@oxfmt/binding-linux-x64-gnu" "0.63.0"
-    "@oxfmt/binding-linux-x64-musl" "0.63.0"
-    "@oxfmt/binding-openharmony-arm64" "0.63.0"
-    "@oxfmt/binding-win32-arm64-msvc" "0.63.0"
-    "@oxfmt/binding-win32-ia32-msvc" "0.63.0"
-    "@oxfmt/binding-win32-x64-msvc" "0.63.0"
+    "@oxfmt/binding-android-arm-eabi" "0.70.0"
+    "@oxfmt/binding-android-arm64" "0.70.0"
+    "@oxfmt/binding-darwin-arm64" "0.70.0"
+    "@oxfmt/binding-darwin-x64" "0.70.0"
+    "@oxfmt/binding-freebsd-x64" "0.70.0"
+    "@oxfmt/binding-linux-arm-gnueabihf" "0.70.0"
+    "@oxfmt/binding-linux-arm-musleabihf" "0.70.0"
+    "@oxfmt/binding-linux-arm64-gnu" "0.70.0"
+    "@oxfmt/binding-linux-arm64-musl" "0.70.0"
+    "@oxfmt/binding-linux-ppc64-gnu" "0.70.0"
+    "@oxfmt/binding-linux-riscv64-gnu" "0.70.0"
+    "@oxfmt/binding-linux-riscv64-musl" "0.70.0"
+    "@oxfmt/binding-linux-s390x-gnu" "0.70.0"
+    "@oxfmt/binding-linux-x64-gnu" "0.70.0"
+    "@oxfmt/binding-linux-x64-musl" "0.70.0"
+    "@oxfmt/binding-openharmony-arm64" "0.70.0"
+    "@oxfmt/binding-win32-arm64-msvc" "0.70.0"
+    "@oxfmt/binding-win32-ia32-msvc" "0.70.0"
+    "@oxfmt/binding-win32-x64-msvc" "0.70.0"
 
 oxlint-tsgolint@7:
   version "7.0.2001"
@@ -26326,10 +26326,10 @@ tinyglobby@^0.2.13, tinyglobby@^0.2.14, tinyglobby@^0.2.15, tinyglobby@^0.2.16,
     fdir "^6.5.0"
     picomatch "^4.0.4"
 
-tinypool@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-2.1.0.tgz#303a671d6ef68d03c9512cdc9a47c86b8a85f20c"
-  integrity sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==
+tinypool@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-2.1.2.tgz#fcb3df44405c2530259e4bef5928a90bf46134dd"
+  integrity sha512-9YodfrxS9g9IbFr/KOjE5bAeJ0p61n3bW6mqvy0jtoeKd1kTW1Cxm0oulm6KX2lyM9Gl6WIe8nEbY7LWv5ZJww==
 
 tinypool@^1.1.1:
   version "1.1.1"