diff --git a/.fallowrc.jsonc b/.fallowrc.jsonc
index 477875d..4c840ff 100644
--- a/.fallowrc.jsonc
+++ b/.fallowrc.jsonc
@@ -1,16 +1,19 @@
 {
   "$schema": "./node_modules/fallow/schema.json",
 
-  // Astro copies this browser entry from public/ and loads it through the
-  // Starlight head configuration, which static import analysis cannot follow.
-  "entry": ["apps/docs/public/package-version.js", "playwright.docs.config.ts"],
+  "entry": [
+    "scripts/measure-construction.mts",
+    "scripts/verify-docs-examples.mts",
+    "apps/docs/public/package-version.js",
+    "playwright.docs.config.ts",
+    "tests/types/*.{ts,tsx}"
+  ],
 
   "ignorePatterns": ["examples/tanstack-start/src/routeTree.gen.ts"],
 
-  // Framework tooling consumes these exports through convention-generated entries.
   "ignoreExports": [
     {
-      "file": "apps/docs/astro.config.mjs",
+      "file": "apps/docs/astro.config.mts",
       "exports": ["default"]
     },
     {
@@ -27,10 +30,9 @@
     }
   ],
 
-  // Each executable example keeps its resource ownership and cancellation
-  // workflow and UI in place so readers can understand and copy the integration.
-  // Fingerprints expire when the duplicated code or occurrence count changes.
   "duplicates": {
+    "mode": "semantic",
+    "near": true,
     "ignoredClones": [
       "dup:22704c46:2",
       "dup:3fec4231:2",
@@ -54,21 +56,21 @@
     ]
   },
 
-  // Vite+ tasks, packing, and imported lint presets invoke tools Fallow cannot trace.
-  // Keep Effect peer and test dependencies available for the library and fixtures.
   "ignoreDependencies": [
     "@arethetypeswrong/cli",
+    "@effect/platform-node",
     "@effect/tsgo",
     "@effect/vitest",
     "@shadcn/lint",
+    "@tanstack/intent",
     "effect",
     "publint",
+    // React belongs to the private apps; Fallow attributes shared example sources to the root.
+    "react",
     "typescript-5.9",
     "unplugin-unused"
   ],
 
-  // Health measures shipped library code in src/. Exclude docs, examples,
-  // tooling, and tests here; other audits retain their repository-wide scope.
   "health": {
     "ignore": [
       "apps/**",
@@ -85,8 +87,13 @@
   "rules": {
     "private-type-leaks": "error",
 
-    // Public-entry suppressions are valid in the entry audit but necessarily
-    // look stale in production mode, where package entry exports are exempt.
     "stale-suppressions": "off"
-  }
+  },
+
+  "overrides": [
+    {
+      "files": ["src/index.ts"],
+      "rules": { "unused-types": "off" }
+    }
+  ]
 }
diff --git a/.github/actions/setup-repository/action.yml b/.github/actions/setup-repository/action.yml
index be46bee..a8a6024 100644
--- a/.github/actions/setup-repository/action.yml
+++ b/.github/actions/setup-repository/action.yml
@@ -1,12 +1,6 @@
 name: Set up repository
 description: Install the pinned package manager, Vite+, and workspace dependencies.
 
-inputs:
-  cache:
-    description: Whether setup-vp should restore and save its dependency cache.
-    required: false
-    default: 'true'
-
 runs:
   using: composite
   steps:
@@ -17,6 +11,6 @@ runs:
       uses: voidzero-dev/setup-vp@1b32467adbe183473499fd9d5d372c3ed9641754 # v1.18.0
       with:
         node-version-file: .node-version
-        cache: ${{ inputs.cache }}
+        cache: true
         run-install: |
           args: ['--frozen-lockfile']
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0dd8acd..4f99167 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,6 @@ name: CI
 
 on:
   pull_request:
-  push:
-    branches:
-      - main
   schedule:
     - cron: '17 4 1 * *'
   workflow_call:
@@ -29,6 +26,7 @@ jobs:
         name: Check out repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
+          fetch-depth: 0
           persist-credentials: false
 
       - &setup_repository
@@ -38,49 +36,31 @@ jobs:
       - name: Verify formatting
         run: vp run format
 
-      - name: Construct package prerequisite
-        run: vp run pack
-
-      - name: Run type-aware linting
-        run: vp run lint
-
-      - name: Run TypeScript checking
+      - name: Check shipped skills
+        env:
+          INTENT_REVIEW_BASE: ${{ github.event.pull_request.base.sha }}
+        run: |
+          vp run skills-check
+          if [ -n "$INTENT_REVIEW_BASE" ]; then
+            vp exec intent maintainer check --base "$INTENT_REVIEW_BASE" --github-summary
+          else
+            vp exec intent maintainer check --github-summary
+          fi
+
+      - name: Run type-aware linting and TypeScript checking
         run: vp run typecheck
 
+      - name: Check public API compiler fixtures
+        run: vp run api-types
+
       - name: Run Effect diagnostics
         run: vp run effect-check
 
-      - name: Run Vitest
-        run: vp run test
-
       - name: Run Fallow audits
         run: vp run fallow
 
-  package-contract:
-    name: Package contract
-    needs: source-quality
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-
-    steps:
-      - *checkout
-      - *setup_repository
-
-      - name: Construct and inspect package
-        run: vp run pack
-
-      - name: Verify packed consumers and type scale
-        run: vp run packed-package
-
-      - name: Preserve verified package artifact
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: package-${{ github.sha }}
-          path: .artifacts/*.tgz
-          if-no-files-found: error
-          include-hidden-files: true
-          compression-level: 0
-          retention-days: 7
+      - name: Run Vitest
+        run: vp run test
 
   example-builds:
     name: Example builds
@@ -98,6 +78,18 @@ jobs:
       - name: Build TanStack Start application
         run: vp run tanstack-start-build
 
+      - name: Preserve application builds
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: application-builds
+          path: |
+            dist
+            examples/vite-react/dist
+            examples/tanstack-start/dist
+          if-no-files-found: error
+          include-hidden-files: true
+          retention-days: 7
+
   documentation:
     name: Documentation
     needs: source-quality
@@ -114,11 +106,20 @@ jobs:
       - name: Build documentation
         run: vp run docs-build
 
+      - name: Preserve documentation build
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: documentation-build
+          path: apps/docs/dist
+          if-no-files-found: error
+          include-hidden-files: true
+          retention-days: 7
+
   browser:
     name: Playwright (${{ matrix.browser }})
     needs:
-      - package-contract
       - example-builds
+      - documentation
     runs-on: ubuntu-latest
     timeout-minutes: 20
 
@@ -134,14 +135,25 @@ jobs:
       - *checkout
       - *setup_repository
 
+      - name: Restore application builds
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: application-builds
+
+      - name: Restore documentation build
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: documentation-build
+          path: apps/docs/dist
+
       - name: Install ${{ matrix.browser }}
         run: vp exec playwright install --with-deps ${{ matrix.browser }}
 
       - name: Check documentation in ${{ matrix.browser }}
-        run: vp run docs-e2e --project=${{ matrix.browser }}
+        run: vp run --ignore-depends-on docs-e2e --project=${{ matrix.browser }}
 
       - name: Run ${{ matrix.browser }} acceptance tests
-        run: vp run e2e:${{ matrix.browser }}
+        run: vp run --ignore-depends-on e2e:${{ matrix.browser }}
 
       - name: Preserve Playwright failure diagnostics
         if: failure()
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
index 28eaffa..d15d979 100644
--- a/.github/workflows/deploy-docs.yml
+++ b/.github/workflows/deploy-docs.yml
@@ -2,6 +2,12 @@ name: Deploy documentation
 
 on:
   workflow_call:
+    inputs:
+      build-artifact:
+        description: Validated documentation artifact from this workflow run.
+        required: false
+        type: string
+        default: ''
   workflow_dispatch:
 
 permissions:
@@ -20,23 +26,32 @@ jobs:
     timeout-minutes: 15
 
     steps:
+      - name: Restore validated documentation
+        if: inputs.build-artifact != ''
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: ${{ inputs.build-artifact }}
+          path: apps/docs/dist
+
       - name: Check out repository
+        if: inputs.build-artifact == ''
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
           persist-credentials: false
 
       - name: Set up repository
+        if: inputs.build-artifact == ''
         uses: ./.github/actions/setup-repository
 
-      - name: Check documentation
-        run: vp run docs-check
+      - name: Build documentation
+        if: inputs.build-artifact == ''
+        run: vp run docs-build
 
-      - name: Build and upload documentation
-        uses: withastro/action@e84f40bd8d2caa9e768ec82ad30dd81f0b280853 # v6
+      - name: Upload documentation
+        uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5
         with:
-          package-manager: pnpm@12.8.2
-          path: ./apps/docs
+          path: apps/docs/dist
 
   deploy:
     name: Deploy documentation
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 361580b..9481e94 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,15 +1,6 @@
 name: Release
 
 on:
-  pull_request:
-    paths:
-      - .changeset/**
-      - .github/workflows/release.yml
-      - package.json
-      - pnpm-lock.yaml
-      - pnpm-workspace.yaml
-      - scripts/verify-packed-consumer.mts
-      - vite.config.ts
   push:
     branches:
       - main
@@ -22,6 +13,12 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  validation:
+    name: Repository validation
+    permissions:
+      contents: read
+    uses: ./.github/workflows/ci.yml
+
   select-mode:
     name: Select release mode
     runs-on: ubuntu-latest
@@ -42,8 +39,6 @@ jobs:
       - &setup_repository
         name: Set up repository
         uses: ./.github/actions/setup-repository
-        with:
-          cache: false
 
       - name: Select Changesets mode
         id: changesets
@@ -55,7 +50,7 @@ jobs:
         run: |
           version="$(node --print "require('./package.json').version")"
           if [[ "$version" == "0.0.0" ]]; then
-            echo '::error::Refusing to publish the placeholder 0.0.0 version. Add and merge a real release Changeset first.'
+            echo '::error::Refusing to publish the placeholder 0.0.0 version. Prepare a real package version before publishing.'
             exit 1
           fi
 
@@ -64,7 +59,7 @@ jobs:
     if: needs.select-mode.outputs.mode == 'version' && github.event_name == 'push'
     needs:
       - select-mode
-      - quality-and-pack
+      - validation
     runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
@@ -84,10 +79,12 @@ jobs:
 
   quality-and-pack:
     name: Validate and pack release artifact
-    if: needs.select-mode.outputs.mode != 'none' || github.event_name != 'push'
-    needs: select-mode
+    if: needs.select-mode.outputs.mode == 'publish'
+    needs:
+      - select-mode
+      - validation
     runs-on: ubuntu-latest
-    timeout-minutes: 40
+    timeout-minutes: 15
     permissions:
       contents: read
     outputs:
@@ -98,48 +95,16 @@ jobs:
       - *setup_repository
 
       - name: Construct package for release packing
-        if: needs.select-mode.outputs.mode == 'publish' || github.event_name != 'push'
         run: vp run pack
 
       - name: Pack release artifact
-        if: needs.select-mode.outputs.mode == 'publish' || github.event_name != 'push'
         id: pack
         uses: changesets/action/pack@8488615a623b1b9c987934bb89eae8af6a946ac1 # v2.1.1
         with:
           publish-plan-artifact-id: ${{ needs.select-mode.outputs.publish-plan-artifact-id }}
 
-      - name: Download the release artifact for verification
-        if: needs.select-mode.outputs.mode == 'publish' || github.event_name != 'push'
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          artifact-ids: ${{ steps.pack.outputs.pack-dir-artifact-id }}
-          path: .artifacts/release
-
-      - name: Select the release archive
-        if: needs.select-mode.outputs.mode == 'publish' || github.event_name != 'push'
-        shell: bash
-        run: |
-          mapfile -t archives < <(find .artifacts/release/packages -type f -name '*.tgz' -print)
-          if [[ "${#archives[@]}" -ne 1 ]]; then
-            echo "::error::Expected one release archive, found ${#archives[@]}."
-            exit 1
-          fi
-          echo "EFFECT_API_QUERY_TARBALL=${archives[0]}" >> "$GITHUB_ENV"
-
-      - name: Install browser engines and system dependencies
-        if: github.event_name == 'push'
-        run: vp exec playwright install --with-deps chromium firefox webkit
-
-      - name: Run complete repository validation
-        if: github.event_name == 'push'
-        run: vp run validate
-
-      - name: Verify dry-run artifact
-        if: github.event_name != 'push'
-        run: vp run verify-packed-package
-
   publish:
-    name: Publish verified artifact
+    name: Publish release artifact
     if: needs.select-mode.outputs.mode == 'publish' && github.event_name == 'push'
     needs:
       - select-mode
@@ -155,7 +120,7 @@ jobs:
       - *checkout
       - *setup_repository
 
-      - name: Publish verified artifact to npm
+      - name: Publish release artifact to npm
         uses: changesets/action/publish@8488615a623b1b9c987934bb89eae8af6a946ac1 # v2.1.1
         with:
           create-github-releases: false
@@ -173,3 +138,5 @@ jobs:
       id-token: write
       pages: write
     uses: ./.github/workflows/deploy-docs.yml
+    with:
+      build-artifact: documentation-build
diff --git a/.intent/review-state.json b/.intent/review-state.json
new file mode 100644
index 0000000..dd04c9f
--- /dev/null
+++ b/.intent/review-state.json
@@ -0,0 +1,1608 @@
+{
+  "schemaVersion": 1,
+  "baseline": "5b91ddb1de13970365669c887b9d767ea417fbd4",
+  "items": {
+    "skill:skills/effect-api-query/SKILL.md": {
+      "fingerprint": "aa5a86ba2ce9edcfaf62e73f06f34b3e6b6504b709153f5c4961c8c085532b90",
+      "snapshot": {
+        "GLOSSARY.md": "ad19a69727108dd047208b6e76e05f5b1d241620ed75cb241a62fb4c068dc792",
+        "README.md": "fd60880b03b69efdd8300aeee473fdf1a5b2894e5f3f1d4a701525a0ac2fa967",
+        "apps/docs/src/content/docs/concepts/client-lifecycle.md": "fcbaca84f266060b946eed9cbf9d0b9815352b7b1d6ddaff5803b29484345380",
+        "apps/docs/src/content/docs/concepts/data-normalization.md": "f1505ec3eb35a33fac289706c2cc318a2ffb80555e3302ca102e67e21c9012da",
+        "apps/docs/src/content/docs/concepts/http-utility-tree.md": "ed03938167f31822b76efbeac381fd3f8d297061fe567928ee022f8dbfadb9b4",
+        "apps/docs/src/content/docs/concepts/queries-and-mutations.md": "204141ba9e3b52e8e0b2d994ef4381cfcecf898d0bd011866f8cbfc8e89cb15c",
+        "apps/docs/src/content/docs/concepts/rpc-utility-tree.md": "fd5fcc232279e9577b8b2faf321a85e9a340e6090ea5887bbab208cca2d24a4e",
+        "apps/docs/src/content/docs/concepts/semantic-keys.md": "4fcc7437b4c0698f590926545e41b68eed1094027fb18a8834fb695db63262c6",
+        "apps/docs/src/content/docs/examples.md": "4035adf9d277a7a3d75b22be8147ee6acb3329e6e96ca7c76b9d4fc052758239",
+        "apps/docs/src/content/docs/examples/cancellable-commands.md": "c175cbd7f15b2322b3039a95aba937a440ae4198794195b6db7419b2a3acb245",
+        "apps/docs/src/content/docs/getting-started/compatibility-and-stability.md": "74f9d59c908fe6ab70ccfb8940c1f976e060b38a05cc6bbe75f72403d3b3ed7b",
+        "apps/docs/src/content/docs/getting-started/feature-support.md": "5a6b57b8e539937b203da9bb571d31da2169a014f6f0ee6d0625627a8b0f7525",
+        "apps/docs/src/content/docs/getting-started/http-quick-start.md": "9ac402d68c35a3e8e4d3139ab0424a55395eecd671dd25ba2e942b311230a6ff",
+        "apps/docs/src/content/docs/getting-started/installation.md": "fde89cc5c10d005672db696bdc8016deb42d86977fca1b89cfe6315c760bf2d3",
+        "apps/docs/src/content/docs/getting-started/quick-start.md": "34846f39ac2bc6275920d09f04f1141c2ef8d93688f2d83faaa6e29b3d7ac91a",
+        "apps/docs/src/content/docs/guides/angular-query.md": "82b6cc47488db0b166b0f79597526e26274823b48377482fb52949a00c5a9515",
+        "apps/docs/src/content/docs/guides/cache-filters.md": "ac56ebb6d8949bec515be80850a5386d79eb9dc38533286ad3fa638f82654418",
+        "apps/docs/src/content/docs/guides/cache-management.md": null,
+        "apps/docs/src/content/docs/guides/cancellation.md": "8566563c90d913c4db16435d314eba1ec53d6873b30aa5652097d0994c50cc4c",
+        "apps/docs/src/content/docs/guides/choose-stream-history.md": "6996df3a8b18c4fadbcc76a3635a8a5408f155b4068509d4801b38afa7f22f16",
+        "apps/docs/src/content/docs/guides/conditional-queries.md": "7cc52d18217653c63699e78ecce3efb78c484e57ba75a92071df5d16b9a40ac8",
+        "apps/docs/src/content/docs/guides/custom-key-encoders.md": "e48f1768db1c9e8ab3d5915593dc6de9089c35c039fb16e7ca04a4326a4df8bf",
+        "apps/docs/src/content/docs/guides/handle-failures.md": "7bf37fc98c4a4eab109ead80d24febe4dda968267f07e7f3d665297c746a9c2b",
+        "apps/docs/src/content/docs/guides/http-metadata.md": "b0b45e8c3af5ada0d64cf61bd5bca161186a604c30d3e9fc63ba9090c590e542",
+        "apps/docs/src/content/docs/guides/http-queries-and-mutations.md": "23edf1a1c71a29561d9c87cc7fca1f7c8ed370d6e62be5719dcf54d533c420b9",
+        "apps/docs/src/content/docs/guides/hydrate-query-views.md": "d71f573e4c6e6815e51f7a63080b773655f90cf9ef07155d293f1550eac091d4",
+        "apps/docs/src/content/docs/guides/hydrate-unary-data.md": "0cf27b204e709f8a753fd61fd1510073404611e53a9fd6e82e8122af7e68f2fa",
+        "apps/docs/src/content/docs/guides/mutations.md": "773d6720894a83083bcd54adb55b632a9902894165a7c147c1266620774d8f21",
+        "apps/docs/src/content/docs/guides/optimistic-writes.md": "8d5001c0c1caa2f4cc25ce10955791eaef2f032327fc9c8a743173ffd60b68b5",
+        "apps/docs/src/content/docs/guides/pagination.md": "95a82e2cc2a972080152ac0816e06262ad63c7c0a7f9c8a60b3f836a42120a1a",
+        "apps/docs/src/content/docs/guides/queries.md": "6fb845e9d9d86a94b4df323583c9f721c171d135e2cb64f184f8a6fea22350e7",
+        "apps/docs/src/content/docs/guides/query-defaults.md": "74b7f9cd1c29b6bfa3777e8b48cc3dc6319856b48029d052adb4de34a9f5ddaf",
+        "apps/docs/src/content/docs/guides/react-query.md": "d17a75453131d062ea1ca25cdeea9d9d975503d1bfb0be74c90c13ff0708590f",
+        "apps/docs/src/content/docs/guides/refresh-from-events.md": "a8e680ae9060a573336829b94dbf77dd32385671d48cd4aa0f092a1374444cd6",
+        "apps/docs/src/content/docs/guides/retry-queries.md": "4326d4e0cec0ca0067182020f68e4db0f634ecefedcc5cadd0db3e90e3709684",
+        "apps/docs/src/content/docs/guides/solid-query.md": "6ce866f49974edc7f5db579d08134734544de1137d5a9e5efdf49bc62d12b7f2",
+        "apps/docs/src/content/docs/guides/stream-snapshots.md": "91e22e85c11d8822e25e5abb7b872b78f07af79fdb16eb2690baf8226fdbd9f7",
+        "apps/docs/src/content/docs/guides/streaming.md": "2d43cc0ac6f007f31aabfe01200d895827cb14ec1166324eb9661d146cda240a",
+        "apps/docs/src/content/docs/guides/suspense-and-recovery.md": "a5f92087e5006d2162ab623cdc39d98a41e13b5967e7483e3db7fa46e436e730",
+        "apps/docs/src/content/docs/guides/svelte-query.md": "967257cd51f59723bd641c8553a4e50b931258e79f24d60f47fdfb3035ffe6a8",
+        "apps/docs/src/content/docs/guides/switch-cache-owners.md": "cc209f13becec305af60c9f04fe29f85a2ca6db3bc11601cf09083bc2583d198",
+        "apps/docs/src/content/docs/guides/tanstack-start.md": "7ec04e78ab8798f8cd89839f2a07b466f0c9834557126799373940b161a95b0b",
+        "apps/docs/src/content/docs/guides/trace-streams.md": "3e6bcd468881b23957b01e8222b2fd2d36b4de0e79141819234c54795b26f03a",
+        "apps/docs/src/content/docs/guides/vue-query.md": "bd8b50c940d0493780a60ae0cd80fc2843b2ebb22c2d3c9bc70653e0379d4155",
+        "apps/docs/src/content/docs/guides/websocket-clients.md": "1cd31655e433ced7b24795255cb03280b27734eda58afeb9730a42bfad433c43",
+        "apps/docs/src/content/docs/index.mdx": "b5bcd9d26ee0b8ea181b0c063afbae9ee057e31db9a2b3252c13589b5847339a",
+        "apps/docs/src/content/docs/integrations/index.md": "7ee02cd3d7d1d212ac0e539dc6dde5bf928d906797abcac34da1e7ec1352785a",
+        "apps/docs/src/content/docs/reference/browser-and-worker-hosts.md": "70743a4429a39937515c8d5fee79ca75714a92dd526f1093f9fa8ea12fbde984",
+        "apps/docs/src/content/docs/reference/compatibility-and-limits.md": "4f60753887b52c33a47b993f0aaaf75832edaeb09d082f2664e2e5e512e568a3",
+        "apps/docs/src/content/docs/reference/errors.md": "57b90eca4db33880af66063e8211b4a39d0850af811beafc8711bb01860063d5",
+        "apps/docs/src/content/docs/reference/external-http-clients.md": "9bfef63f64b378847d99092f088492f989ba0577810e6aa07bb194d55ca5fcbb",
+        "apps/docs/src/content/docs/reference/factory.md": "fb8e57908ccb82d57b3b29664034b3a210945b9bd39e030cd9613015ea3b0c37",
+        "apps/docs/src/content/docs/reference/generated-builders.md": "0c0406824a2f906ec4d5601ab068d6c1d2b35ce8b9602618f992eff7de8824f2",
+        "apps/docs/src/content/docs/reference/http-builders.md": "153a63a31bdfaa8411a4af067d555e7fe1af037c9d2f798a7f7a21b4e4be0a86",
+        "apps/docs/src/content/docs/reference/http-factory.md": "d40fd0597a9d784e21bf7f80ec9cf56008511f472625e572ffded61db0972f68",
+        "apps/docs/src/content/docs/reference/performance.md": "2f68c31cae28de0a84b1ce77f065481d37899171b78d9593ff65e017ff75d97a",
+        "apps/docs/src/content/docs/reference/public-exports.md": "9550217e7724f7d15542ff83e0a268bfe7274f7af5a4c3440ef0ee418607a6d9",
+        "apps/docs/src/content/docs/reference/type-inference.md": "1edcf7de07709644784a1f7dcc5462f0eb1e01e168f30ba9b1db102ebd424fd6",
+        "docs/adr/0001-target-effect-4-release-candidate.md": "44119ba9104f767c5804c5026c4a21a78a8367f6d9ff5a9035bb3f423969fbb3",
+        "docs/adr/0002-let-call-sites-choose-query-or-mutation.md": "4244d48ff136eea562aa2f94a0b6b1ab58412796f3ece47a3cf5b43f746e11f5",
+        "docs/adr/0003-project-dotted-rpc-tags-into-utility-paths.md": "a99856e94af4004484fed939d46ae4388363031cf396b07f04a92a7119fec2fe",
+        "docs/adr/0004-build-core-shaped-options-and-certify-react-first.md": "0e47069738c3792430c92b396068ac269139356c83738453889517d97e22f190",
+        "docs/adr/0005-preserve-the-cause-in-one-error-wrapper.md": "1e04885542f22f166b5daa913ae2dae121c407baa775a2c4a16590f96857e3fe",
+        "docs/adr/0006-use-canonical-semantic-json-for-payload-keys.md": "694d8665938af25abb91ada71ea9c95cb77dd4ea90019adb2f642e16a88948c7",
+        "docs/adr/0007-keep-the-core-factory-lifecycle-neutral.md": "a83dc0d6061ac0328a3ee6075aa872a55feb4f0154edf6dae964e74276bb15b5",
+        "docs/adr/0008-use-flat-prefix-matchable-key-tuples.md": "7fb791e73e0266afd8583e45059aebcc10bbd9704d625bdefcafec1481a46cf6",
+        "docs/adr/0009-build-an-eager-frozen-utility-tree.md": "bc3b08a3385f1dc8874d81f867f15ef6c30b203c94936fd991d2941fd5bacc27",
+        "docs/adr/0010-reuse-tanstack-query-core-as-a-peer.md": "633a1ce44c8d58b29096f540871b61566352462e1d4bd5335162b3e08652527d",
+        "docs/adr/0012-normalize-undefined-query-success-to-null.md": "5d076f168223f67a205138d3e258f1f3aac9dfe5d607ffe8efd12a71322ef022",
+        "docs/adr/0014-require-query-stable-payload-construction.md": "2f4381fb3e7406304ff3b914db541419f799f8a71d1d527b37a9e971e9949e47",
+        "docs/adr/0015-centralize-the-toolchain-in-vite-plus.md": "d2001383bc0f92363289c04b6b8df26acb5b0f5dfc0163b2a838f2eee8057b75",
+        "docs/adr/0020-generate-accumulated-and-live-stream-queries.md": "5e4f5c92e08ffb769137e930908dded993f928a497b018f9c6e4fd4f12232727",
+        "docs/adr/0021-share-utility-construction-through-private-modules.md": "821720a3eee166d4b7d42b6f5c3906bb29dff339b4815e9ed1c516bc5af66fd4",
+        "docs/adr/0022-add-buffered-http-utilities-with-separate-key-roots.md": "f1fb5d91cd91a70b356bc98b84176920ec822315dbdeaf5e247921853598b62f",
+        "docs/adr/0023-expose-buffered-multipart-http-mutations.md": "b72f20cb513d2a7db94b2dbe27576352048ba22288ad6eac6e80d1a7c81cefb8",
+        "docs/adr/0024-project-http-streams-and-buffered-metadata.md": "2797a5a4a751c5e37c38aa454c14b99ce1615870ffa13cfcedb98cca8a0af633",
+        "docs/adr/0025-use-public-decoded-message-clients-for-server-local-rpc.md": "36df8e1227af22018d5a9063699986ceb8dcfd4c8bb5615aa62557f2ec36e111",
+        "docs/adr/0026-keep-rpc-transport-aggregation-in-the-application.md": "b73af29d8f73a36f61f110ad8778e045d37253fe42a8888883e78089b93e955e",
+        "examples/server/src/commands.ts": "58f415fe0ab9bb0127c96c11ef0540a29b97d231eebd3a487513f0820a46b3d5",
+        "examples/server/src/diagnostic-operations.ts": "ddf8a0f2367b91ca08d6aaaf58380a51b77a5c51a9a85412bd7e7080ff0453ee",
+        "examples/server/src/domain.ts": "c00fced49e54d7bfff9045479e91aabdbd7c0868cc89afe00bae5473b17d2f82",
+        "examples/server/src/http-handlers.ts": "601f37c428015e75e94cb282af356878aa49c887804cc29e2b4f0c1a47ca92f0",
+        "examples/server/src/index.ts": "9e121809a5493c649e61e76fefec52a8c79a394983368060a95dc7000dcedc9a",
+        "examples/server/src/main.ts": "de9520cc16e4bff9d02b8507ee70641936b1287959823429f7759c0f05fdc0a7",
+        "examples/server/src/rpc-handlers.ts": "c2c57eb9a2ca5e602fff9f798c4d5165e91216c5b7e64e0a71220c4ba9316f3d",
+        "examples/server/src/server-local-rpc.ts": "de2a05bba54042f1d2d5781023cb5d20eb63915dd2a52635e9debf83911b5421",
+        "examples/server/src/server.ts": "5c9bbd7131ba3c55bbd61255fa8da8a275fc97412e1c8cb54f063bde517991e9",
+        "examples/server/src/users.ts": "15c363e2162f8dab4da1bfcf6324abbb3dc8ca34a8d8e036eb4db2481fe6be5b",
+        "examples/server/src/web-handler.ts": "2de54d8d2264024887ca63c8c53b20e9f9260ca6605b791d1f91bcea8c8d1b07",
+        "examples/server/tests/fixtures/websocket-server.ts": "b59863766bb60e5fb4de040d7d97ae2e67bca2ec44810ddc577f4cf5cb03129f",
+        "examples/server/tests/http-api.test.ts": "6ad2951b74c45a73ea4980e5da65c7ed4f758ff43db34702f1224de934548bca",
+        "examples/server/tests/rpc-transport-overhead.test.ts": "8d3dd40cfbbd0ce64b74f44f205f7f83163ea08dfc264a6deb1902e96b74a7fb",
+        "examples/server/tests/rpc-websocket-consumer.test.ts": "16253ef720e8a85cb7c583bcf6f9883c5893423d6da952659731e5823fcf0a62",
+        "examples/server/tests/server.test.ts": "44530f1e8b9b67f4d4bd8486c7bd7790240128fb161c1244857eee15c87a068d",
+        "examples/server/tests/web-handler.test.ts": "94d1b28810d908dcec8ca8299e56bb520f93804e8761b4d5e9c828087efae646",
+        "examples/shared/error-description.ts": "374a804cd0daf1dcfdff8b7247194d278cc52fdf3bd0d9b5d2891124b439cf87",
+        "examples/shared/use-slow-query-cancellation.ts": "f6221dc3a725c2f3cb15f41167ab98f8f579f3a0c138cb66cdf3c368b93b996a",
+        "examples/tanstack-start/src/components/effect-error-details.tsx": "a84187a90ebe207f9b8427f43dda44c81f6564821510c8c848ceca0f7d6940af",
+        "examples/tanstack-start/src/lib/api-server.ts": "b678d6edab872786fb92db328f60095d604c8d2f5205c4d4a462c3405a782bad",
+        "examples/tanstack-start/src/lib/application.ts": "7417de76eaf8a1a1cbd8464af6508bc3244a0176941c742e829880670a54ee8a",
+        "examples/tanstack-start/src/lib/query-ssr.ts": "0754abae5faf2f7562e1d86d27df0e14820a5ba9830146690ff1dc9f5beb3ec9",
+        "examples/tanstack-start/src/lib/server-application.ts": "442278fc08c4beb9a69cf1ab7672f661385d9c49998db77ce2870d349ffdc8a1",
+        "examples/tanstack-start/src/lib/server-host.ts": "1682ee37ea7551ec52c9530d6a4b476b967fa0572f5ddc26351ad427ce854e37",
+        "examples/tanstack-start/src/lib/snapshot-preparation.ts": "4321b25d469a6955659e6c7949b22ed78368873af81dd11718f53e02d1a81a2b",
+        "examples/tanstack-start/src/router.tsx": "801aac19cff9a4e2a4acb0823a9ea5c28b4aea9245f7e26cb63548bb5234bd15",
+        "examples/tanstack-start/tests/application.test.ts": "0ce067b4179b050b9daac397128fcd00e8f6d63416e43766ca1e442041f06301",
+        "examples/tanstack-start/tests/async-hydration.test.ts": "1f983917d2a469b83b876e882ad6a2ece4d28d360338ed614232807a168a1620",
+        "examples/tanstack-start/tests/client-navigation.test.tsx": "62af6b9c4ad00e2bd772a0eb75d175e11329079bc787874b0d87e7f22030620e",
+        "examples/tanstack-start/tests/failure-dehydration.test.ts": "b9d135c54e8e70ff454903f8016e6560fabaa487095cb40cb8725ed73577f079",
+        "examples/tanstack-start/tests/server-local.test.ts": "2facfdbf572cf8ed1cf5f6104a503504ab0e979546aca3e28d9dbc853c64c6e5",
+        "examples/tanstack-start/tests/server-render.test.tsx": "77b82127f9e3ddea55b201f7b2080f930ef340269010502f1515f6691ecc4ab2",
+        "examples/vite-react/src/app.tsx": "691f77aee6fb9f2b1f6f9df40a3afcf78f4af2d043d7b379f38c75c647a5f91e",
+        "examples/vite-react/src/components/ui/effect-error-details.tsx": "26a1a4bdb5a6331dca09c3c7764b2ff55431aa18ad6768f82529f8563dc3801a",
+        "examples/vite-react/src/lib/application.ts": "01f8f4f611435708e68d358993971aa9cadb01a2167fdc350a284d7f1ceeb752",
+        "examples/vite-react/src/lib/owner-cache.ts": "3286d0df63d4036c16c572ffd5e113400b455a5ce9f55dfe7859e72b8ae218bb",
+        "examples/vite-react/src/lib/user-writes.ts": "55f2de2f7be68f477665af3f59c93f37994045023014274513404418e0d1b8e8",
+        "examples/vite-react/src/main.tsx": "cdee6ca4095b58e1750015db473bda8651702a8ab32c408fa77961873db0e6fe",
+        "examples/vite-react/tests/app.test.tsx": "ff86b42023eb40658dd6feccbfd1f236a75bf2831f40b02955ebc1306be6329c",
+        "examples/vite-react/tests/commands-ui.test.tsx": "70005a656b9356fce97924dff6d4be82d87893cf48a619c119ad4372843246f8",
+        "examples/vite-react/tests/commands.test.ts": "3e24222572c0f7a4b68cfc4069c545cbebf410cacd0063a328cead9ad5baab08",
+        "examples/vite-react/tests/minimal-setup.test.tsx": "632d9a99695206f7aaddd139b7a2cc5e0d8a79fd991b9a1ccae0118a45460e4f",
+        "examples/vite-react/tests/owner-boundary.test.tsx": "d4ce58a002aac2b8f752936a65495558f89bff145d5cf2556f5c0d9286f8d6b3",
+        "examples/vite-react/tests/owner-cache.test.ts": "8818e30fdd3071a2e5dc2d865161e0d9f40de1ff37813b0a396bb2e83dd08a1d",
+        "examples/vite-react/tests/owner-switch.test.ts": "c997c9758269586591cbf55de4651c64091abc9061b56edb024dcbf9dbaa9c1d",
+        "examples/vite-react/tests/slow-query-cancellation.test.tsx": "d8c054206d3613939b71e390cb37002e7d6385628ca15bc20c4984f100cca779",
+        "examples/vite-react/tests/stream-tracing.test.ts": "0f09b669dc00a66e7db0d947f31daa88862e89cda9877d37caaa72631c1b247c",
+        "examples/vite-react/tests/suspense-recovery.test.tsx": "884e694a2a3ecc0cdd12d3555c953c30c6c7778bc613a78752b2ca27c17c173d",
+        "examples/vite-react/tests/user-writes.test.ts": "3fe07c1fa8deab8c154d30481f7bc6ef77d3a8ed6c3d5e0d3cbfe75574061e33",
+        "package.json": "dc41aa3f5b1633ffb2e6f6a0b7efb4e0119d74b9bc8c0003b1a8ee5fad854782",
+        "pnpm-workspace.yaml": "1e73526ddc3448a43e8cfc77e98bad98d15d0617dc2e8caf98e6d5d43fa90641",
+        "scripts/decode-utf8.mts": "2e90c53e95c22b864a209a87c98084db6ec95e83f842007b21528d286d45c18c",
+        "scripts/measure-construction.mts": "10522cb10ab51fd44d8990896a2a73e8bf4d4cd2646441e958b6180cb1afd147",
+        "scripts/verify-docs-examples.mts": "9ba75dd2952a8ee92995904ce9891b6757b10637a298646b95f9af73d270caf8",
+        "scripts/verify-packed-consumer.mts": null,
+        "skills/effect-api-query/SKILL.md": "41c0a5768977c0e25254f559de4454df7d9dc5fb6075487d65a6a52602b0e7d4",
+        "skills/effect-api-query/references/cache-workflows.md": "61d3d363b410eac3f52273e642ec2924d29e887f365a7c21a965a52deeded0be",
+        "skills/effect-api-query/references/frameworks-and-hosts.md": "e84b9179ca0cba6694200f504923906d78b3b7a305315f5d1453dace854aefb5",
+        "skills/effect-api-query/references/http.md": "4dd64a0fcc036f3ee857ae96d0e0149c729e0ea95dfd79a82a62c76db4619999",
+        "skills/effect-api-query/references/hydration-and-ssr.md": "1a6ba66187a1c786c09eb08dbd1c0f0e7c04e21d3b4787eb534687a67c1a38f0",
+        "skills/effect-api-query/references/query-patterns.md": "2b9ff5a7f9857d00dee85842351bc7ff8d3e88a016e1c0056c2ddb513cf53a64",
+        "skills/effect-api-query/references/rpc.md": "2d2d30f309424f255e3162fd52dbdaf6d3883e40d9eb6f1840eb814424b0abf3",
+        "src/core/inference.ts": "b8345c0961c67ceb41ee18e017302a5ef5d6be91794b861e72bece21ee5e9c30",
+        "src/core/operation.ts": "7dabe4d21070d20534643e5051060c84a09db5a7aa39858e75846043f8a537ea",
+        "src/core/policy.ts": "bebe7a32bb958ba9a1817c6fec6792fd04541f5ae81cd70fa422106ac3cb4073",
+        "src/core/schema-key.ts": "1f7d087793291b9763e82a0188367a9446f92b35bc25d73165b7e4f603e5ce05",
+        "src/core/stream-snapshot.ts": "00bf4855cc745571ce440a9afcf7a52134450de9ced00007e4cd2cdab8e544d1",
+        "src/core/streamed-query.ts": "0c29dd2bbf85ae2b4bda6ee65250f32ee17a5362e7a94f7423a0e457398ae9c4",
+        "src/core/types.ts": "c0904ecc411bd78cb82749f3461f67e78d05239e9e0802daf99f9cca5bf95a63",
+        "src/core/utility-tree.ts": "2a3996f5d49d70838e377af85b01acae43e4e964ae69e2150fad5b43a1069821",
+        "src/core/view-prefix.ts": "35a558e324547cb5a799114b937550704984ceae12c03205df5957adf55d988a",
+        "src/http/create-utils.ts": "785dd9171fd9c6ab7619a9e3728f91a3e9d197c311a3a6c8a6dffc74904a4975",
+        "src/http/errors.ts": "95869413973faefd2958f4e48feada7d5700e3aa0c2545f56a7202c8b9609a46",
+        "src/http/operation.ts": "c7a393845b6ba9d5382c7b697230463be4c78ae99525f923cca6f741ffaf6f3d",
+        "src/http/request.ts": "9d31397ee4241319ae56260c65e7fb4973adcee974b55e43e2895e7524d39180",
+        "src/http/streamed-query.ts": "bdac94b5d016578c249a46f4e1825424d5cf72acc85361e2fd00fda92e15ac5c",
+        "src/http/types.ts": "a638fe517865a1d341c2c974d4774f60cb7c10c0907287c9ec8a7d6f296def48",
+        "src/index.ts": "2dfdc1e9a5994ca3a6d918704ecd57442f4e34831b0cba2da68d4e7cc07810c1",
+        "src/rpc/create-utils.ts": "c0db42f6d9962b6c2e291f2b3d060be16ba7fc93826fa00471db5d82503e27dc",
+        "src/rpc/errors.ts": "7048a786a55f2cd221788485ffa993277f47896110ffac742f74ee077382377e",
+        "src/rpc/operation.ts": "e46cb103c4a79506cecb34c9337640ec9ab917a488e9360c7535d3dad733ebf5",
+        "src/rpc/streamed-query.ts": "bf480b78f9d0e37d7e7b572395f1238e6539d0ba8386b22eb5f8b3c400d1dd0f",
+        "src/rpc/types.ts": "90f4df74680db534f98c72f3bdcb5ae60fb720c45114dfb61a089dd62c1dc1be",
+        "tests/cache-recipes.test.ts": "5d86c8f74e952aa6f614d9ba32b4f2680137d23b696d8c55cd07d0463e5b65b7",
+        "tests/create-http-api-query-utils.test.ts": "c1307dbe52820f44526ec676f0b24e5a0e4635690b548185ceb819050b0e4605",
+        "tests/create-rpc-query-utils-configuration.test.ts": "0e53c59e24291e0424e860b9030c439105a1468e4ba37bf24bef81dd846112e2",
+        "tests/create-rpc-query-utils-execution.test.ts": "05a0de82218666f39cc6ac2d120f2b2e96885e9cfc9323e5ccc658ad996da2c5",
+        "tests/create-rpc-query-utils-keys.test.ts": "c6b6918e08c10f097634179e65d0e8eb481ff6833561b04de8e6a093104fee31",
+        "tests/create-rpc-query-utils-request-options.test.ts": "bcd76859a2830e522bdeb212be70f2e14be3b815da75a5caf3e596fd5fbd13e7",
+        "tests/create-rpc-query-utils-server-local.test.ts": "45ee329a736bcb6b114727ef8874f3f34541ce6dc55d5e13ffc80be9c2af2ddd",
+        "tests/create-rpc-query-utils-stream-baseline.test.ts": "282b7f1e8014159972275599a5c9d60bc689e5c9dd619a4a879cef4afe0edfb0",
+        "tests/create-rpc-query-utils-stream-cache.test.ts": "b97fd6eb63c0e8c023f98a1420555288c3dd2f4ab500b0d3e0b1d3a5c41e1347",
+        "tests/create-rpc-query-utils-stream-hashing.test.ts": "025f15582fe2a667dc6383a406d5b42654ea7634acf3591803d9f379896a69bc",
+        "tests/create-rpc-query-utils-stream-publication.test.ts": "cc3a25d02015b1410a8d1406249a846bf711f7b829fa7fccce1da90e600530d3",
+        "tests/create-rpc-query-utils-streaming.test.ts": "f52f775426bb949910a976150f3650b1dfe7526bcb0bd41ed874f399ec8aef44",
+        "tests/create-rpc-query-utils.test.ts": "035816f190df16fe51539857479a0d8cb9c75b1eb6897110aa07ba6ada33c977",
+        "tests/fixtures/async.ts": "61c314b76032dc197a7568b0602740d06eee0462414516788c699f1a7263114a",
+        "tests/fixtures/docs-websocket-use.ts": "6e2aa0bb7b1a653ffc215bad7a39b9a79aa1a9b3707bb32b1e80f4636faac544",
+        "tests/fixtures/effect-rpc.ts": "8a92d7b5e815012f830b7e87a8492b2680d8a1b8fa866c3db25274458d432745",
+        "tests/fixtures/http-client.ts": "184cef6b4864d32f1225149161e12d4286517a34c74eb0ba0a2437ff5f333891",
+        "tests/fixtures/optimistic-users.ts": "163e6880b076673c7a6c643e95737869cc5415446ba5042b10d3371afd401305",
+        "tests/fixtures/query-cache.ts": "ee6509aac5d0cf4f781652da10c2b1c3501a222ddd9a6b05f447e6a226548071",
+        "tests/fixtures/rpc-transport-queries.ts": "46be1d1e6048d57d83e9ae64b00c8c0c11deec6a67d0d4b115cdc9aac7447158",
+        "tests/fixtures/socket-client.ts": "d2d0a4a31011e2cfeec0e7e7ca996ad752a3a51db5675ac5efce54d284c8db89",
+        "tests/fixtures/user-events.ts": "13d8167b811bec6319de96f7cb50410f586c18cc92677d7fd17488b16d15b329",
+        "tests/fixtures/websocket-checks.ts": "7b8035264ece4e501e829b3e2b755f9d7b17c010ffa1036db6338a368ff6f93c",
+        "tests/http-cached-views.test.ts": "ff5fc7de21d00058fe067bf0655e9e6509bc3d04f26730a89c26c84fd3b477e9",
+        "tests/http-execution.test.ts": "241beae3806d2041c7c8cdd0ae5d4bf5277163e8e4690c1cbe589318db6a7776",
+        "tests/http-hydration.test.ts": "cead9c149e9aecbba7121b4e6bcfa3450368d24e6320ba1b8825545db747b98d",
+        "tests/http-live-query.test.ts": "79df219cb204669520c584123f167479ea3fa514d899897bf2810a04e8e1ca65",
+        "tests/http-multipart.test.ts": "cfda4574a8b10bfcf1b38c060f37d6791d83d94a01640edc8f85c468e45cb3c4",
+        "tests/http-query-options.test.ts": "e6abd4020fb4fd11877802c42d07ffb6f66822120d409c885150e97177769386",
+        "tests/http-semantic-keys.test.ts": "df50b9a0cf6981594100c93ca4283eb8ca11e7aca4db8719b4d7bd9a4333cd16",
+        "tests/http-transport-cancellation.test.ts": "e56f8571f949adc9d44f14b61e20edddb188a9565bf7a585859ffe73a851ac39",
+        "tests/query-policy.test.ts": "6ae9b22f6b171414387a5a9639ca3716ce2d065f3530122c320cebf1bc25066e",
+        "tests/query-view-prefix.test.ts": "162de0fa5f68b1f778f8c0c7201a15dcdd78dce4f107fcd64c1e1a50c733e6fe",
+        "tests/stream-snapshot.test.ts": "86449ef5d0f1baf165a5c973fcd0a190b9fce8ae5b6e8732a4454ab0c9f6c132",
+        "tests/types/docs-functionality.ts": "d638721f8a5f291e30b97229933bbb48dc5a92f677897e330bd1959b35deb8ae",
+        "tests/types/docs-http-quick-start.ts": "5f7eef98be244ea392fc2c5b527858f159a08efebf6f2665725301aa8a910050",
+        "tests/types/docs-hydration-async.ts": "de67135bf3da0dffdac47e9f2e49469edddac3d7d026fbd93d39aea6964c0dd8",
+        "tests/types/docs-hydration-dto.ts": "ebcd5c3895e8fa40bff3b62e8e13213e98a3e1c4796d89979b23ecc64cdc13ff",
+        "tests/types/docs-hydration-rich.ts": "56b35d7bb4a0f0ebc777161beb2e73a19dfc7de4db26fc74e3abab5d164f1402",
+        "tests/types/docs-hydration-views.ts": "08d75fe114e4a682fc0ad62b847898dba270672e0ce6d19a4f4d66cf92f75365",
+        "tests/types/docs-policies.ts": "b52d09f03131797873d73ac73d48639010136673b9ac98b866762099899e79a4",
+        "tests/types/docs-react-entry.ts": "cfe186d60a53553103ef292261b48b09b5094d927b1f198f2d3c8bd6f08325d1",
+        "tests/types/docs-react-setup.tsx": "bf0bfb164818366487ce2742699589c62fee4ec5bcb9e906f7d8c423251ecf65",
+        "tests/types/docs-readme-http.ts": "f15c8d87a1522328bbec1bc81d6e7573d406a88134f37e2dfab4c2e4dfe877d5",
+        "tests/types/docs-readme-rpc.ts": "e41aaf93b7fd61f619a2a3fb1132ffe5c027dfe17040b5ba061fa3591f31c69d",
+        "tests/types/docs-retry.ts": "78c782810b772e152ea0c47074fb2546fed5d397b93b147862644859fd20cc25",
+        "tests/types/docs-rpc-quick-start.ts": "95deee30de122cbaa7b9cb28257c234aa1162a0b549a87cf50a80bd84e871081",
+        "tests/types/docs-stream-snapshot.ts": "bc924cff90a9f9a8e416bf7fbdfedbd607c88e7a678435aaf20ef878862e06ff",
+        "tests/types/docs-stream-tracing.ts": "c839cd8a8d0875ddbe30e6234a0649c82d79f481084e718e5c341f7b4c427198",
+        "tests/types/docs-suspense.tsx": "2adc801083df580498a6cfa78fd6b970eae087c6e2af8601fcae111a53d13f4c",
+        "tests/types/docs-user-events.ts": "87647140d5434b95cc5389b1fea9919f20df7b6fcee4f00565836a4eae549a70",
+        "tests/types/example-owner-contract.ts": "fb10bd087ee582a64806d110404c366cb74e520b0b8cc11701348036b08b9622",
+        "tests/types/helper-contract.ts": "93f5d4276dca08c4848ffe7fccff893081767c4f51e11ec27588caade4999a53",
+        "tests/types/http-contract.ts": "9b6134849353f790a91cfebe955d660a65dc1927ffc00adf471afb7ae84b064d",
+        "tests/types/http-stream-contract.ts": "24031e37ac8cada4b8e9d3b2f4ce6e08448780571d94c8002bd8b267caa320bd",
+        "tests/types/http-type-scale.ts": "b456543b88316a2dd899f929efbffcf514e54e213e109b5f7d52eb785d2255aa",
+        "tests/types/http-view-proof.ts": "f42a1ebf36eeab7a906b722f5d2c2af0aabe8d30ef378fc50386c16d464fb64e",
+        "tests/types/public-contract.ts": "0726d33528f8f08bb907d9cd9c18f2d73d4e5b900c35080a8f176fe9f32b944b",
+        "tests/types/server-local-client-contract.ts": "443a60788ce7d91a77459c99f07d3fc9bf70d5a64a83c05ece5c40cfac63d298",
+        "tests/types/snapshot-contract.ts": "9e6a2edaddb7545f20d351511ed99be2828d4ca56779503bcc443963d8b73716",
+        "tests/types/tanstack-start-contract.ts": "51681e3d0d7504a614d490f18adb6f44db82d34b9d4d7cb9cf941aea33de284f",
+        "tests/types/type-scale.ts": "a9b307c25c72f3c184eabc8e22ddaeea96feb331c0f8d748773d765d358dbfca"
+      },
+      "head": "3e3fd371f097ad7a7f430b73f09c69ef711acff4",
+      "outcome": "no-change",
+      "reason": "The README consolidates existing RPC and HTTP setup into compact concrete examples without changing the supported API, ready-client ownership, runner requirements, cache identity or workflow. Existing shipped RPC/HTTP and framework references already cover these contracts; no guidance rewrite is warranted.",
+      "evidence": [
+        "Reviewed actual diff at HEAD 3e3fd371f097ad7a7f430b73f09c69ef711acff4: README.md, scripts/verify-docs-examples.mts, tests/types/docs-readme-rpc.ts and tests/types/docs-readme-http.ts. No library source, manifest, dependency, export or workflow change remains.",
+        "README now follows the approved purpose/install/RPC/HTTP/capabilities/links outline and uses published-package wording. Concrete service-free contracts accept typed ready clients; client acquisition/lifetime and required execution services remain application-owned. Checked ordinary HttpApiClient.make captures HttpClient during acquisition and returns default service-free Client<Groups>, consistent with the HTTP snippet.",
+        "vp run --no-cache pack passed ESM/declaration generation, strict publint and Are the Types Wrong. Inspected the local npm archive: effect peer resolves to exactly 4.0.0, Query Core range remains >=5.103.1 <6, root exports point to dist, and all seven shipped skill/reference files are included.",
+        "vp run --no-cache --ignore-depends-on api-types passed every public fixture, including both exact README examples, under TypeScript 7.0.2 and 5.9.3. The pre-existing docs-hydration-views TaggedStruct suggestion is non-failing.",
+        "vp run --no-cache docs-check passed exact snippets and Astro (0 errors/warnings/hints). After final fixture formatting, node scripts/verify-docs-examples.mts passed again. Type-aware lint/typecheck passed all 150 checked files with no errors or warnings; final vp run format passed 304 files and git diff --check passed.",
+        "Exact pushed HEAD 3e3fd371 passed all six CI jobs in run 38161476267: source quality, example builds, documentation, Chromium, Firefox and WebKit. Current uncommitted README/fixture/verifier changes received the separate local checks above; runtime tests were not repeated for this documentation-only change.",
+        "Read the owned skill and affected RPC, HTTP and framework references plus all three planning records. Intent sync reported Nothing to synchronize. No new API recommendation, activation rule, domain task, failure mode or source boundary; fresh consumer/discovery testing was not repeated because shipped guidance is unchanged."
+      ]
+    },
+    "planning:_artifacts": {
+      "fingerprint": "3d7d7aec4b7470c0976ab35090f6642fc8f17eb3c938d52311ada6299a29119c",
+      "snapshot": {
+        "GLOSSARY.md": "ad19a69727108dd047208b6e76e05f5b1d241620ed75cb241a62fb4c068dc792",
+        "README.md": "fd60880b03b69efdd8300aeee473fdf1a5b2894e5f3f1d4a701525a0ac2fa967",
+        "_artifacts/domain_map.yaml": "03379e3cd6338cb4bb20bd15408af2ff86accf9fa009259f715123be50681d3c",
+        "_artifacts/skill_spec.md": "93dbe6009f951ddb49a350b85ce212f1b092bbd381cf2a1425ab3e243200e199",
+        "_artifacts/skill_tree.yaml": "0ef24d94a4bbc5c4b628892a130c2b36a81a16c5705a48e990919b5eec467a47",
+        "apps/docs/src/content/docs/concepts/client-lifecycle.md": "fcbaca84f266060b946eed9cbf9d0b9815352b7b1d6ddaff5803b29484345380",
+        "apps/docs/src/content/docs/concepts/data-normalization.md": "f1505ec3eb35a33fac289706c2cc318a2ffb80555e3302ca102e67e21c9012da",
+        "apps/docs/src/content/docs/concepts/http-utility-tree.md": "ed03938167f31822b76efbeac381fd3f8d297061fe567928ee022f8dbfadb9b4",
+        "apps/docs/src/content/docs/concepts/queries-and-mutations.md": "204141ba9e3b52e8e0b2d994ef4381cfcecf898d0bd011866f8cbfc8e89cb15c",
+        "apps/docs/src/content/docs/concepts/rpc-utility-tree.md": "fd5fcc232279e9577b8b2faf321a85e9a340e6090ea5887bbab208cca2d24a4e",
+        "apps/docs/src/content/docs/concepts/semantic-keys.md": "4fcc7437b4c0698f590926545e41b68eed1094027fb18a8834fb695db63262c6",
+        "apps/docs/src/content/docs/examples.md": "4035adf9d277a7a3d75b22be8147ee6acb3329e6e96ca7c76b9d4fc052758239",
+        "apps/docs/src/content/docs/examples/cancellable-commands.md": "c175cbd7f15b2322b3039a95aba937a440ae4198794195b6db7419b2a3acb245",
+        "apps/docs/src/content/docs/getting-started/compatibility-and-stability.md": "74f9d59c908fe6ab70ccfb8940c1f976e060b38a05cc6bbe75f72403d3b3ed7b",
+        "apps/docs/src/content/docs/getting-started/feature-support.md": "5a6b57b8e539937b203da9bb571d31da2169a014f6f0ee6d0625627a8b0f7525",
+        "apps/docs/src/content/docs/getting-started/http-quick-start.md": "9ac402d68c35a3e8e4d3139ab0424a55395eecd671dd25ba2e942b311230a6ff",
+        "apps/docs/src/content/docs/getting-started/installation.md": "fde89cc5c10d005672db696bdc8016deb42d86977fca1b89cfe6315c760bf2d3",
+        "apps/docs/src/content/docs/getting-started/quick-start.md": "34846f39ac2bc6275920d09f04f1141c2ef8d93688f2d83faaa6e29b3d7ac91a",
+        "apps/docs/src/content/docs/guides/angular-query.md": "82b6cc47488db0b166b0f79597526e26274823b48377482fb52949a00c5a9515",
+        "apps/docs/src/content/docs/guides/cache-filters.md": "ac56ebb6d8949bec515be80850a5386d79eb9dc38533286ad3fa638f82654418",
+        "apps/docs/src/content/docs/guides/cache-management.md": null,
+        "apps/docs/src/content/docs/guides/cancellation.md": "8566563c90d913c4db16435d314eba1ec53d6873b30aa5652097d0994c50cc4c",
+        "apps/docs/src/content/docs/guides/choose-stream-history.md": "6996df3a8b18c4fadbcc76a3635a8a5408f155b4068509d4801b38afa7f22f16",
+        "apps/docs/src/content/docs/guides/conditional-queries.md": "7cc52d18217653c63699e78ecce3efb78c484e57ba75a92071df5d16b9a40ac8",
+        "apps/docs/src/content/docs/guides/custom-key-encoders.md": "e48f1768db1c9e8ab3d5915593dc6de9089c35c039fb16e7ca04a4326a4df8bf",
+        "apps/docs/src/content/docs/guides/handle-failures.md": "7bf37fc98c4a4eab109ead80d24febe4dda968267f07e7f3d665297c746a9c2b",
+        "apps/docs/src/content/docs/guides/http-metadata.md": "b0b45e8c3af5ada0d64cf61bd5bca161186a604c30d3e9fc63ba9090c590e542",
+        "apps/docs/src/content/docs/guides/http-queries-and-mutations.md": "23edf1a1c71a29561d9c87cc7fca1f7c8ed370d6e62be5719dcf54d533c420b9",
+        "apps/docs/src/content/docs/guides/hydrate-query-views.md": "d71f573e4c6e6815e51f7a63080b773655f90cf9ef07155d293f1550eac091d4",
+        "apps/docs/src/content/docs/guides/hydrate-unary-data.md": "0cf27b204e709f8a753fd61fd1510073404611e53a9fd6e82e8122af7e68f2fa",
+        "apps/docs/src/content/docs/guides/mutations.md": "773d6720894a83083bcd54adb55b632a9902894165a7c147c1266620774d8f21",
+        "apps/docs/src/content/docs/guides/optimistic-writes.md": "8d5001c0c1caa2f4cc25ce10955791eaef2f032327fc9c8a743173ffd60b68b5",
+        "apps/docs/src/content/docs/guides/pagination.md": "95a82e2cc2a972080152ac0816e06262ad63c7c0a7f9c8a60b3f836a42120a1a",
+        "apps/docs/src/content/docs/guides/queries.md": "6fb845e9d9d86a94b4df323583c9f721c171d135e2cb64f184f8a6fea22350e7",
+        "apps/docs/src/content/docs/guides/query-defaults.md": "74b7f9cd1c29b6bfa3777e8b48cc3dc6319856b48029d052adb4de34a9f5ddaf",
+        "apps/docs/src/content/docs/guides/react-query.md": "d17a75453131d062ea1ca25cdeea9d9d975503d1bfb0be74c90c13ff0708590f",
+        "apps/docs/src/content/docs/guides/refresh-from-events.md": "a8e680ae9060a573336829b94dbf77dd32385671d48cd4aa0f092a1374444cd6",
+        "apps/docs/src/content/docs/guides/retry-queries.md": "4326d4e0cec0ca0067182020f68e4db0f634ecefedcc5cadd0db3e90e3709684",
+        "apps/docs/src/content/docs/guides/solid-query.md": "6ce866f49974edc7f5db579d08134734544de1137d5a9e5efdf49bc62d12b7f2",
+        "apps/docs/src/content/docs/guides/stream-snapshots.md": "91e22e85c11d8822e25e5abb7b872b78f07af79fdb16eb2690baf8226fdbd9f7",
+        "apps/docs/src/content/docs/guides/streaming.md": "2d43cc0ac6f007f31aabfe01200d895827cb14ec1166324eb9661d146cda240a",
+        "apps/docs/src/content/docs/guides/suspense-and-recovery.md": "a5f92087e5006d2162ab623cdc39d98a41e13b5967e7483e3db7fa46e436e730",
+        "apps/docs/src/content/docs/guides/svelte-query.md": "967257cd51f59723bd641c8553a4e50b931258e79f24d60f47fdfb3035ffe6a8",
+        "apps/docs/src/content/docs/guides/switch-cache-owners.md": "cc209f13becec305af60c9f04fe29f85a2ca6db3bc11601cf09083bc2583d198",
+        "apps/docs/src/content/docs/guides/tanstack-start.md": "7ec04e78ab8798f8cd89839f2a07b466f0c9834557126799373940b161a95b0b",
+        "apps/docs/src/content/docs/guides/trace-streams.md": "3e6bcd468881b23957b01e8222b2fd2d36b4de0e79141819234c54795b26f03a",
+        "apps/docs/src/content/docs/guides/vue-query.md": "bd8b50c940d0493780a60ae0cd80fc2843b2ebb22c2d3c9bc70653e0379d4155",
+        "apps/docs/src/content/docs/guides/websocket-clients.md": "1cd31655e433ced7b24795255cb03280b27734eda58afeb9730a42bfad433c43",
+        "apps/docs/src/content/docs/index.mdx": "b5bcd9d26ee0b8ea181b0c063afbae9ee057e31db9a2b3252c13589b5847339a",
+        "apps/docs/src/content/docs/integrations/index.md": "7ee02cd3d7d1d212ac0e539dc6dde5bf928d906797abcac34da1e7ec1352785a",
+        "apps/docs/src/content/docs/reference/browser-and-worker-hosts.md": "70743a4429a39937515c8d5fee79ca75714a92dd526f1093f9fa8ea12fbde984",
+        "apps/docs/src/content/docs/reference/compatibility-and-limits.md": "4f60753887b52c33a47b993f0aaaf75832edaeb09d082f2664e2e5e512e568a3",
+        "apps/docs/src/content/docs/reference/errors.md": "57b90eca4db33880af66063e8211b4a39d0850af811beafc8711bb01860063d5",
+        "apps/docs/src/content/docs/reference/external-http-clients.md": "9bfef63f64b378847d99092f088492f989ba0577810e6aa07bb194d55ca5fcbb",
+        "apps/docs/src/content/docs/reference/factory.md": "fb8e57908ccb82d57b3b29664034b3a210945b9bd39e030cd9613015ea3b0c37",
+        "apps/docs/src/content/docs/reference/generated-builders.md": "0c0406824a2f906ec4d5601ab068d6c1d2b35ce8b9602618f992eff7de8824f2",
+        "apps/docs/src/content/docs/reference/http-builders.md": "153a63a31bdfaa8411a4af067d555e7fe1af037c9d2f798a7f7a21b4e4be0a86",
+        "apps/docs/src/content/docs/reference/http-factory.md": "d40fd0597a9d784e21bf7f80ec9cf56008511f472625e572ffded61db0972f68",
+        "apps/docs/src/content/docs/reference/performance.md": "2f68c31cae28de0a84b1ce77f065481d37899171b78d9593ff65e017ff75d97a",
+        "apps/docs/src/content/docs/reference/public-exports.md": "9550217e7724f7d15542ff83e0a268bfe7274f7af5a4c3440ef0ee418607a6d9",
+        "apps/docs/src/content/docs/reference/type-inference.md": "1edcf7de07709644784a1f7dcc5462f0eb1e01e168f30ba9b1db102ebd424fd6",
+        "docs/adr/0001-target-effect-4-release-candidate.md": "44119ba9104f767c5804c5026c4a21a78a8367f6d9ff5a9035bb3f423969fbb3",
+        "docs/adr/0002-let-call-sites-choose-query-or-mutation.md": "4244d48ff136eea562aa2f94a0b6b1ab58412796f3ece47a3cf5b43f746e11f5",
+        "docs/adr/0003-project-dotted-rpc-tags-into-utility-paths.md": "a99856e94af4004484fed939d46ae4388363031cf396b07f04a92a7119fec2fe",
+        "docs/adr/0004-build-core-shaped-options-and-certify-react-first.md": "0e47069738c3792430c92b396068ac269139356c83738453889517d97e22f190",
+        "docs/adr/0005-preserve-the-cause-in-one-error-wrapper.md": "1e04885542f22f166b5daa913ae2dae121c407baa775a2c4a16590f96857e3fe",
+        "docs/adr/0006-use-canonical-semantic-json-for-payload-keys.md": "694d8665938af25abb91ada71ea9c95cb77dd4ea90019adb2f642e16a88948c7",
+        "docs/adr/0007-keep-the-core-factory-lifecycle-neutral.md": "a83dc0d6061ac0328a3ee6075aa872a55feb4f0154edf6dae964e74276bb15b5",
+        "docs/adr/0008-use-flat-prefix-matchable-key-tuples.md": "7fb791e73e0266afd8583e45059aebcc10bbd9704d625bdefcafec1481a46cf6",
+        "docs/adr/0009-build-an-eager-frozen-utility-tree.md": "bc3b08a3385f1dc8874d81f867f15ef6c30b203c94936fd991d2941fd5bacc27",
+        "docs/adr/0010-reuse-tanstack-query-core-as-a-peer.md": "633a1ce44c8d58b29096f540871b61566352462e1d4bd5335162b3e08652527d",
+        "docs/adr/0012-normalize-undefined-query-success-to-null.md": "5d076f168223f67a205138d3e258f1f3aac9dfe5d607ffe8efd12a71322ef022",
+        "docs/adr/0014-require-query-stable-payload-construction.md": "2f4381fb3e7406304ff3b914db541419f799f8a71d1d527b37a9e971e9949e47",
+        "docs/adr/0015-centralize-the-toolchain-in-vite-plus.md": "d2001383bc0f92363289c04b6b8df26acb5b0f5dfc0163b2a838f2eee8057b75",
+        "docs/adr/0020-generate-accumulated-and-live-stream-queries.md": "5e4f5c92e08ffb769137e930908dded993f928a497b018f9c6e4fd4f12232727",
+        "docs/adr/0021-share-utility-construction-through-private-modules.md": "821720a3eee166d4b7d42b6f5c3906bb29dff339b4815e9ed1c516bc5af66fd4",
+        "docs/adr/0022-add-buffered-http-utilities-with-separate-key-roots.md": "f1fb5d91cd91a70b356bc98b84176920ec822315dbdeaf5e247921853598b62f",
+        "docs/adr/0023-expose-buffered-multipart-http-mutations.md": "b72f20cb513d2a7db94b2dbe27576352048ba22288ad6eac6e80d1a7c81cefb8",
+        "docs/adr/0024-project-http-streams-and-buffered-metadata.md": "2797a5a4a751c5e37c38aa454c14b99ce1615870ffa13cfcedb98cca8a0af633",
+        "docs/adr/0025-use-public-decoded-message-clients-for-server-local-rpc.md": "36df8e1227af22018d5a9063699986ceb8dcfd4c8bb5615aa62557f2ec36e111",
+        "docs/adr/0026-keep-rpc-transport-aggregation-in-the-application.md": "b73af29d8f73a36f61f110ad8778e045d37253fe42a8888883e78089b93e955e",
+        "examples/server/src/commands.ts": "58f415fe0ab9bb0127c96c11ef0540a29b97d231eebd3a487513f0820a46b3d5",
+        "examples/server/src/diagnostic-operations.ts": "ddf8a0f2367b91ca08d6aaaf58380a51b77a5c51a9a85412bd7e7080ff0453ee",
+        "examples/server/src/domain.ts": "c00fced49e54d7bfff9045479e91aabdbd7c0868cc89afe00bae5473b17d2f82",
+        "examples/server/src/http-handlers.ts": "601f37c428015e75e94cb282af356878aa49c887804cc29e2b4f0c1a47ca92f0",
+        "examples/server/src/index.ts": "9e121809a5493c649e61e76fefec52a8c79a394983368060a95dc7000dcedc9a",
+        "examples/server/src/main.ts": "de9520cc16e4bff9d02b8507ee70641936b1287959823429f7759c0f05fdc0a7",
+        "examples/server/src/rpc-handlers.ts": "c2c57eb9a2ca5e602fff9f798c4d5165e91216c5b7e64e0a71220c4ba9316f3d",
+        "examples/server/src/server-local-rpc.ts": "de2a05bba54042f1d2d5781023cb5d20eb63915dd2a52635e9debf83911b5421",
+        "examples/server/src/server.ts": "5c9bbd7131ba3c55bbd61255fa8da8a275fc97412e1c8cb54f063bde517991e9",
+        "examples/server/src/users.ts": "15c363e2162f8dab4da1bfcf6324abbb3dc8ca34a8d8e036eb4db2481fe6be5b",
+        "examples/server/src/web-handler.ts": "2de54d8d2264024887ca63c8c53b20e9f9260ca6605b791d1f91bcea8c8d1b07",
+        "examples/server/tests/fixtures/websocket-server.ts": "b59863766bb60e5fb4de040d7d97ae2e67bca2ec44810ddc577f4cf5cb03129f",
+        "examples/server/tests/http-api.test.ts": "6ad2951b74c45a73ea4980e5da65c7ed4f758ff43db34702f1224de934548bca",
+        "examples/server/tests/rpc-transport-overhead.test.ts": "8d3dd40cfbbd0ce64b74f44f205f7f83163ea08dfc264a6deb1902e96b74a7fb",
+        "examples/server/tests/rpc-websocket-consumer.test.ts": "16253ef720e8a85cb7c583bcf6f9883c5893423d6da952659731e5823fcf0a62",
+        "examples/server/tests/server.test.ts": "44530f1e8b9b67f4d4bd8486c7bd7790240128fb161c1244857eee15c87a068d",
+        "examples/server/tests/web-handler.test.ts": "94d1b28810d908dcec8ca8299e56bb520f93804e8761b4d5e9c828087efae646",
+        "examples/shared/error-description.ts": "374a804cd0daf1dcfdff8b7247194d278cc52fdf3bd0d9b5d2891124b439cf87",
+        "examples/shared/use-slow-query-cancellation.ts": "f6221dc3a725c2f3cb15f41167ab98f8f579f3a0c138cb66cdf3c368b93b996a",
+        "examples/tanstack-start/src/components/effect-error-details.tsx": "a84187a90ebe207f9b8427f43dda44c81f6564821510c8c848ceca0f7d6940af",
+        "examples/tanstack-start/src/lib/api-server.ts": "b678d6edab872786fb92db328f60095d604c8d2f5205c4d4a462c3405a782bad",
+        "examples/tanstack-start/src/lib/application.ts": "7417de76eaf8a1a1cbd8464af6508bc3244a0176941c742e829880670a54ee8a",
+        "examples/tanstack-start/src/lib/query-ssr.ts": "0754abae5faf2f7562e1d86d27df0e14820a5ba9830146690ff1dc9f5beb3ec9",
+        "examples/tanstack-start/src/lib/server-application.ts": "442278fc08c4beb9a69cf1ab7672f661385d9c49998db77ce2870d349ffdc8a1",
+        "examples/tanstack-start/src/lib/server-host.ts": "1682ee37ea7551ec52c9530d6a4b476b967fa0572f5ddc26351ad427ce854e37",
+        "examples/tanstack-start/src/lib/snapshot-preparation.ts": "4321b25d469a6955659e6c7949b22ed78368873af81dd11718f53e02d1a81a2b",
+        "examples/tanstack-start/src/router.tsx": "801aac19cff9a4e2a4acb0823a9ea5c28b4aea9245f7e26cb63548bb5234bd15",
+        "examples/tanstack-start/tests/application.test.ts": "0ce067b4179b050b9daac397128fcd00e8f6d63416e43766ca1e442041f06301",
+        "examples/tanstack-start/tests/async-hydration.test.ts": "1f983917d2a469b83b876e882ad6a2ece4d28d360338ed614232807a168a1620",
+        "examples/tanstack-start/tests/client-navigation.test.tsx": "62af6b9c4ad00e2bd772a0eb75d175e11329079bc787874b0d87e7f22030620e",
+        "examples/tanstack-start/tests/failure-dehydration.test.ts": "b9d135c54e8e70ff454903f8016e6560fabaa487095cb40cb8725ed73577f079",
+        "examples/tanstack-start/tests/server-local.test.ts": "2facfdbf572cf8ed1cf5f6104a503504ab0e979546aca3e28d9dbc853c64c6e5",
+        "examples/tanstack-start/tests/server-render.test.tsx": "77b82127f9e3ddea55b201f7b2080f930ef340269010502f1515f6691ecc4ab2",
+        "examples/vite-react/src/app.tsx": "691f77aee6fb9f2b1f6f9df40a3afcf78f4af2d043d7b379f38c75c647a5f91e",
+        "examples/vite-react/src/components/ui/effect-error-details.tsx": "26a1a4bdb5a6331dca09c3c7764b2ff55431aa18ad6768f82529f8563dc3801a",
+        "examples/vite-react/src/lib/application.ts": "01f8f4f611435708e68d358993971aa9cadb01a2167fdc350a284d7f1ceeb752",
+        "examples/vite-react/src/lib/owner-cache.ts": "3286d0df63d4036c16c572ffd5e113400b455a5ce9f55dfe7859e72b8ae218bb",
+        "examples/vite-react/src/lib/user-writes.ts": "55f2de2f7be68f477665af3f59c93f37994045023014274513404418e0d1b8e8",
+        "examples/vite-react/src/main.tsx": "cdee6ca4095b58e1750015db473bda8651702a8ab32c408fa77961873db0e6fe",
+        "examples/vite-react/tests/app.test.tsx": "ff86b42023eb40658dd6feccbfd1f236a75bf2831f40b02955ebc1306be6329c",
+        "examples/vite-react/tests/commands-ui.test.tsx": "70005a656b9356fce97924dff6d4be82d87893cf48a619c119ad4372843246f8",
+        "examples/vite-react/tests/commands.test.ts": "3e24222572c0f7a4b68cfc4069c545cbebf410cacd0063a328cead9ad5baab08",
+        "examples/vite-react/tests/minimal-setup.test.tsx": "632d9a99695206f7aaddd139b7a2cc5e0d8a79fd991b9a1ccae0118a45460e4f",
+        "examples/vite-react/tests/owner-boundary.test.tsx": "d4ce58a002aac2b8f752936a65495558f89bff145d5cf2556f5c0d9286f8d6b3",
+        "examples/vite-react/tests/owner-cache.test.ts": "8818e30fdd3071a2e5dc2d865161e0d9f40de1ff37813b0a396bb2e83dd08a1d",
+        "examples/vite-react/tests/owner-switch.test.ts": "c997c9758269586591cbf55de4651c64091abc9061b56edb024dcbf9dbaa9c1d",
+        "examples/vite-react/tests/slow-query-cancellation.test.tsx": "d8c054206d3613939b71e390cb37002e7d6385628ca15bc20c4984f100cca779",
+        "examples/vite-react/tests/stream-tracing.test.ts": "0f09b669dc00a66e7db0d947f31daa88862e89cda9877d37caaa72631c1b247c",
+        "examples/vite-react/tests/suspense-recovery.test.tsx": "884e694a2a3ecc0cdd12d3555c953c30c6c7778bc613a78752b2ca27c17c173d",
+        "examples/vite-react/tests/user-writes.test.ts": "3fe07c1fa8deab8c154d30481f7bc6ef77d3a8ed6c3d5e0d3cbfe75574061e33",
+        "package.json": "dc41aa3f5b1633ffb2e6f6a0b7efb4e0119d74b9bc8c0003b1a8ee5fad854782",
+        "pnpm-workspace.yaml": "1e73526ddc3448a43e8cfc77e98bad98d15d0617dc2e8caf98e6d5d43fa90641",
+        "scripts/decode-utf8.mts": "2e90c53e95c22b864a209a87c98084db6ec95e83f842007b21528d286d45c18c",
+        "scripts/measure-construction.mts": "10522cb10ab51fd44d8990896a2a73e8bf4d4cd2646441e958b6180cb1afd147",
+        "scripts/verify-docs-examples.mts": "9ba75dd2952a8ee92995904ce9891b6757b10637a298646b95f9af73d270caf8",
+        "scripts/verify-packed-consumer.mts": null,
+        "skills/effect-api-query/SKILL.md": "41c0a5768977c0e25254f559de4454df7d9dc5fb6075487d65a6a52602b0e7d4",
+        "skills/effect-api-query/references/cache-workflows.md": "61d3d363b410eac3f52273e642ec2924d29e887f365a7c21a965a52deeded0be",
+        "skills/effect-api-query/references/frameworks-and-hosts.md": "e84b9179ca0cba6694200f504923906d78b3b7a305315f5d1453dace854aefb5",
+        "skills/effect-api-query/references/http.md": "4dd64a0fcc036f3ee857ae96d0e0149c729e0ea95dfd79a82a62c76db4619999",
+        "skills/effect-api-query/references/hydration-and-ssr.md": "1a6ba66187a1c786c09eb08dbd1c0f0e7c04e21d3b4787eb534687a67c1a38f0",
+        "skills/effect-api-query/references/query-patterns.md": "2b9ff5a7f9857d00dee85842351bc7ff8d3e88a016e1c0056c2ddb513cf53a64",
+        "skills/effect-api-query/references/rpc.md": "2d2d30f309424f255e3162fd52dbdaf6d3883e40d9eb6f1840eb814424b0abf3",
+        "src/core/inference.ts": "b8345c0961c67ceb41ee18e017302a5ef5d6be91794b861e72bece21ee5e9c30",
+        "src/core/operation.ts": "7dabe4d21070d20534643e5051060c84a09db5a7aa39858e75846043f8a537ea",
+        "src/core/policy.ts": "bebe7a32bb958ba9a1817c6fec6792fd04541f5ae81cd70fa422106ac3cb4073",
+        "src/core/schema-key.ts": "1f7d087793291b9763e82a0188367a9446f92b35bc25d73165b7e4f603e5ce05",
+        "src/core/stream-snapshot.ts": "00bf4855cc745571ce440a9afcf7a52134450de9ced00007e4cd2cdab8e544d1",
+        "src/core/streamed-query.ts": "0c29dd2bbf85ae2b4bda6ee65250f32ee17a5362e7a94f7423a0e457398ae9c4",
+        "src/core/types.ts": "c0904ecc411bd78cb82749f3461f67e78d05239e9e0802daf99f9cca5bf95a63",
+        "src/core/utility-tree.ts": "2a3996f5d49d70838e377af85b01acae43e4e964ae69e2150fad5b43a1069821",
+        "src/core/view-prefix.ts": "35a558e324547cb5a799114b937550704984ceae12c03205df5957adf55d988a",
+        "src/http/create-utils.ts": "785dd9171fd9c6ab7619a9e3728f91a3e9d197c311a3a6c8a6dffc74904a4975",
+        "src/http/errors.ts": "95869413973faefd2958f4e48feada7d5700e3aa0c2545f56a7202c8b9609a46",
+        "src/http/operation.ts": "c7a393845b6ba9d5382c7b697230463be4c78ae99525f923cca6f741ffaf6f3d",
+        "src/http/request.ts": "9d31397ee4241319ae56260c65e7fb4973adcee974b55e43e2895e7524d39180",
+        "src/http/streamed-query.ts": "bdac94b5d016578c249a46f4e1825424d5cf72acc85361e2fd00fda92e15ac5c",
+        "src/http/types.ts": "a638fe517865a1d341c2c974d4774f60cb7c10c0907287c9ec8a7d6f296def48",
+        "src/index.ts": "2dfdc1e9a5994ca3a6d918704ecd57442f4e34831b0cba2da68d4e7cc07810c1",
+        "src/rpc/create-utils.ts": "c0db42f6d9962b6c2e291f2b3d060be16ba7fc93826fa00471db5d82503e27dc",
+        "src/rpc/errors.ts": "7048a786a55f2cd221788485ffa993277f47896110ffac742f74ee077382377e",
+        "src/rpc/operation.ts": "e46cb103c4a79506cecb34c9337640ec9ab917a488e9360c7535d3dad733ebf5",
+        "src/rpc/streamed-query.ts": "bf480b78f9d0e37d7e7b572395f1238e6539d0ba8386b22eb5f8b3c400d1dd0f",
+        "src/rpc/types.ts": "90f4df74680db534f98c72f3bdcb5ae60fb720c45114dfb61a089dd62c1dc1be",
+        "tests/cache-recipes.test.ts": "5d86c8f74e952aa6f614d9ba32b4f2680137d23b696d8c55cd07d0463e5b65b7",
+        "tests/create-http-api-query-utils.test.ts": "c1307dbe52820f44526ec676f0b24e5a0e4635690b548185ceb819050b0e4605",
+        "tests/create-rpc-query-utils-configuration.test.ts": "0e53c59e24291e0424e860b9030c439105a1468e4ba37bf24bef81dd846112e2",
+        "tests/create-rpc-query-utils-execution.test.ts": "05a0de82218666f39cc6ac2d120f2b2e96885e9cfc9323e5ccc658ad996da2c5",
+        "tests/create-rpc-query-utils-keys.test.ts": "c6b6918e08c10f097634179e65d0e8eb481ff6833561b04de8e6a093104fee31",
+        "tests/create-rpc-query-utils-request-options.test.ts": "bcd76859a2830e522bdeb212be70f2e14be3b815da75a5caf3e596fd5fbd13e7",
+        "tests/create-rpc-query-utils-server-local.test.ts": "45ee329a736bcb6b114727ef8874f3f34541ce6dc55d5e13ffc80be9c2af2ddd",
+        "tests/create-rpc-query-utils-stream-baseline.test.ts": "282b7f1e8014159972275599a5c9d60bc689e5c9dd619a4a879cef4afe0edfb0",
+        "tests/create-rpc-query-utils-stream-cache.test.ts": "b97fd6eb63c0e8c023f98a1420555288c3dd2f4ab500b0d3e0b1d3a5c41e1347",
+        "tests/create-rpc-query-utils-stream-hashing.test.ts": "025f15582fe2a667dc6383a406d5b42654ea7634acf3591803d9f379896a69bc",
+        "tests/create-rpc-query-utils-stream-publication.test.ts": "cc3a25d02015b1410a8d1406249a846bf711f7b829fa7fccce1da90e600530d3",
+        "tests/create-rpc-query-utils-streaming.test.ts": "f52f775426bb949910a976150f3650b1dfe7526bcb0bd41ed874f399ec8aef44",
+        "tests/create-rpc-query-utils.test.ts": "035816f190df16fe51539857479a0d8cb9c75b1eb6897110aa07ba6ada33c977",
+        "tests/fixtures/async.ts": "61c314b76032dc197a7568b0602740d06eee0462414516788c699f1a7263114a",
+        "tests/fixtures/docs-websocket-use.ts": "6e2aa0bb7b1a653ffc215bad7a39b9a79aa1a9b3707bb32b1e80f4636faac544",
+        "tests/fixtures/effect-rpc.ts": "8a92d7b5e815012f830b7e87a8492b2680d8a1b8fa866c3db25274458d432745",
+        "tests/fixtures/http-client.ts": "184cef6b4864d32f1225149161e12d4286517a34c74eb0ba0a2437ff5f333891",
+        "tests/fixtures/optimistic-users.ts": "163e6880b076673c7a6c643e95737869cc5415446ba5042b10d3371afd401305",
+        "tests/fixtures/query-cache.ts": "ee6509aac5d0cf4f781652da10c2b1c3501a222ddd9a6b05f447e6a226548071",
+        "tests/fixtures/rpc-transport-queries.ts": "46be1d1e6048d57d83e9ae64b00c8c0c11deec6a67d0d4b115cdc9aac7447158",
+        "tests/fixtures/socket-client.ts": "d2d0a4a31011e2cfeec0e7e7ca996ad752a3a51db5675ac5efce54d284c8db89",
+        "tests/fixtures/user-events.ts": "13d8167b811bec6319de96f7cb50410f586c18cc92677d7fd17488b16d15b329",
+        "tests/fixtures/websocket-checks.ts": "7b8035264ece4e501e829b3e2b755f9d7b17c010ffa1036db6338a368ff6f93c",
+        "tests/http-cached-views.test.ts": "ff5fc7de21d00058fe067bf0655e9e6509bc3d04f26730a89c26c84fd3b477e9",
+        "tests/http-execution.test.ts": "241beae3806d2041c7c8cdd0ae5d4bf5277163e8e4690c1cbe589318db6a7776",
+        "tests/http-hydration.test.ts": "cead9c149e9aecbba7121b4e6bcfa3450368d24e6320ba1b8825545db747b98d",
+        "tests/http-live-query.test.ts": "79df219cb204669520c584123f167479ea3fa514d899897bf2810a04e8e1ca65",
+        "tests/http-multipart.test.ts": "cfda4574a8b10bfcf1b38c060f37d6791d83d94a01640edc8f85c468e45cb3c4",
+        "tests/http-query-options.test.ts": "e6abd4020fb4fd11877802c42d07ffb6f66822120d409c885150e97177769386",
+        "tests/http-semantic-keys.test.ts": "df50b9a0cf6981594100c93ca4283eb8ca11e7aca4db8719b4d7bd9a4333cd16",
+        "tests/http-transport-cancellation.test.ts": "e56f8571f949adc9d44f14b61e20edddb188a9565bf7a585859ffe73a851ac39",
+        "tests/query-policy.test.ts": "6ae9b22f6b171414387a5a9639ca3716ce2d065f3530122c320cebf1bc25066e",
+        "tests/query-view-prefix.test.ts": "162de0fa5f68b1f778f8c0c7201a15dcdd78dce4f107fcd64c1e1a50c733e6fe",
+        "tests/stream-snapshot.test.ts": "86449ef5d0f1baf165a5c973fcd0a190b9fce8ae5b6e8732a4454ab0c9f6c132",
+        "tests/types/docs-functionality.ts": "d638721f8a5f291e30b97229933bbb48dc5a92f677897e330bd1959b35deb8ae",
+        "tests/types/docs-http-quick-start.ts": "5f7eef98be244ea392fc2c5b527858f159a08efebf6f2665725301aa8a910050",
+        "tests/types/docs-hydration-async.ts": "de67135bf3da0dffdac47e9f2e49469edddac3d7d026fbd93d39aea6964c0dd8",
+        "tests/types/docs-hydration-dto.ts": "ebcd5c3895e8fa40bff3b62e8e13213e98a3e1c4796d89979b23ecc64cdc13ff",
+        "tests/types/docs-hydration-rich.ts": "56b35d7bb4a0f0ebc777161beb2e73a19dfc7de4db26fc74e3abab5d164f1402",
+        "tests/types/docs-hydration-views.ts": "08d75fe114e4a682fc0ad62b847898dba270672e0ce6d19a4f4d66cf92f75365",
+        "tests/types/docs-policies.ts": "b52d09f03131797873d73ac73d48639010136673b9ac98b866762099899e79a4",
+        "tests/types/docs-react-entry.ts": "cfe186d60a53553103ef292261b48b09b5094d927b1f198f2d3c8bd6f08325d1",
+        "tests/types/docs-react-setup.tsx": "bf0bfb164818366487ce2742699589c62fee4ec5bcb9e906f7d8c423251ecf65",
+        "tests/types/docs-readme-http.ts": "f15c8d87a1522328bbec1bc81d6e7573d406a88134f37e2dfab4c2e4dfe877d5",
+        "tests/types/docs-readme-rpc.ts": "e41aaf93b7fd61f619a2a3fb1132ffe5c027dfe17040b5ba061fa3591f31c69d",
+        "tests/types/docs-retry.ts": "78c782810b772e152ea0c47074fb2546fed5d397b93b147862644859fd20cc25",
+        "tests/types/docs-rpc-quick-start.ts": "95deee30de122cbaa7b9cb28257c234aa1162a0b549a87cf50a80bd84e871081",
+        "tests/types/docs-stream-snapshot.ts": "bc924cff90a9f9a8e416bf7fbdfedbd607c88e7a678435aaf20ef878862e06ff",
+        "tests/types/docs-stream-tracing.ts": "c839cd8a8d0875ddbe30e6234a0649c82d79f481084e718e5c341f7b4c427198",
+        "tests/types/docs-suspense.tsx": "2adc801083df580498a6cfa78fd6b970eae087c6e2af8601fcae111a53d13f4c",
+        "tests/types/docs-user-events.ts": "87647140d5434b95cc5389b1fea9919f20df7b6fcee4f00565836a4eae549a70",
+        "tests/types/example-owner-contract.ts": "fb10bd087ee582a64806d110404c366cb74e520b0b8cc11701348036b08b9622",
+        "tests/types/helper-contract.ts": "93f5d4276dca08c4848ffe7fccff893081767c4f51e11ec27588caade4999a53",
+        "tests/types/http-contract.ts": "9b6134849353f790a91cfebe955d660a65dc1927ffc00adf471afb7ae84b064d",
+        "tests/types/http-stream-contract.ts": "24031e37ac8cada4b8e9d3b2f4ce6e08448780571d94c8002bd8b267caa320bd",
+        "tests/types/http-type-scale.ts": "b456543b88316a2dd899f929efbffcf514e54e213e109b5f7d52eb785d2255aa",
+        "tests/types/http-view-proof.ts": "f42a1ebf36eeab7a906b722f5d2c2af0aabe8d30ef378fc50386c16d464fb64e",
+        "tests/types/public-contract.ts": "0726d33528f8f08bb907d9cd9c18f2d73d4e5b900c35080a8f176fe9f32b944b",
+        "tests/types/server-local-client-contract.ts": "443a60788ce7d91a77459c99f07d3fc9bf70d5a64a83c05ece5c40cfac63d298",
+        "tests/types/snapshot-contract.ts": "9e6a2edaddb7545f20d351511ed99be2828d4ca56779503bcc443963d8b73716",
+        "tests/types/tanstack-start-contract.ts": "51681e3d0d7504a614d490f18adb6f44db82d34b9d4d7cb9cf941aea33de284f",
+        "tests/types/type-scale.ts": "a9b307c25c72f3c184eabc8e22ddaeea96feb331c0f8d748773d765d358dbfca"
+      },
+      "head": "3e3fd371f097ad7a7f430b73f09c69ef711acff4",
+      "outcome": "no-change",
+      "reason": "All three planning records remain accurate: domain_map.yaml retains the existing contract-query tasks, ownership boundaries and failure modes; skill_spec.md retains the same supported guidance and documented validation approach; skill_tree.yaml already maps README.md, scripts/*.mts and tests/**/*.ts. The README rewrite and its two compiler fixtures add no domain task, skill identity, recommendation or source boundary. Preserve the accurate records without a no-op history entry.",
+      "evidence": [
+        "Reviewed actual diff at HEAD 3e3fd371f097ad7a7f430b73f09c69ef711acff4: README.md, scripts/verify-docs-examples.mts, tests/types/docs-readme-rpc.ts and tests/types/docs-readme-http.ts. No library source, manifest, dependency, export or workflow change remains.",
+        "README now follows the approved purpose/install/RPC/HTTP/capabilities/links outline and uses published-package wording. Concrete service-free contracts accept typed ready clients; client acquisition/lifetime and required execution services remain application-owned. Checked ordinary HttpApiClient.make captures HttpClient during acquisition and returns default service-free Client<Groups>, consistent with the HTTP snippet.",
+        "vp run --no-cache pack passed ESM/declaration generation, strict publint and Are the Types Wrong. Inspected the local npm archive: effect peer resolves to exactly 4.0.0, Query Core range remains >=5.103.1 <6, root exports point to dist, and all seven shipped skill/reference files are included.",
+        "vp run --no-cache --ignore-depends-on api-types passed every public fixture, including both exact README examples, under TypeScript 7.0.2 and 5.9.3. The pre-existing docs-hydration-views TaggedStruct suggestion is non-failing.",
+        "vp run --no-cache docs-check passed exact snippets and Astro (0 errors/warnings/hints). After final fixture formatting, node scripts/verify-docs-examples.mts passed again. Type-aware lint/typecheck passed all 150 checked files with no errors or warnings; final vp run format passed 304 files and git diff --check passed.",
+        "Exact pushed HEAD 3e3fd371 passed all six CI jobs in run 38161476267: source quality, example builds, documentation, Chromium, Firefox and WebKit. Current uncommitted README/fixture/verifier changes received the separate local checks above; runtime tests were not repeated for this documentation-only change.",
+        "Read the owned skill and affected RPC, HTTP and framework references plus all three planning records. Intent sync reported Nothing to synchronize. No new API recommendation, activation rule, domain task, failure mode or source boundary; fresh consumer/discovery testing was not repeated because shipped guidance is unchanged."
+      ]
+    },
+    "source:vite.config.ts": {
+      "fingerprint": "d885254315a5839e36915d10374a35265c0f825afe512387bf51a6bb002e42f4",
+      "snapshot": {
+        "vite.config.ts": "190a7356392a101b3a02ff18f894ad414389c73a9b5bdfea566b4b88094ff9e2"
+      },
+      "head": "8f4723c40f217b9ba82e8247d9147c143782538c",
+      "outcome": "no-change",
+      "reason": "Extend the existing structural conditional-type lint treatment to the new inference/policy modules and make all Fallow analyses bypass their stale cache. Repository tooling configuration does not introduce a library-consumer workflow.",
+      "evidence": [
+        "Type-aware lint passed with no warnings/errors. Both fresh Fallow dead-code modes passed; semantic near-duplicate and health reporting remain enabled."
+      ]
+    },
+    "source:.github/workflows/release.yml": {
+      "fingerprint": "020cfeccbebeae32db3a779d8983c0151eb4d8b91405ae20716a365effb40382",
+      "snapshot": {
+        ".github/workflows/release.yml": "17d01b72d314722784ea0d032426ca55b1860629234adfcc0f1c72c279b95b2b"
+      },
+      "head": "f3ba2a62cdb0b28eaa6e592b010bb6879466cda2",
+      "outcome": "no-change",
+      "reason": "Every main push and manual run invokes shared validation once. Pending changesets still create a version PR on main; publication still requires publish mode, a main push, completed validation and native Changesets packing. These are release orchestration changes.",
+      "evidence": [
+        "Diff reviewed against f3ba2a62cdb0b28eaa6e592b010bb6879466cda2; actual PR base 5b91ddb1de13970365669c887b9d767ea417fbd4. Public library source, compiler fixtures, runtime cases, README, documentation pages and skills were not changed in this batch.",
+        "Native uncached typecheck passed 141 files and native pack attw/publint. Scoped native format passed seven affected configuration files; final YAML parsed and browser/trigger/publication prerequisite expressions were inspected.",
+        "Four existing application Chromium acceptance cases and all seven existing documentation Chromium cases passed against prepared outputs. Their preview logs contain no pack or build invocation. Hosted docs Playwright list mode listed seven cases without building a local site. Receipts: /tmp/effect-api-query-ci-audit/.",
+        "All three shared planning documents were read: _artifacts/domain_map.yaml retains the same ten consumer tasks/failure modes, _artifacts/skill_spec.md retains accurate source-backed coverage and boundaries, and _artifacts/skill_tree.yaml retains the same owned skill, six references, source mappings, prerequisites and distribution. CI-only orchestration requires no guidance or planning rewrite.",
+        "The first hosted run of artifact reuse and the reusable release/deployment workflows remains unverified locally. No package publication or Pages deployment was performed."
+      ]
+    },
+    "source:e2e/browser-test-config.ts": {
+      "fingerprint": "7f044710dcd47c87c51384327d1e78696cd6286d91a3d102a8345096303f507b",
+      "snapshot": {
+        "e2e/browser-test-config.ts": "d2678060fc23a55740e276b850a918f5f2847e0b4208135ff9fcacea5f8b7186"
+      },
+      "head": "4ea1e4329da229c4c9853ddc2f6a50a6309afe9e",
+      "outcome": "no-change",
+      "reason": "Config reads preserve missing versus empty CI values and the existing browser project, retry and reporter behavior. This repository-only configuration adds no library capability or developer guidance task.",
+      "evidence": [
+        "Base 4ea1e4329da229c4c9853ddc2f6a50a6309afe9e; actual changed sources and native review fingerprints in this report.",
+        "Uncached typecheck: 135 files, zero lint/type errors; strict Effect diagnostics:146 files, zero diagnostics; runtime:262 tests/34 files and both server compilers.",
+        "Fresh packed-package matrix:26 compiler validations,21 runtime fixtures per peer,4 frameworks,12 diagnostic cells,18 construction cases and6 bundles. Selected archive SHA512 437c863fbae5d097d5947330524c004f1bf10e33cb1334fc245818be36ccd1d969458c7ba1a0eb135326f4f7c4030cb22518bc8aa08d8b03e8d543353f9b2876.",
+        "Chromium/Firefox packed Window/Worker:4 tests pass; native app/docs production builds and docs parity pass.",
+        "Finite command probes:11 real-host cases pass, every owned child exits and temp directory is removed; six actual bundle gzip outputs match complete prior native level9 bytes and exclude platform-node.",
+        "Fallow, formatting and native skills validation pass. Native sync reports nothing to synchronize; guidance and all three planning documents remain byte-identical to the reviewed base. Root owns final managed all-engine and Release provenance acceptance."
+      ]
+    },
+    "source:e2e/packed-hosts.spec.ts": {
+      "fingerprint": "9e9ba0561b6bff5e039ac0ec9e15bb8d5f72faa9018ed33ed778f56ddc062a56",
+      "snapshot": {
+        "e2e/packed-hosts.spec.ts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: e2e/packed-hosts.spec.ts."
+      ]
+    },
+    "source:playwright.docs.config.ts": {
+      "fingerprint": "f66c846d0924902b33bbc055ad0972bff368f4d48059f552f48a5096ae3be496",
+      "snapshot": {
+        "playwright.docs.config.ts": "3578d202bd05154db9e17f412fad7e2a7bfd707e1ea997fa0017cf5693498181"
+      },
+      "head": "f3ba2a62cdb0b28eaa6e592b010bb6879466cda2",
+      "outcome": "no-change",
+      "reason": "The local documentation preview serves its prepared site. The native docs-e2e task owns the local build, and hosted DOCS_BASE_URL checks still omit a local server and build. Existing documentation acceptance cases are unchanged.",
+      "evidence": [
+        "Diff reviewed against f3ba2a62cdb0b28eaa6e592b010bb6879466cda2; actual PR base 5b91ddb1de13970365669c887b9d767ea417fbd4. Public library source, compiler fixtures, runtime cases, README, documentation pages and skills were not changed in this batch.",
+        "Native uncached typecheck passed 141 files and native pack attw/publint. Scoped native format passed seven affected configuration files; final YAML parsed and browser/trigger/publication prerequisite expressions were inspected.",
+        "Four existing application Chromium acceptance cases and all seven existing documentation Chromium cases passed against prepared outputs. Their preview logs contain no pack or build invocation. Hosted docs Playwright list mode listed seven cases without building a local site. Receipts: /tmp/effect-api-query-ci-audit/.",
+        "All three shared planning documents were read: _artifacts/domain_map.yaml retains the same ten consumer tasks/failure modes, _artifacts/skill_spec.md retains accurate source-backed coverage and boundaries, and _artifacts/skill_tree.yaml retains the same owned skill, six references, source mappings, prerequisites and distribution. CI-only orchestration requires no guidance or planning rewrite.",
+        "The first hosted run of artifact reuse and the reusable release/deployment workflows remains unverified locally. No package publication or Pages deployment was performed."
+      ]
+    },
+    "source:tsconfig.json": {
+      "fingerprint": "4510191ccaa7f398708c42a16396f32bc93ebd0e26aa135cf5ea31c8f960dfd1",
+      "snapshot": {
+        "tsconfig.json": "ff3d1a4b82baaeddec55b77e8ab6add92256f4f1fef34d7968b5977d16608c12"
+      },
+      "head": "8f4723c40f217b9ba82e8247d9147c143782538c",
+      "outcome": "no-change",
+      "reason": "Root checking now includes TSX fixtures and adds the two new RPC-behavior tests to the existing narrow unstable-Effect-API allowlist. Library runtime/type semantics are documented in the owned skill; this checker configuration adds no consumer-facing API.",
+      "evidence": [
+        "Type-aware check passed; strict Effect diagnostics checked 177 files with 0 errors and 0 warnings."
+      ]
+    },
+    "source:.fallowrc.jsonc": {
+      "fingerprint": "c88901fb689b35dfb47eaedffd2c4e1477db5d6bdb4d4de7a3a0bb75d59333c4",
+      "snapshot": {
+        ".fallowrc.jsonc": "3ae2a2ff3c65e543550b35c15d620bc532f454e8d27ecaa8a88b007e7c46604e"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Correct the known source-only example ownership limitation with an exact React ignoreDependencies entry. Fallow attributes examples/shared to the root manifest, where React is a development dependency, while both private applications declare React at runtime and the root package files allowlist excludes examples. This does not make React a library runtime dependency, exclude shared code from analysis or suppress duplicate groups. No consumer guidance change follows.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:.github/workflows/ci.yml": {
+      "fingerprint": "cad5322457ab5941301e112617a26aee236fcae470a54f43881271389af5e9cf",
+      "snapshot": {
+        ".github/workflows/ci.yml": "91175ea9b646dbacc092ab0860a721331cdc4e312bc5f3b41fd3c6f8e0201f04"
+      },
+      "head": "f3ba2a62cdb0b28eaa6e592b010bb6879466cda2",
+      "outcome": "no-change",
+      "reason": "Source formatting, skills, typed lint, compiler fixtures, Effect diagnostics, Fallow and runtime checks remain. Successful example and documentation builds feed the same three browser projects through current-run artifacts. This changes CI scheduling and reuse, not library behavior or consumer tasks.",
+      "evidence": [
+        "Diff reviewed against f3ba2a62cdb0b28eaa6e592b010bb6879466cda2; actual PR base 5b91ddb1de13970365669c887b9d767ea417fbd4. Public library source, compiler fixtures, runtime cases, README, documentation pages and skills were not changed in this batch.",
+        "Native uncached typecheck passed 141 files and native pack attw/publint. Scoped native format passed seven affected configuration files; final YAML parsed and browser/trigger/publication prerequisite expressions were inspected.",
+        "Four existing application Chromium acceptance cases and all seven existing documentation Chromium cases passed against prepared outputs. Their preview logs contain no pack or build invocation. Hosted docs Playwright list mode listed seven cases without building a local site. Receipts: /tmp/effect-api-query-ci-audit/.",
+        "All three shared planning documents were read: _artifacts/domain_map.yaml retains the same ten consumer tasks/failure modes, _artifacts/skill_spec.md retains accurate source-backed coverage and boundaries, and _artifacts/skill_tree.yaml retains the same owned skill, six references, source mappings, prerequisites and distribution. CI-only orchestration requires no guidance or planning rewrite.",
+        "The first hosted run of artifact reuse and the reusable release/deployment workflows remains unverified locally. No package publication or Pages deployment was performed."
+      ]
+    },
+    "source:tests/packed-consumer/construction-baseline.mts": {
+      "fingerprint": "2db4e2c633021aa1fb6f3dbbb8b394c86022069f2f9655073cfc72e6f8a47c3e",
+      "snapshot": {
+        "tests/packed-consumer/construction-baseline.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/construction-baseline.mts."
+      ]
+    },
+    "source:tests/packed-consumer/defaults-runtime.mts": {
+      "fingerprint": "5ec112a9737bc4e08d284035605f377997cbf9629e448601e41b2c678f55f34b",
+      "snapshot": {
+        "tests/packed-consumer/defaults-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/defaults-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/events-runtime.mts": {
+      "fingerprint": "b4e841203f2c682e2c21756041e977df85a95ae4ee572fd50cdd1d7b905d1b2f",
+      "snapshot": {
+        "tests/packed-consumer/events-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/events-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/filter-runtime.mts": {
+      "fingerprint": "9da257cfe3f1b140fd6b7e986b0e6858a4482fcf9358481c808ec02ddc8fee9a",
+      "snapshot": {
+        "tests/packed-consumer/filter-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/filter-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/hashing-runtime.mts": {
+      "fingerprint": "a1facbc16a85798759d9b043d7430b85c737c453636250f2601fa3025a7777b2",
+      "snapshot": {
+        "tests/packed-consumer/hashing-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/hashing-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/hosts/index.html": {
+      "fingerprint": "c1e73f22bfc41d87b6da1dedf8fdfda3a1672a66bd3dcaed74f7304171ad0771",
+      "snapshot": {
+        "tests/packed-consumer/hosts/index.html": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/hosts/index.html."
+      ]
+    },
+    "source:tests/packed-consumer/http-etag-recipe.mts": {
+      "fingerprint": "6221d54620d4050f75a5eb0f740d8372c666aef38889e5cbe51f803f59352208",
+      "snapshot": {
+        "tests/packed-consumer/http-etag-recipe.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/http-etag-recipe.mts."
+      ]
+    },
+    "source:tests/packed-consumer/http-live-runtime.mts": {
+      "fingerprint": "d5bd5bc8ddeb7894dc01727f4a67df765c82abc3f1d9d011d8461188e6f1c7ef",
+      "snapshot": {
+        "tests/packed-consumer/http-live-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/http-live-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/http-metadata-runtime.mts": {
+      "fingerprint": "6bfcd0fe37114c6de756518a4c159ee72bc657bea8b5e11b183d5e1e2fa4bc61",
+      "snapshot": {
+        "tests/packed-consumer/http-metadata-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/http-metadata-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/http-runtime.mts": {
+      "fingerprint": "b47aa78c183c3d0fc93665760cc56b982a0e20271d3bd282c87f480fe37dfd2f",
+      "snapshot": {
+        "tests/packed-consumer/http-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/http-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/http-stream-runtime.mts": {
+      "fingerprint": "ef685c9517a31d78c728d40668620a77cd6a5f24885c35b3ed96a3d1583f581c",
+      "snapshot": {
+        "tests/packed-consumer/http-stream-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/http-stream-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/hydration-runtime.mts": {
+      "fingerprint": "5ab1a94b3756217c9a994b11cf3e3762649ae2859ed9bcbd1fe6ac35e889b303",
+      "snapshot": {
+        "tests/packed-consumer/hydration-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/hydration-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/hydration-views-runtime.mts": {
+      "fingerprint": "077263ad073837a5f9169898e7edcf32c2ea2dedfc8b7ae2d8322d31b93038a1",
+      "snapshot": {
+        "tests/packed-consumer/hydration-views-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/hydration-views-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/openapi-generate.mjs": {
+      "fingerprint": "7b87bbea6ce7e695fe4efd6728dac46268db7ae6df87cfc73f9311d321eea024",
+      "snapshot": {
+        "tests/packed-consumer/openapi-generate.mjs": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/openapi-generate.mjs."
+      ]
+    },
+    "source:tests/packed-consumer/openapi-runtime.mts": {
+      "fingerprint": "5ba484af38a27be547136319447d880647f407e16369ab572508e311e3cb0f4f",
+      "snapshot": {
+        "tests/packed-consumer/openapi-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/openapi-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/optimistic-runtime.mts": {
+      "fingerprint": "c88cb433ff279a599f068dfe5e9f8c619b18725bb1f8242f736b2ff85ee0c2cb",
+      "snapshot": {
+        "tests/packed-consumer/optimistic-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/optimistic-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/owner-cache-runtime.mts": {
+      "fingerprint": "6d7531302af18cd77d98144494cfba587a9df2f235b6cc8b7abfbba35bf2f954",
+      "snapshot": {
+        "tests/packed-consumer/owner-cache-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/owner-cache-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/retry-runtime.mts": {
+      "fingerprint": "d5cf2283a0e6d6bce385b062c75c6381096b3b7581f206255a406473076dc87a",
+      "snapshot": {
+        "tests/packed-consumer/retry-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/retry-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/runtime.mts": {
+      "fingerprint": "052904fd6d20ba06c524d632b3034e375ad01fa986e11d40b2eaa9768063788b",
+      "snapshot": {
+        "tests/packed-consumer/runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/snapshot-runtime.mts": {
+      "fingerprint": "8259933d616d9d06402538b9103d65cd7a5b3885368ad3e938270fccb0240ab9",
+      "snapshot": {
+        "tests/packed-consumer/snapshot-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/snapshot-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/start-ssr-runtime.mts": {
+      "fingerprint": "112e744ec9746a23719715bbbeb14c7defa2a0bda1cd658d2f15e059ba84b365",
+      "snapshot": {
+        "tests/packed-consumer/start-ssr-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/start-ssr-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/stream-cause-runtime.mts": {
+      "fingerprint": "771bc77ee9ebaddfcbf0faab92e6081090c2d500638efe7b261b52bcd72b5e4c",
+      "snapshot": {
+        "tests/packed-consumer/stream-cause-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/stream-cause-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/stream-policy-runtime.mts": {
+      "fingerprint": "f427fd75c4d9ea5ce8b2bf079639a480d5c3f075d84295afe70ea57d7fdfba40",
+      "snapshot": {
+        "tests/packed-consumer/stream-policy-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/stream-policy-runtime.mts."
+      ]
+    },
+    "source:tests/packed-consumer/svelte-consumer.svelte": {
+      "fingerprint": "7318224e4fb8906d47fdad76f628ae164bd4f971d95044fb39e7ca64de2ffedc",
+      "snapshot": {
+        "tests/packed-consumer/svelte-consumer.svelte": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/svelte-consumer.svelte."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.contract-baseline.json": {
+      "fingerprint": "7220c01ba1fb0f402db20171b85a28cc7f7b42772fd77103cef737e651268e48",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.contract-baseline.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.contract-baseline.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.http-baseline.json": {
+      "fingerprint": "2b8d1e5386292abd98a887d9d9301473b459f07afa432f7b205f72dc4468a950",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.http-baseline.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.http-baseline.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.json": {
+      "fingerprint": "b2dc5cd5cfe3037f52b6ea99dafb1e44fc9883618d8185c21f2c4e615d26e774",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.openapi.json": {
+      "fingerprint": "8f8116d97024d0a2e05767869a9e233ab1e221d84aff665370f3c06aea3c0048",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.openapi.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.openapi.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.rpc-baseline.json": {
+      "fingerprint": "cdbbc17ee54aa1ab6ae0ef187a00bd76e81bc26cc75aefcebd4d4d9585d49376",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.rpc-baseline.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.rpc-baseline.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.svelte-angular.json": {
+      "fingerprint": "21e4f12b9c6e725ca94bffc649c26f5b8a125e343efc9c67ec54ac5b0eb026c3",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.svelte-angular.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.svelte-angular.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.tanstack-start.json": {
+      "fingerprint": "99299e38f61454d0bf1f46cdbd4b1803bad701672db87f21daf4dadaf0a50e2a",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.tanstack-start.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.tanstack-start.json."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.vue-solid.json": {
+      "fingerprint": "e41810781fe3686f468994808ecc088eefde747465d8536a86d51cd460faacd5",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.vue-solid.json": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/tsconfig.vue-solid.json."
+      ]
+    },
+    "source:tests/packed-consumer/websocket-runtime.mts": {
+      "fingerprint": "772eebcc6b477be6542761906cfbda3a7a6d5784feb37b0bc87fa3dc2e78ef02",
+      "snapshot": {
+        "tests/packed-consumer/websocket-runtime.mts": null
+      },
+      "head": "1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d",
+      "outcome": "no-change",
+      "reason": "This retired installed-consumer runtime, isolated compiler configuration or dedicated packed-host control was deleted under the revised scope. Only uncovered cache/stream/metadata/snapshot and recipe behavior remains in ordinary public-factory/source tests or explicit public compiler fixtures; existing application coverage remains. This maintenance removal does not require an independent skill, and certification claims were removed from the existing guidance.",
+      "evidence": [
+        "Base 1e235b1b5f4e4f6d6d34ce397ad0b573e6c5392d; vp run --no-cache quality passed: 38 files, 283 runtime tests, strict public and server-local fixtures on TS 7.0.2 and TS 5.9.3, native pack/attw/publint, Effect diagnostics and Fallow audits. Both example builds and docs-build passed (44 pages; docs parity and Astro diagnostics). Existing docs-e2e passed 14 Chromium/Firefox tests. Native skills-check validated the owned skill. Native source construction-baseline passed. Logs are under /tmp/effect-api-query-implementation/notes/131-*. No fresh independent consumer session ran for this reference/source-mapping update; retired installation/certification matrices were not repeated. The optional generic skill-creator validator rejected the existing Intent sources frontmatter field; native Intent validation passed and its required schema is preserved. Reviewed item: tests/packed-consumer/websocket-runtime.mts."
+      ]
+    },
+    "source:tests/types/tsconfig.json": {
+      "fingerprint": "55296b76472fc89b595c0e128351e9d78442d16f2ecd2afc05a11e3ae571ee2c",
+      "snapshot": {
+        "tests/types/tsconfig.json": "51166cc8bcc26b942f97c738c0104a4bf866880807763218f2409242c4de4df5"
+      },
+      "head": "8f4723c40f217b9ba82e8247d9147c143782538c",
+      "outcome": "no-change",
+      "reason": "Include TSX documentation fixtures in the existing published-type test seam. This preserves the compiler contract and adds validation for application React setup/recovery; the recommendation lives in the existing framework reference.",
+      "evidence": [
+        "Both published compiler suites passed including docs-react-setup.tsx, docs-suspense.tsx and docs-react-entry.ts."
+      ]
+    },
+    "source:apps/docs/astro.config.mjs": {
+      "fingerprint": "b235762ea71837b6baccbfcaa7064ba8bdf99fc1f45eb6ca6e70b31d209f970e",
+      "snapshot": {
+        "apps/docs/astro.config.mjs": null
+      },
+      "head": "2e4ecf18e93a4ee086d74102c3addb5e2029be56",
+      "outcome": "no-change",
+      "reason": "The authored JavaScript config is removed in favor of astro.config.mts, with the same imports, JSON import attribute, and complete Astro/Starlight configuration. Only the redundant JavaScript ts-check directive disappears. Removing the old path lets installed Astro discover the .mts file; no runtime setting, public API, recipe or support claim changes, so shipped guidance and planning remain accurate.",
+      "evidence": [
+        "Author base 2e4ecf18e93a4ee086d74102c3addb5e2029be56. Rename apps/docs/astro.config.mjs to astro.config.mts, remove ts-check directive, and update only .fallowrc.jsonc ignoreExports path. Installed loader evidence: apps/docs/node_modules/astro/dist/core/config/config.js configPaths contains astro.config.mts.",
+        "vp run format apps/docs/astro.config.mts .fallowrc.jsonc passed. vp run fallow passed entry/production dead-code checks, duplicates task, and health threshold. vp run docs-build passed Astro check with zero errors/warnings/hints and build of 44 pages with valid internal links; unchanged documentation example parity was a native cache hit. Logs: /tmp/effect-api-query-implementation/notes/astro-mts-*.log.",
+        "Read _artifacts/domain_map.yaml, skill_spec.md, and skill_tree.yaml: existing library task/seam/ownership coverage and source globs remain accurate; no library behavior, guidance, dependency or installation change. Native sync changed nothing; review reports no owned skill/planning drift. No new independent consumer or browser execution is needed for this repository config rename."
+      ]
+    },
+    "source:apps/docs/astro.config.mts": {
+      "fingerprint": "e1ae593a08076f6fb1f8983a51a3b0c86481cbaae724a46b4389f4352aaae46c",
+      "snapshot": {
+        "apps/docs/astro.config.mts": "9f435fd3765c6119a92beee7b6cb504eb6594afc8c1b4af018cf8254eb936ffc"
+      },
+      "head": "8f4723c40f217b9ba82e8247d9147c143782538c",
+      "outcome": "updated",
+      "reason": "Navigation now leads with HTTP API and RPC setup/contract/factory/builder choices, then shared Library, native Integrations, complete Examples and shared API Reference. Existing skill pointers were updated for folded React setup, cache consolidation, inference and command examples; no additional skill is needed.",
+      "evidence": [
+        "56-page Astro build and link validation passed; corrected the generated integrations landing slug to integrations.",
+        "All 7 Chromium docs tests passed, covering navigation, search, canonical repository links, icons, registry behavior and generated LLM docs. Collaborative preview confirmed both adapter choices and the RPC route. Firefox/WebKit browser tests could not launch because their executables are not installed."
+      ]
+    },
+    "source:docs/adr/0016-automate-releases-with-changesets.md": {
+      "fingerprint": "6ef98996d907f829fdbb01507863ffb03582e7a4ce75f2739bb5a29f2fac03bf",
+      "snapshot": {
+        "docs/adr/0016-automate-releases-with-changesets.md": "35b5cdc29855b561c502d4bc5de33bbbbdd757ff69be55f13808d24176d5c67e"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "The ADR distinguishes initial unpublished candidate preparation from post-publication Changesets and preserves main-only trusted publishing. This release decision changes neither public integrations nor the existing framework/host and runtime ownership guidance.",
+      "evidence": [
+        "Reviewed the complete ADR diff from 5b91ddb to 6893603.",
+        "Release run 38085762195 validated and packed the exact 6893603 candidate; publishing and deployment were skipped as intended.",
+        "Current batch: scoped vp run format, native vp run skills-check, and installed YAML parsing passed; vp exec intent maintainer sync reported nothing to synchronize."
+      ]
+    },
+    "source:docs/adr/0017-quarantine-new-dependency-releases-for-seven-days.md": {
+      "fingerprint": "4be5f1ac6db00f4e928006c3e6230947279e5df2ecc5203eb48d4c96a490607a",
+      "snapshot": {
+        "docs/adr/0017-quarantine-new-dependency-releases-for-seven-days.md": "683309834b8c9e15b801ff9a7e640a6facf47a26690765deaf7a5e0a540dcef6"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "The ADR makes missing publication times fail closed and applies the same strict age policy to isolated consumers and frozen installs. Existing consumer API guidance and qualified dependency versions remain accurate; no new integration task is introduced.",
+      "evidence": [
+        "Reviewed the complete ADR diff from 5b91ddb to 6893603; pnpm-workspace.yaml policy remains unchanged.",
+        "Native eligible Intent 0.5.3 upgrade and isolated Skills CLI 1.7.0 install succeeded under minimumReleaseAge:10080, Strict:true, IgnoreMissingTime:false, trustLockfile:false without exceptions.",
+        "Current batch: scoped vp run format, native vp run skills-check, and installed YAML parsing passed; vp exec intent maintainer sync reported nothing to synchronize."
+      ]
+    },
+    "source:e2e/tanstack-start.spec.ts": {
+      "fingerprint": "326d8bf63a3852af4e5b276be477e3af235569ab15d12ed975e65c1507baed43",
+      "snapshot": {
+        "e2e/tanstack-start.spec.ts": "ea1e5469e782796d5ab68b443b6d21bd460691d413ba15bb83fae5024fd1981e"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at e2e/tanstack-start.spec.ts against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:e2e/vite-react.spec.ts": {
+      "fingerprint": "cb02aba2d2d073025a375e34532f922c265466c21416ffa95a64a605afdb252e",
+      "snapshot": {
+        "e2e/vite-react.spec.ts": "e730e19cebf8ac11895bff4b466e9882f707666d1417ff6aaaef2df78aa30f64"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "The pagehide storage-failure case verifies one handled disposal rejection, resource cleanup, and no page error. Existing cache-owner guidance already tells lifecycle callbacks to handle rejected disposal while completing cleanup.",
+      "evidence": [
+        "Reviewed the complete test diff from 5b91ddb to 6893603 against the disposal policy in skills/effect-api-query/references/cache-workflows.md.",
+        "Source 6893603: CI 38085762210 passed source quality, both example builds, documentation, and Chromium/Firefox/WebKit acceptance; saved final-mts-ci.json and final-mts-ci.log."
+      ]
+    },
+    "source:examples/tanstack-start/src/routes/index.tsx": {
+      "fingerprint": "a04a3037d3d997eff9b0aa1ec7c5915f79c7d28dcfbea1588338553b3e41d733",
+      "snapshot": {
+        "examples/tanstack-start/src/routes/index.tsx": "3118b095cfdde95ce04dd63f92a5213007e052d2fa0886ca0966ec0e7d6afcca"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Count loaded users directly across pages without allocating a flattened array; query data, ownership and displayed counts are unchanged, and existing framework guidance remains accurate.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/src/routes/index.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/vite-react/src/components/sections/commands-section.tsx": {
+      "fingerprint": "59bb7e6fcf3553d5b5fc3b98b159aef67071397c70ad59892a746f826d74194d",
+      "snapshot": {
+        "examples/vite-react/src/components/sections/commands-section.tsx": "990c75cdfacc4391267e8b25948cddf12a0ae241a5444f02685c8f84a9f2aa39"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "updated",
+      "reason": "Command starts can retry after failed transport and reconcile accepted operations through status polling. The cancellation guide now covers this behavior and same-ID retries.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/vite-react/src/components/sections/commands-section.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/vite-react/src/components/sections/diagnostics-section.tsx": {
+      "fingerprint": "869448ce3494e402e1b55144b195d6d2c1c6b50fab1229e7e2080c3392a6e8c1",
+      "snapshot": {
+        "examples/vite-react/src/components/sections/diagnostics-section.tsx": "d1ee213fd9ddac0b8f6be014a73bc14451ff71275d2f3c630e559f38462e416b"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Update direct example imports to the shared cancellation module, preserving rendered diagnostics and HTTP routes. Both application runtime suites and builds pass. This wiring adds no new library-consumer workflow and leaves existing guidance accurate.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:examples/vite-react/src/components/sections/http-section.tsx": {
+      "fingerprint": "d7fab68b2be0d629142416ac457ca5e5c0927e93cf3fd1b9f8e07116dd582778",
+      "snapshot": {
+        "examples/vite-react/src/components/sections/http-section.tsx": "a705dee9fd6b87071c37e718d86183e7376690826f085a1e19814a9b1eb14563"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Update direct example imports to the shared cancellation module, preserving rendered diagnostics and HTTP routes. Both application runtime suites and builds pass. This wiring adds no new library-consumer workflow and leaves existing guidance accurate.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:examples/vite-react/src/components/sections/mutations-section.tsx": {
+      "fingerprint": "d8883900b79077c3da3a9567125caa509d1982a184fe0d5c1ccafb5b5514e4e1",
+      "snapshot": {
+        "examples/vite-react/src/components/sections/mutations-section.tsx": "c2bf278014950f0e4a8d66d0cf397811858fae00f8284cb1ed01168c766a7b6a"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "Seed/reset mutations enter the application tracker while existing application-owned invalidation remains in place. Existing guidance already requires every participating write and reconciliation to follow the owner lifecycle.",
+      "evidence": [
+        "Reviewed the complete component diff from 5b91ddb to 6893603 and skills/effect-api-query/references/cache-workflows.md.",
+        "Source 6893603: CI 38085762210 passed source quality, both example builds, documentation, and Chromium/Firefox/WebKit acceptance; saved final-mts-ci.json and final-mts-ci.log."
+      ]
+    },
+    "source:examples/vite-react/src/components/users/create-user-form.tsx": {
+      "fingerprint": "1768011de182927bc8d5a0341f65f7e323cfccf6f76152578bc25d877a54ded3",
+      "snapshot": {
+        "examples/vite-react/src/components/users/create-user-form.tsx": "1c89f7235da5c16d6a2f3c3dc0bf81d33234a8d65c1e2c687e54255b10017690"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "Creation delegates to the shared RPC write coordinator instead of invalidating from the form. Existing optimistic-write guidance already assigns entity reservation, commit, rollback, and final reconciliation to application-owned actions.",
+      "evidence": [
+        "Reviewed the complete component diff from 5b91ddb to 6893603 against skills/effect-api-query/references/cache-workflows.md.",
+        "Source 6893603: CI 38085762210 passed source quality, both example builds, documentation, and Chromium/Firefox/WebKit acceptance; saved final-mts-ci.json and final-mts-ci.log."
+      ]
+    },
+    "source:examples/vite-react/src/components/users/user-list.tsx": {
+      "fingerprint": "74b615716653bc7b6ce5ec65939f0e0749bf3a7c470c9635c42878bc7af3d789",
+      "snapshot": {
+        "examples/vite-react/src/components/users/user-list.tsx": "4bff61d9e094f94f720f1351d206bf3d2d31fb9a8c0d0f3cdec904db701c434a"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "Deletion delegates to the shared RPC write coordinator; pending temporary users display their state and cannot be deleted. Existing guidance already allocates temporary IDs per write and preserves neighboring optimistic entities, with no public API change.",
+      "evidence": [
+        "Reviewed the complete component diff from 5b91ddb to 6893603 against skills/effect-api-query/references/cache-workflows.md.",
+        "Source 6893603: CI 38085762210 passed source quality, both example builds, documentation, and Chromium/Firefox/WebKit acceptance; saved final-mts-ci.json and final-mts-ci.log."
+      ]
+    },
+    "source:examples/vite-react/src/hooks/use-slow-query-cancellation.ts": {
+      "fingerprint": "4379124e7714fde864a91ac03391a2ebb94f8aa1cea77fab0c2b170ea40cc24f",
+      "snapshot": {
+        "examples/vite-react/src/hooks/use-slow-query-cancellation.ts": null
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Delete duplicate application hooks in favor of the shared diagnostics-only module. The same start/cancel interface, independent operation IDs and server interruption checks remain; exact per-hook unmount cleanup and post-await owner guards now apply consistently to both applications. The existing shipped cleanup/owner guidance already recommends these rules, so no guidance edit or compatibility wrapper is needed.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:tests/fixtures/tsconfig.server-local.json": {
+      "fingerprint": "3531d0da011912efd6ff745f45fd9407badcf84d19257252d43c3d13679a32aa",
+      "snapshot": {
+        "tests/fixtures/tsconfig.server-local.json": "870aa1b0555c672cc89142854f6f4328dd718272abc78d1efa28a01d878e949f"
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "The added compiler configuration scopes the existing server-local RPC contract fixture under ordinary repository type checks. It changes validation placement without changing an exported type or introducing a consumer recipe.",
+      "evidence": [
+        "Reviewed the seven-line configuration and its server-local RPC/type-contract includes from 5b91ddb to 6893603.",
+        "Source-quality CI 38085762210 ran the native test prerequisite that checks this fixture with both configured TypeScript versions; saved final-mts-ci.log.",
+        "Current batch: scoped vp run format, native vp run skills-check, and installed YAML parsing passed; vp exec intent maintainer sync reported nothing to synchronize."
+      ]
+    },
+    "source:tests/packed-consumer/tsconfig.type-scale.json": {
+      "fingerprint": "ed8ba74d56e70784820e5369ead1b0aea87da056caffeb5e61daeb4c68c55b4d",
+      "snapshot": {
+        "tests/packed-consumer/tsconfig.type-scale.json": null
+      },
+      "head": "6893603eab70bd9d67e9848414eccc8a3421d870",
+      "outcome": "no-change",
+      "reason": "Removing the redundant packed-consumer compiler configuration leaves type-scale coverage in ordinary repository fixtures. Existing guidance already bounds measurements to their fixtures and makes no installed-consumer budget claim.",
+      "evidence": [
+        "Reviewed the deleted configuration from 5b91ddb to 6893603 and the retained tests/types fixtures plus _artifacts/skill_spec.md measurement boundary.",
+        "Source 6893603: CI 38085762210 passed source quality, both example builds, documentation, and Chromium/Firefox/WebKit acceptance; saved final-mts-ci.json and final-mts-ci.log.",
+        "Current batch: scoped vp run format, native vp run skills-check, and installed YAML parsing passed; vp exec intent maintainer sync reported nothing to synchronize."
+      ]
+    },
+    "source:examples/vite-react/src/components/ui/effect-error-details.tsx": {
+      "fingerprint": "82dda7c7b3d779819cd09ae80a8ac64320f96db657f3ec5a1fd41838dd7ca064",
+      "snapshot": {
+        "examples/vite-react/src/components/ui/effect-error-details.tsx": "da7e89579ebd7bc6d56d4dde19ea871673f6f441452d9ba6786e41956be66a1f"
+      },
+      "head": "bf38d8556744d8e45d459208cab6fe9d1b78b356",
+      "outcome": "no-change",
+      "reason": "A private class-name constant replaces two identical alert style strings; rendered error labels, Cause detail and alert semantics are unchanged. This presentation-only deduplication does not change any developer integration task or shipped guidance.",
+      "evidence": [
+        "Reviewed both render branches and their bf38d855 diff. Final uncached typecheck passes 140 files; scoped formatting passed. No application-wide UI sharing or dependency change."
+      ]
+    },
+    "source:apps/docs/public/package-version.js": {
+      "fingerprint": "22bfa3892fa1b85ae21f2c484fa190b10dd35556e9a47ed5b39eb8c6d3bcd551",
+      "snapshot": {
+        "apps/docs/public/package-version.js": "f88677a24f7a65061aa41cabde4f6727a9f4c52adfac5ac4fde2b478909c3dc0"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed fallback implementation commentary; a failed registry request still retains the build version. Chromium covers unpublished, failed and invalid responses, so existing user-facing guidance remains accurate.",
+      "evidence": [
+        "Reviewed the actual diff and current source at apps/docs/public/package-version.js against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md": {
+      "fingerprint": "c18a01558cba99c73dd6bbc8381e3243a4a2f324069d47f6217c11a424cd615e",
+      "snapshot": {
+        "docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md": "7617802c14fd07b0e147f8168381285b078eb752fbf9981848cbfe86e1f7792a"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed obsolete beta and editor-detail wording while preserving the native Vite+ workspace decision; no consumer instruction changes.",
+      "evidence": [
+        "Reviewed the actual diff and current source at docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:e2e-docs/docs.spec.ts": {
+      "fingerprint": "1bb9637253ced30e78b9e2530a30af302dded927e1cc35c2ec2680f745b889a8",
+      "snapshot": {
+        "e2e-docs/docs.spec.ts": "b07fcf2f43cd972a823ff6f8c564a595f57af84e057326b72262e4e169f677cb"
+      },
+      "head": "8f4723c40f217b9ba82e8247d9147c143782538c",
+      "outcome": "no-change",
+      "reason": "The repository browser test follows the revised HTTP API/RPC entry actions and navigates generated sidebar links, including policies, inference and React setup. Its old compiler-fixture prerequisite link assertion was removed because ready-client setup is now shown directly in the docs; this adds validation rather than a shipped developer task.",
+      "evidence": [
+        "All 7 Chromium docs tests passed against the Astro preview; both generated LLM documents resolve their internal links. Type-aware lint and formatting passed."
+      ]
+    },
+    "source:e2e/conditional-query.spec.ts": {
+      "fingerprint": "6f0ab418799c94ae6ba540a6e12ca8a3115a5335418ee92b73af61b68e64798c",
+      "snapshot": {
+        "e2e/conditional-query.spec.ts": "cbcf8bd4084cada24635c7839a5bdf83e59115ad1175134d5d65eb37f0dcffa4"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at e2e/conditional-query.spec.ts against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:e2e/example-application.ts": {
+      "fingerprint": "7aa0cef9f7e89bc6264535884d5e3d1bcd4bafdd701b3d78124768b1cd82f262",
+      "snapshot": {
+        "e2e/example-application.ts": "3ce3024b409c7c28e9e159fce2b724009dd846fbe6fba75ef3d7ab95dc507e99"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at e2e/example-application.ts against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/contracts/src/client.ts": {
+      "fingerprint": "edb8d760d8523f285a099edd65375f23a0bcab7321cddef564acd58d89f43241",
+      "snapshot": {
+        "examples/contracts/src/client.ts": "f645f690571d6f8d571ec8496607778c423fbc4b45848bf3cf725739e981953e"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/contracts/src/client.ts against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/contracts/src/contracts.ts": {
+      "fingerprint": "347cc797a64e13c1476d2f2aaa027a5a23f6ea56d9695b88750fe83b1c3c5ed9",
+      "snapshot": {
+        "examples/contracts/src/contracts.ts": "11ba2f683cfeaa16947864a12c3bccc96104dbe0f6139efcd81e6fc865482641"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "RPC pagination now enforces the same integer cursor and 1..100 page-size bounds as the HTTP example. Existing ready-client/query-pattern guidance remains sufficient; server-local regression tests cover rejection.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/contracts/src/contracts.ts against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/tanstack-start/src/components/action-button.tsx": {
+      "fingerprint": "d0b70e406fe9c1eadf6da4c873a867c67dd0704778b0025afe2570fe957053e6",
+      "snapshot": {
+        "examples/tanstack-start/src/components/action-button.tsx": "79c37de2669992148e645a70f1b783a1dd7d85ac8e5a9ec267843550eafd3926"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/src/components/action-button.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/tanstack-start/src/components/navigation-link.tsx": {
+      "fingerprint": "b54ce1620db2d94ed8d2f71f4900c2d8c17985ccca14093d9f419a353f67bd13",
+      "snapshot": {
+        "examples/tanstack-start/src/components/navigation-link.tsx": "a7d037126c9a648b3aa20ecb8af5f416982522f9da5703460b141bfb53124cf3"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/src/components/navigation-link.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/tanstack-start/src/components/router-status.tsx": {
+      "fingerprint": "0fd4520270cc3cdedb23abb639bf655c538744fc11ae2ca2771b4b81b6025a3a",
+      "snapshot": {
+        "examples/tanstack-start/src/components/router-status.tsx": "6e9b8fb3bcd3397aa1d447d12f000b264b214463327ac03319dd59d6f229e99d"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Loading queries labels both RPC and HTTP work accurately. This UI text change adds no developer task or skill requirement.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/src/components/router-status.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/tanstack-start/src/hooks/use-slow-query-cancellation.ts": {
+      "fingerprint": "3bbf99d591efe71685bdfc68588e0762578ad051fb61d3aca180de3a8b0ae67c",
+      "snapshot": {
+        "examples/tanstack-start/src/hooks/use-slow-query-cancellation.ts": null
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Delete duplicate application hooks in favor of the shared diagnostics-only module. The same start/cancel interface, independent operation IDs and server interruption checks remain; exact per-hook unmount cleanup and post-await owner guards now apply consistently to both applications. The existing shipped cleanup/owner guidance already recommends these rules, so no guidance edit or compatibility wrapper is needed.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:examples/tanstack-start/src/routes/failure.tsx": {
+      "fingerprint": "5df8fdee6f55e2b69313237e1cadae26ec40dd05eff106d23fc0ef2752679c6b",
+      "snapshot": {
+        "examples/tanstack-start/src/routes/failure.tsx": "690a26c3ef52a28f5c89617a385de23d920840b591ea3b22f060673dd0d262d6"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/src/routes/failure.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/tanstack-start/src/routes/http-failure.tsx": {
+      "fingerprint": "5947742b2cc9d79e14228e7429d5ecc9dd71963448c8fec0e4bd0978705767d9",
+      "snapshot": {
+        "examples/tanstack-start/src/routes/http-failure.tsx": "a7ade1d3bd9973903ab7e49461f82cdf413766e3ff1c194a50be21423b5e2de1"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/src/routes/http-failure.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/tanstack-start/src/routes/http.tsx": {
+      "fingerprint": "5bf6d229917158997ecae159648fa740b1183ca537bd7eaefa005ef7c806805e",
+      "snapshot": {
+        "examples/tanstack-start/src/routes/http.tsx": "af8b13103d7813a8143db021731e232fb8078170b573eb5fccbbe03c79e61480"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Update direct example imports to the shared cancellation module, preserving rendered diagnostics and HTTP routes. Both application runtime suites and builds pass. This wiring adds no new library-consumer workflow and leaves existing guidance accurate.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:examples/tanstack-start/src/styles.css": {
+      "fingerprint": "e175f79bb10f4c0e3e2625dd8785537b1f1ffe8f43318559c0519bc4f457290d",
+      "snapshot": {
+        "examples/tanstack-start/src/styles.css": "7bca484171da0b685a1af733ae15669004e5adbde4bc8073d07faea65da103ee"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Move identical example theme declarations to examples/shared/theme.css while retaining Tailwind imports at both original entries and the Vite-specific grid locally. Expanded CSS preserves the original rules exactly and both builds pass. This is private example presentation reuse, with no query-library guidance or public-interface change.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:examples/tanstack-start/vite.config.ts": {
+      "fingerprint": "c2f207176f82c378faf65195877ae337a8c4ed7b0d62ba4eb16356327e8766e8",
+      "snapshot": {
+        "examples/tanstack-start/vite.config.ts": "e33ed6de04e21fd8b43f95e2a29fdf5adae9007b24faf307ac85b5f51fbb4180"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/tanstack-start/vite.config.ts against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/vite-react/src/components/sections/queries-section.tsx": {
+      "fingerprint": "6a00123ad89af1b93a07f046f5e3a8d06c9232996dfe15038468201d5d556064",
+      "snapshot": {
+        "examples/vite-react/src/components/sections/queries-section.tsx": "2f6d771e217f415d570a4483e44a398b49f3a1fb0afae7f7a9caebc8c6a2d41d"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Count loaded users directly across pages without allocating a flattened array; query data, ownership and displayed counts are unchanged, and existing framework guidance remains accurate.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/vite-react/src/components/sections/queries-section.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/vite-react/src/components/ui/action-button.tsx": {
+      "fingerprint": "1b0278c83a2efe4939ff4f81fb4cf741e3e65a0b5316df77dd14d7872b5df4f8",
+      "snapshot": {
+        "examples/vite-react/src/components/ui/action-button.tsx": "bdacb6e84d72e4e454c5a0062355a53062db3ebeb56873eb8bd5f5b7b0766fbf"
+      },
+      "head": "54b6521f3e37f9cb3ca4cd3812ab3c960eb2168a",
+      "outcome": "no-change",
+      "reason": "Removed private narrative and assertion commentary while retaining functional tool directives and the existing runtime behavior. The affected example or test continues to use the documented query, ownership and cancellation workflow; no additional skill task is needed.",
+      "evidence": [
+        "Reviewed the actual diff and current source at examples/vite-react/src/components/ui/action-button.tsx against 54b6521 and the supplied PR base; relevant native task receipts are under /tmp/effect-api-query-audit-2026-10-11/.",
+        "Final uncached native tasks passed: typecheck (142 files), Effect diagnostics (162 files, zero errors/warnings), Fallow, test (41 files / 474 runtime cases), public API and server-local fixtures with TypeScript 7.0.2 and 5.9.3, native pack with attw/publint, both example builds, docs-check and 46-page docs-build with internal links. Chromium passed all 31 application and 7 documentation checks. Firefox/WebKit browser launches are unavailable locally because their installed binaries are missing; their HTTP-only documentation checks passed. Fresh installed-consumer activation/task evaluation was not performed; compiler and application evidence comes from this workspace."
+      ]
+    },
+    "source:examples/vite-react/src/styles/tailwind.css": {
+      "fingerprint": "ef9ab398e901958bc40a3dc2b73bd4f529b6066580714f8a61123aed96b2c9a3",
+      "snapshot": {
+        "examples/vite-react/src/styles/tailwind.css": "51c4b3e6464deaf25b330dc651ab0b6a6ba277bc660cc45f128e1461eeb8daaa"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Move identical example theme declarations to examples/shared/theme.css while retaining Tailwind imports at both original entries and the Vite-specific grid locally. Expanded CSS preserves the original rules exactly and both builds pass. This is private example presentation reuse, with no query-library guidance or public-interface change.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:.github/actions/setup-repository/action.yml": {
+      "fingerprint": "ed0796c080ab8de729e657ad263c3df80c8170cac6ade354db92d97d5f85a4b8",
+      "snapshot": {
+        ".github/actions/setup-repository/action.yml": "1e48c3997b540b68b47e4dc5ef7bdb0ab6c9b19adc307f5a0a1280bef08a1fae"
+      },
+      "head": "f3ba2a62cdb0b28eaa6e592b010bb6879466cda2",
+      "outcome": "no-change",
+      "reason": "The shared setup still provisions the pinned pnpm executable and runs one frozen workspace install. Every caller uses dependency caching, so the unused cache switch was removed. This changes repository provisioning only.",
+      "evidence": [
+        "Diff reviewed against f3ba2a62cdb0b28eaa6e592b010bb6879466cda2; actual PR base 5b91ddb1de13970365669c887b9d767ea417fbd4. Public library source, compiler fixtures, runtime cases, README, documentation pages and skills were not changed in this batch.",
+        "Native uncached typecheck passed 141 files and native pack attw/publint. Scoped native format passed seven affected configuration files; final YAML parsed and browser/trigger/publication prerequisite expressions were inspected.",
+        "Four existing application Chromium acceptance cases and all seven existing documentation Chromium cases passed against prepared outputs. Their preview logs contain no pack or build invocation. Hosted docs Playwright list mode listed seven cases without building a local site. Receipts: /tmp/effect-api-query-ci-audit/.",
+        "All three shared planning documents were read: _artifacts/domain_map.yaml retains the same ten consumer tasks/failure modes, _artifacts/skill_spec.md retains accurate source-backed coverage and boundaries, and _artifacts/skill_tree.yaml retains the same owned skill, six references, source mappings, prerequisites and distribution. CI-only orchestration requires no guidance or planning rewrite.",
+        "The first hosted run of artifact reuse and the reusable release/deployment workflows remains unverified locally. No package publication or Pages deployment was performed."
+      ]
+    },
+    "source:.github/workflows/deploy-docs.yml": {
+      "fingerprint": "b23c6bf5ef73b244b420516cd31b713672423d7d342472ca4e90e3570a3bec41",
+      "snapshot": {
+        ".github/workflows/deploy-docs.yml": "ab245e4f9057e32a15906f0202c4264842da05a1f44fa9c6969d59e70b97b31a"
+      },
+      "head": "f3ba2a62cdb0b28eaa6e592b010bb6879466cda2",
+      "outcome": "no-change",
+      "reason": "A release restores the same validated documentation site from its current workflow run. Standalone manual deployment retains checkout, native docs checks and build. The site contents and library guidance are unchanged.",
+      "evidence": [
+        "Diff reviewed against f3ba2a62cdb0b28eaa6e592b010bb6879466cda2; actual PR base 5b91ddb1de13970365669c887b9d767ea417fbd4. Public library source, compiler fixtures, runtime cases, README, documentation pages and skills were not changed in this batch.",
+        "Native uncached typecheck passed 141 files and native pack attw/publint. Scoped native format passed seven affected configuration files; final YAML parsed and browser/trigger/publication prerequisite expressions were inspected.",
+        "Four existing application Chromium acceptance cases and all seven existing documentation Chromium cases passed against prepared outputs. Their preview logs contain no pack or build invocation. Hosted docs Playwright list mode listed seven cases without building a local site. Receipts: /tmp/effect-api-query-ci-audit/.",
+        "All three shared planning documents were read: _artifacts/domain_map.yaml retains the same ten consumer tasks/failure modes, _artifacts/skill_spec.md retains accurate source-backed coverage and boundaries, and _artifacts/skill_tree.yaml retains the same owned skill, six references, source mappings, prerequisites and distribution. CI-only orchestration requires no guidance or planning rewrite.",
+        "The first hosted run of artifact reuse and the reusable release/deployment workflows remains unverified locally. No package publication or Pages deployment was performed."
+      ]
+    },
+    "source:playwright.config.ts": {
+      "fingerprint": "0acc85c38e3fdfd4e5887ca39bc139a54cdbee979d61aefd21b66d3780b5d1f9",
+      "snapshot": {
+        "playwright.config.ts": "fe31f0f28ff40bd607e7b39b71426dd91ad1c51121bd2bed018bd7b83675b614"
+      },
+      "head": "f3ba2a62cdb0b28eaa6e592b010bb6879466cda2",
+      "outcome": "no-change",
+      "reason": "Application previews serve prepared outputs. Native browser tasks own their build prerequisites; CI skips them only after successful current-run artifact restoration. Existing acceptance cases and tested application behavior are unchanged.",
+      "evidence": [
+        "Diff reviewed against f3ba2a62cdb0b28eaa6e592b010bb6879466cda2; actual PR base 5b91ddb1de13970365669c887b9d767ea417fbd4. Public library source, compiler fixtures, runtime cases, README, documentation pages and skills were not changed in this batch.",
+        "Native uncached typecheck passed 141 files and native pack attw/publint. Scoped native format passed seven affected configuration files; final YAML parsed and browser/trigger/publication prerequisite expressions were inspected.",
+        "Four existing application Chromium acceptance cases and all seven existing documentation Chromium cases passed against prepared outputs. Their preview logs contain no pack or build invocation. Hosted docs Playwright list mode listed seven cases without building a local site. Receipts: /tmp/effect-api-query-ci-audit/.",
+        "All three shared planning documents were read: _artifacts/domain_map.yaml retains the same ten consumer tasks/failure modes, _artifacts/skill_spec.md retains accurate source-backed coverage and boundaries, and _artifacts/skill_tree.yaml retains the same owned skill, six references, source mappings, prerequisites and distribution. CI-only orchestration requires no guidance or planning rewrite.",
+        "The first hosted run of artifact reuse and the reusable release/deployment workflows remains unverified locally. No package publication or Pages deployment was performed."
+      ]
+    },
+    "source:examples/shared/theme.css": {
+      "fingerprint": "8d029321671dc85cbf712e9165c283c5bd8a1b9835174d8c79023453c07681f0",
+      "snapshot": {
+        "examples/shared/theme.css": "b48a2896fe934311ef529e62ee4a90e7c59e9e6202f6ee2bb571fd0e2fbab8eb"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Move identical example theme declarations to examples/shared/theme.css while retaining Tailwind imports at both original entries and the Vite-specific grid locally. Expanded CSS preserves the original rules exactly and both builds pass. This is private example presentation reuse, with no query-library guidance or public-interface change.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    },
+    "source:examples/tanstack-start/src/routes/diagnostics.tsx": {
+      "fingerprint": "d7df381eb6eb247f0cfc9940181740b6fb1691dc94f4d93d2f6f1084aa4ecaf4",
+      "snapshot": {
+        "examples/tanstack-start/src/routes/diagnostics.tsx": "76e54e5f6834b75fd47f3f751414782daa5a9d5eb0472c0b466b8fb133418bc3"
+      },
+      "head": "d870776a5f37835467beb611c6ca6a51fe3933eb",
+      "outcome": "no-change",
+      "reason": "Update direct example imports to the shared cancellation module, preserving rendered diagnostics and HTTP routes. Both application runtime suites and builds pass. This wiring adds no new library-consumer workflow and leaves existing guidance accurate.",
+      "evidence": [
+        "Compared the task working tree with d870776a5f37835467beb611c6ca6a51fe3933eb; three independent architecture passes and an additional independent check of the final diff found no remaining actionable findings.",
+        "Full runtime suite passed: 506 tests in 46 files, including 5 new hook-lifetime cases for RPC/HTTP operation isolation, pending status cancellation and post-await retired-owner guards. Independent pass 2 additionally verified 191 snapshot/lifecycle/hash cases.",
+        "Direct vp pack passed declaration emission, attw and publint. Published-contract fixtures passed installed TypeScript 7.0.2 and 5.9.3. Full type-aware lint passed with no errors or warnings; strict Effect diagnostics passed with 0 errors and 0 warnings (one pre-existing suggestion).",
+        "Both example application builds passed. Expanded shared CSS has exactly the original rules for both apps, ignoring whitespace. Documentation snippet and Astro checks passed.",
+        "All four uncached Fallow analyses passed: both dead-code modes have no issues, semantic near-duplicate groups decreased from 67 to 61. Existing workspace-discovery advisory for the explicitly excluded source-only shared examples remains visible.",
+        "The native task supervisor sometimes fails with spawn EBUSY or sandbox process initialization errors; identical installed commands ran directly after completing their package prerequisites. No checks or source rules were bypassed to obtain these results.",
+        "No shipped guidance, activation description or public interface changed. Fresh consumer and discovery sessions were not repeated for this internal refactor; executable published-contract and rendered-application checks provide this batch evidence."
+      ]
+    }
+  }
+}
diff --git a/AGENTS.md b/AGENTS.md
index 9767767..b157251 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,5 +1,16 @@
 ## Agent skills
 
+### Shipped library skill
+
+When changing public behavior, usage documentation, or shipped guidance, run
+`vp exec intent meta generate-skill` and follow the installed maintenance procedure.
+Read the shared [planning record](_artifacts/skill_spec.md); maintain its domain map
+and skill tree alongside the affected guidance. Run `vp exec intent maintainer sync`,
+review actual source changes with `vp exec intent maintainer review --json`, and
+record justified outcomes for the owned skill, planning, and source items after
+task checks. Leave unrelated skills unresolved. Run `vp exec intent maintainer check`,
+report pending work, and finish with `vp run skills-check`.
+
 ### Issue tracker
 
 Before reading or updating GitHub issues, read [the issue tracker workflow](docs/agents/issue-tracker.md).
diff --git a/GLOSSARY.md b/GLOSSARY.md
index e2cdf9d..a273b0b 100644
--- a/GLOSSARY.md
+++ b/GLOSSARY.md
@@ -9,21 +9,25 @@ A nested object derived from literal Effect RPC tags. Branches represent RPC nam
 _Avoid_: Router, generated client
 
 **HTTP utility tree**:
-A nested object derived from an Effect HttpApi's literal group and endpoint identifiers. Supported buffered endpoints provide typed key and option builders, with multipart endpoints limited to mutations; endpoints in top-level groups appear at the root.
+A nested object derived from an Effect HttpApi's literal group and endpoint identifiers. Supported buffered and SSE endpoints provide typed key and option builders, with multipart endpoints limited to buffered mutations; endpoints in top-level groups appear at the root.
 _Avoid_: RPC utility tree, generated client
 
 **Query data**:
-The successful decoded RPC or HTTP value presented to TanStack Query. Buffered queries convert successful `undefined` to `null`; streamed values and mutation data remain unchanged.
+The successful decoded RPC or HTTP value presented to TanStack Query. Buffered queries and live queries convert successful `undefined` to `null`; accumulated stream elements and mutation data remain unchanged.
 _Avoid_: RPC success value when it is `undefined`
 
 **Accumulated streamed query**:
-A streaming RPC view that caches emitted values in order, optionally retaining only a bounded recent history. Refetches may reset, append to, or replace the cached sequence.
+A streaming RPC or HTTP SSE view that caches emitted values in order, optionally retaining only a bounded recent history. Refetches may reset, append to, or replace the cached sequence.
 _Avoid_: Live query, infinite query
 
 **Live query**:
-A streaming RPC view that caches only the latest emitted value. Stream completion preserves that value; completion before the first emission produces a package error.
+A streaming RPC or HTTP SSE view that caches only the latest emitted value, converting `undefined` to `null`. Stream completion preserves that value; completion before the first emission produces a package error.
 _Avoid_: Accumulated streamed query, subscription
 
+**HTTP metadata view**:
+A buffered HTTP query view containing decoded query data and an immutable snapshot of the response status and raw string headers. Declared decoded header wrappers remain part of its data.
+_Avoid_: Raw response, header-wrapped success
+
 ## Payloads and keys
 
 **HTTP request input**:
@@ -73,7 +77,7 @@ An `Error` produced when an HTTP Effect returns a failed `Exit`. It identifies t
 _Avoid_: Sanitized Cause, configuration error
 
 **Configuration error**:
-A synchronous error that rejects invalid configuration for a utility tree or its option builders.
+An error that rejects invalid utility configuration during preparation or execution.
 _Avoid_: RPC execution error
 
 **Key-generation error**:
diff --git a/README.md b/README.md
index 750d3ef..f2cb07f 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,121 @@
 # effect-api-query
 
-Use Effect RPC and HttpApi with typed TanStack Query options and semantic cache keys.
-
-Create utilities from your API definition and a ready client, then pass their options directly to
-TanStack Query. Your application controls the client lifetime, cache policies, and framework setup.
+Derive typed TanStack Query options and cache keys from your Effect RPC and HttpApi contracts.
+Pass the generated options to QueryClient or your framework's Query hooks. Inputs and results
+follow the contract; your application controls transport, client lifetime, and cache policy.
 
 ## Install
 
+Install the package and TanStack Query Core:
+
 ```sh
 pnpm add effect-api-query @tanstack/query-core
 ```
 
-With automatic peer installation enabled, pnpm installs the exact Effect version declared by the
-package. Use TypeScript 5.9 or newer with `strict: true`. The package requires ESM and ES2022 support.
-Before upgrading, review [compatibility and stability](https://ueberbrot.github.io/effect-api-query/getting-started/compatibility-and-stability/).
+The package pins one exact Effect 4 release because its RPC and HTTP API modules are unstable.
+With automatic peer installation enabled, pnpm installs that version. Existing applications must
+match it. Use TypeScript 5.9 or newer with `strict: true`, ESM, and ES2022 support. See
+[compatibility and stability](https://ueberbrot.github.io/effect-api-query/getting-started/compatibility-and-stability/).
 
-## Query an RPC
+## RPC
 
-Pass your RPC group and ready flat client to the factory:
+Share this contract with your server and acquire a matching **flat RPC client** before calling
+`readUser`. Keep its Scope alive while the client is in use. The
+[RPC quick start](https://ueberbrot.github.io/effect-api-query/getting-started/quick-start/)
+shows acquisition and cleanup.
 
 ```ts
+import { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
 import { createRpcQueryUtils } from 'effect-api-query'
-
-const rpc = createRpcQueryUtils(rpcGroup, {
-  client,
-  keyPrefix: ['my-app'],
-  runPromiseExit,
-})
-
-const options = rpc.users.get.queryOptions({ input: { id: 1 } })
-const user = await queryClient.query(options)
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+const usersRpc = RpcGroup.make(
+  Rpc.make('users.get', {
+    payload: { id: Schema.Int },
+    success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+  }),
+)
+
+async function readUser(
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof usersRpc>>,
+  queryClient: QueryClient,
+) {
+  const rpc = createRpcQueryUtils(usersRpc, { client, keyPrefix: ['users-app'] })
+  const user = await queryClient.query(rpc.users.get.queryOptions({ input: { id: 1 } }))
+  return user.name
+}
 ```
 
-Follow the [RPC quick start](https://ueberbrot.github.io/effect-api-query/getting-started/quick-start/)
-for setup and cleanup.
+Dotted tags become nested utility paths: `users.get` becomes `rpc.users.get`. RPC inputs use the
+payload Schema's constructor input.
 
-## Query an HttpApi
+## HTTP
 
-Pass your HttpApi declaration and ready HTTP API client to the factory:
+Share this HttpApi with your server and acquire its **ready HttpApiClient** before calling
+`readUser`. Keep its transport resources alive while the client is in use. The
+[HTTP quick start](https://ueberbrot.github.io/effect-api-query/getting-started/http-quick-start/)
+shows acquisition and cleanup.
 
 ```ts
+import { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
 import { createHttpApiQueryUtils } from 'effect-api-query'
-
-const http = createHttpApiQueryUtils(api, {
-  client: httpClient,
-  keyPrefix: ['my-app'],
-  runPromiseExit,
-})
-
-const options = http.users.get.queryOptions({ input: { params: { id: 1 } } })
-const user = await queryClient.query(options)
+import { HttpApi, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+
+const usersApi = HttpApi.make('users-api').add(
+  HttpApiGroup.make('users').add(
+    HttpApiEndpoint.get('get', '/users/:id', {
+      params: { id: Schema.Int },
+      success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+    }),
+  ),
+)
+
+async function readUser(client: HttpApiClient.ForApi<typeof usersApi>, queryClient: QueryClient) {
+  const http = createHttpApiQueryUtils(usersApi, { client, keyPrefix: ['users-app'] })
+  const user = await queryClient.query(
+    http.users.get.queryOptions({ input: { params: { id: 1 } } }),
+  )
+  return user.name
+}
 ```
 
-HTTP accepts decoded request parts; RPC accepts payload constructor input. Follow the
-[HTTP quick start](https://ueberbrot.github.io/effect-api-query/getting-started/http-quick-start/)
-for a complete declaration, client, query, and mutation.
-
-## Choose an operation
+HTTP inputs use decoded `params`, `query`, `headers`, and `payload` containers. Both examples use
+the default Effect runner; provide a signal-aware `runPromiseExit` when execution needs services.
+Choose a `keyPrefix` that identifies your application and any user or tenant that affects its data.
+Keep credentials out of keys.
 
-| API definition                              | Available operations                          |
-| ------------------------------------------- | --------------------------------------------- |
-| Unary RPC                                   | Queries, infinite queries, and mutations      |
-| Streaming RPC                               | Accumulated streamed queries and live queries |
-| Buffered HttpApi endpoint without multipart | Queries, infinite queries, and mutations      |
-| Buffered HttpApi endpoint with multipart    | Mutations with `FormData`                     |
+## Capabilities
 
-Both factories generate keys for cache reads, writes, prefetching, and invalidation. Query functions
-forward cancellation to Effect. Mutations use TanStack's normal callbacks; invalidate affected
-queries in your application.
+| Contract                                | Generated operations                          |
+| --------------------------------------- | --------------------------------------------- |
+| Unary RPC or buffered nonmultipart HTTP | Query, infinite query, mutation               |
+| Buffered nonmultipart HTTP              | Separate response status/header metadata view |
+| Buffered multipart HTTP                 | Mutation with explicit `FormData`             |
+| RPC stream or unambiguous HTTP SSE      | Accumulated streamed query, live query        |
 
-For uploads, build `FormData` explicitly and pass it as mutation `payload`. See the
-[HTTP upload guide](https://ueberbrot.github.io/effect-api-query/guides/http-queries-and-mutations/#upload-a-file).
-Streaming HTTP responses and streaming multipart requests remain omitted.
+Generated keys support cache reads, writes, and invalidation. Queries forward cancellation to
+Effect. Use `withQueryPolicy` and `withMutationPolicy` to share typed defaults. Your application
+invalidates affected queries after mutations. See
+[feature support](https://ueberbrot.github.io/effect-api-query/getting-started/feature-support/)
+for supported contracts and limits.
 
-## Integrate with your application
+## Documentation and examples
 
-- [React Query](https://ueberbrot.github.io/effect-api-query/guides/react-query/): use generated options with hooks.
-- [TanStack Start](https://ueberbrot.github.io/effect-api-query/guides/tanstack-start/): share RPC and HTTP options across loaders, server rendering, and hydration.
-- [Run the examples](https://ueberbrot.github.io/effect-api-query/examples/): try complete Vite React and TanStack Start applications.
-- [Feature support](https://ueberbrot.github.io/effect-api-query/getting-started/feature-support/): check available operations and integration limits.
-- [API reference](https://ueberbrot.github.io/effect-api-query/reference/public-exports/): look up factories, builders, and errors.
+- [Documentation](https://ueberbrot.github.io/effect-api-query/): queries, mutations, pagination, streaming, policies, and caching.
+- [Integrations](https://ueberbrot.github.io/effect-api-query/integrations/): framework setup and client lifetime.
+- [Examples](https://ueberbrot.github.io/effect-api-query/examples/): complete Vite React and TanStack Start applications.
+- [API reference](https://ueberbrot.github.io/effect-api-query/reference/public-exports/): factories, builders, keys, and errors.
 
 ## Agent skill
 
 Install the library usage skill from this repository:
 
 ```sh
-npx skills add ueberBrot/effect-api-query --skill effect-api-query
+npx skills add ueberBrot/effect-api-query --full-depth --skill effect-api-query
 ```
 
 The same skill ships in the npm package. With the library installed, run
@@ -96,5 +125,5 @@ The same skill ships in the npm package. With the library installed, run
 npx @tanstack/intent@latest load effect-api-query#effect-api-query
 ```
 
-Intent reads the skill from the installed library version. Skills installed from
-GitHub are updated separately through the Skills CLI.
+Intent uses the skill from the installed library version. GitHub skill installations update
+separately through the Skills CLI.
diff --git a/_artifacts/domain_map.yaml b/_artifacts/domain_map.yaml
new file mode 100644
index 0000000..fc1766a
--- /dev/null
+++ b/_artifacts/domain_map.yaml
@@ -0,0 +1,175 @@
+library:
+  name: effect-api-query
+  version: 0.1.0
+  repository: https://github.com/ueberBrot/effect-api-query
+  description: TanStack Query utilities derived from ready Effect RPC and HTTP clients.
+  primary_framework: framework-agnostic
+domains:
+  - name: Contract-derived query workflows
+    slug: contract-queries
+    description: Choose typed cache views while preserving application-owned execution and lifetime.
+skills:
+  - name: effect-api-query
+    slug: effect-api-query
+    domain: contract-queries
+    description: Derive options and keys, coordinate cache owners, and integrate native Query
+      consumers.
+    type: core
+    packages:
+      - effect-api-query
+    covers:
+      - RPC construction and canonical identity
+      - HTTP decoded requests, SSE, multipart mutations, and metadata
+      - Inferred operation types, typed policy reuse, native defaults, and view filters
+      - Input-field skipping, pagination, stream policies, and lifetime tracing
+      - Stream snapshots and request cleanup
+      - Optimistic overlap, event refresh, and owner replacement
+      - DTO and rich-value hydration
+      - Native provider setup, Suspense recovery, reactive accessors, and host boundaries
+    tasks:
+      - Derive buffered, paginated, accumulated, live, and metadata options from a ready client.
+      - Address exact stream policy keys, select supported view prefixes, and compose encoded
+        partial native filters.
+      - Reuse inferred input, cached query data, and mutation types in application modules.
+      - Apply native defaults and typed reusable policies without losing call-site selection,
+        conditional input, or explicitly undefined seed behavior.
+      - Capture open streams and drain queries, preparation, and accepted writes before request
+        disposal.
+      - Hydrate every selected view into its normal decoded cache representation.
+      - Preserve neighboring writes and originating ownership during mutation overlap.
+      - Defer event refresh until participating writes settle.
+      - Retire consumers and accepted work before acquiring a replacement owner.
+      - Acquire a ready client and mount native providers with awaited cleanup.
+      - Recover initial Suspense failures, retain cached data after failed refetches, and start
+        independent reads together with native cancellation limits.
+      - Trace the consumed Stream and its cleanup while its owning runtime remains alive.
+      - Rebuild options inside native reactive framework accessors.
+      - Choose an application-owned transport within documented version and host boundaries.
+    subsystems:
+      - name: RPC
+        package: effect-api-query
+        config_surface: Literal RpcGroup, flat ready client, prefix, key encoders, runner.
+      - name: HTTP
+        package: effect-api-query
+        config_surface: Literal HttpApi, ready client, prefix, request encoders, runner.
+    reference_candidates:
+      - topic: Adapter inputs and capabilities
+        reason: RPC construction and HTTP decoded containers differ.
+      - topic: Cache workflows
+        reason: Keys, policies, and native filters are library contracts; writes and replacement
+          are application-owned workflows.
+      - topic: Hydration and SSR
+        reason: Captures, view codecs, and preparation require request lifetime.
+      - topic: Frameworks and hosts
+        reason: Native providers, Suspense recovery, hook overloads, and transport boundaries are
+          conditional integrations rather than package-provided services.
+    failure_modes:
+      - mistake: Reuse an accumulated key across incompatible policies
+        mechanism: Retention and refetch policy change representation and normalized identity.
+        wrong_pattern: rpc.events.watch.streamedKey(input)
+        correct_pattern: rpc.events.watch.streamedKey(input, policy)
+        source: src/rpc/streamed-query.ts
+        priority: HIGH
+        status: active
+      - mistake: Dispose resources after native cancellation alone
+        mechanism: Query settlement can precede local finalization; accepted writes and
+          preparation may still need the runtime.
+        wrong_pattern: await queryClient.cancelQueries(); await runtime.dispose()
+        correct_pattern: await acceptedWorkDrain; await runtime.dispose()
+        source: examples/tanstack-start/src/lib/application.ts
+        priority: HIGH
+        status: active
+      - mistake: Roll back an overlapping write with an old snapshot
+        mechanism: Whole-list replacement erases intervening writes; stale entity restoration
+          can overwrite a newer authoritative cache revision.
+        wrong_pattern: queryClient.setQueryData(key, oldList)
+        correct_pattern: Capture current entity fields and positions for each new write; restore
+          them only while its optimistic cache revision remains owned.
+        source: examples/vite-react/src/lib/user-writes.ts
+        priority: CRITICAL
+        status: active
+      - mistake: Redirect late callbacks to a replacement owner
+        mechanism: Mutable current-owner lookup can send private results to another cache.
+        wrong_pattern: currentOwner.queryClient.setQueryData(key, result)
+        correct_pattern: transaction.commit(result)
+        source: examples/vite-react/src/lib/user-writes.ts
+        priority: CRITICAL
+        status: active
+      - mistake: Hydrate rich values without paired view codecs
+        mechanism: JSON loses prototypes, rich page parameters, and distinct undefined elements.
+        wrong_pattern: hydrate(queryClient, JSON.parse(snapshot))
+        correct_pattern: await decodeAllSelectedViewsThenHydrate(snapshot)
+        source: tests/types/docs-hydration-views.ts
+        priority: HIGH
+        status: active
+      - mistake: Construct reactive query options only once
+        mechanism: Builders capture the first input and cannot follow reactive changes.
+        wrong_pattern: useQuery(rpc.users.read.queryOptions({ input }))
+        correct_pattern: 'useQuery(() => rpc.users.read.queryOptions({ input: readInput() }))'
+        source: apps/docs/src/content/docs/guides/solid-query.md
+        priority: HIGH
+        status: active
+      - mistake: Rely on changed metadata options after a fresh hit
+        mechanism: An imperative fresh cache hit retains the existing Query options.
+        wrong_pattern: await queryClient.query(newOptions); queryClient.setQueryData(key, value)
+        correct_pattern: Install the policy through an observer or actual fetch before manual writes.
+        source: apps/docs/src/content/docs/reference/http-builders.md
+        priority: HIGH
+        status: active
+      - mistake: Assume shared mutation callbacks compose automatically
+        mechanism: Call-site callbacks replace policy callbacks, and shared callbacks cannot
+          assume the local optimistic context's shape.
+        wrong_pattern: 'write({ onSuccess: localSuccess })'
+        correct_pattern: Compose required callbacks explicitly and keep onMutate at the call site.
+        source: tests/query-policy.test.ts
+        priority: HIGH
+        status: active
+      - mistake: Rely on Suspense cancellation for open streams
+        mechanism: Native Suspense hooks do not support cancellation; lifecycle cleanup needs
+          an ordinary abort-aware query or observer.
+        wrong_pattern: useSuspenseQuery(rpc.events.watch.liveOptions())
+        correct_pattern: Use an ordinary Query hook or observer for a stream requiring cancellation.
+        source: apps/docs/src/content/docs/guides/react-query.md
+        priority: HIGH
+        status: active
+      - mistake: Trace only the creation of an iterable
+        mechanism: The runner's Effect ends before stream consumption and local finalization.
+        wrong_pattern: runPromiseExit(effect.pipe(Effect.withSpan('feed.consume')))
+        correct_pattern: Acquire Effect.makeSpanScoped inside Stream.unwrap and retain it through
+          asynchronous Stream.ensuring cleanup.
+        source: tests/types/docs-stream-tracing.ts
+        priority: HIGH
+        status: active
+    compositions:
+      - library: TanStack Query
+      - library: Effect
+tensions:
+  - name: Library contracts and application workflows
+    skills:
+      - effect-api-query
+    description: Generated options, keys, inference, and policy binding have a package contract;
+      native providers, transports, and domain protocols belong to the application.
+    implication: Explain package behavior in library guidance, native consumers in integrations,
+      and concrete protocols such as cancellable commands in runnable examples.
+  - name: Exact identity and broad refresh
+    skills:
+      - effect-api-query
+    description: Concrete keys include encoding and view policy while native prefixes group
+      related entries.
+    implication: Partial constructor input or omitted stream policy cannot stand in for an exact
+      key.
+  - name: Local retirement and accepted domain work
+    skills:
+      - effect-api-query
+    description: Private cache retirement stops local side effects without pretending to undo
+      remote writes.
+    implication: Keep originating-owner guards after drain and model command cancellation explicitly.
+  - name: Policy reuse and call-site inference
+    skills:
+      - effect-api-query
+    description: Shared endpoint-aware defaults reduce repetition while selected data and
+      optimistic context depend on each invocation.
+    implication: Bind typed policies once per owner, keeping projections, seeds, identity, and
+      optimistic context at the call site; compose required callbacks deliberately.
+cross_references: []
+gaps: []
diff --git a/_artifacts/skill_spec.md b/_artifacts/skill_spec.md
new file mode 100644
index 0000000..ce41f47
--- /dev/null
+++ b/_artifacts/skill_spec.md
@@ -0,0 +1,129 @@
+# Effect API Query skill coverage
+
+The package derives TanStack Query utilities from Effect RPC and HTTP contracts
+and ready clients. Applications own transport, authentication, runtime, Scope,
+cache ownership, and serialization policy.
+
+## Structure
+
+One automatically discoverable `effect-api-query` skill covers the existing
+library. Its entry point holds shared rules and routes conditional tasks to six
+references:
+
+| Reference            | Tasks                                                              |
+| -------------------- | ------------------------------------------------------------------ |
+| RPC                  | Payload construction, canonical identity, ready-client lifetime    |
+| HTTP                 | Decoded requests, SSE, multipart mutations, metadata               |
+| Query patterns       | Inference types, skipping, pagination, stream views and tracing    |
+| Cache workflows      | Typed policies, native defaults, view filters, writes and owners   |
+| Hydration and SSR    | Snapshots, paired view codecs, preparation and cleanup             |
+| Frameworks and hosts | Provider setup, Suspense, reactive accessors, transports and hosts |
+
+Consumers load the guidance from their installed package without repository-local
+authoring skills. Planning records remain outside the shipped package.
+
+## Sources and boundaries
+
+The [domain map](domain_map.yaml) owns task coverage and failure modes. The
+[skill tree](skill_tree.yaml) owns skill paths and source mappings. Public
+declarations and runtime own API facts; application modules own domain and cache
+coordination. Library documentation explains generated options, keys,
+inference, policies, and cleanup contracts. Integration pages explain native
+providers and consumers; runnable examples demonstrate application protocols.
+
+Keep guidance within existing library behavior. Preserve application ownership
+and qualify support through [frameworks and hosts](../skills/effect-api-query/references/frameworks-and-hosts.md).
+Measurements describe their fixtures; they do not establish universal budgets.
+
+## Validation
+
+Native Intent maintenance detects source changes and records justified outcomes
+for the owned skill and planning records. Run `intent maintainer check`, report
+pending work, and finish with the uncached scoped `skills-check` task. Leave
+unrelated skills unresolved.
+
+Strict compiler fixtures check the public declarations and retained documentation
+examples. Ordinary runtime tests and application examples cover cache views,
+cancellation, hydration, and ownership. Native builds validate package
+declarations and exports.
+
+The usability batch reuses the existing executable consumer fixtures:
+
+| Task                                                                            | Checks                                                                                                                    |
+| ------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
+| Infer operation inputs, views, and failures; retain local policy inference      | `tests/types/helper-contract.ts`, `tests/types/docs-policies.ts`, `tests/query-policy.test.ts`                            |
+| Select every input of a supported view and preserve exact tagged reads          | `tests/query-view-prefix.test.ts`, `tests/types/helper-contract.ts`                                                       |
+| Share typed RPC/HTTP retry decisions                                            | `tests/types/docs-retry.ts`                                                                                               |
+| Acquire, provide, render, and dispose a minimal React application               | `tests/types/docs-react-setup.tsx`, `tests/types/docs-react-entry.ts`, `examples/vite-react/tests/minimal-setup.test.tsx` |
+| Reset initial Suspense errors, retain failed-refetch data, start reads together | `tests/types/docs-suspense.tsx`, `examples/vite-react/tests/suspense-recovery.test.tsx`                                   |
+| Trace lazy stream emissions and awaited cleanup                                 | `tests/types/docs-stream-tracing.ts`, `examples/vite-react/tests/stream-tracing.test.ts`                                  |
+
+These checks verify the recommended APIs and observable behavior. A fresh isolated
+consumer session remains separate evidence; this authoring session does not
+establish skill discovery or consumer reliability.
+
+## Coverage and batch history
+
+- **0.1.0 candidate, source `6893603` (2026-10-10):** one skill and six references
+  cover the ten developer tasks in the domain map. Guidance includes originating
+  cache owners, overlapping writes, stream capture and preparation drain, paired
+  hydration codecs, and qualified framework and host limits. CI `38085762210`
+  and release validation `38085762195` passed; publication remains separate.
+- **Maintainer alignment (2026-10-10), based on `6893603`:** pin native Intent
+  0.5.3 under the seven-day dependency policy and add its revision-aware check to
+  CI. Its default discovery excludes hidden repository authoring skills. Preserve
+  the existing task coverage, source mappings, and package-only distribution.
+  Skills CLI 1.7.0 discovered and copied this same skill from the repository root:
+  all seven files matched, and all 13 relative links resolved within the copy.
+  Guidance is unchanged, so this batch checks delivery without repeating API
+  tasks. Scoped formatting, skill validation, and native maintainer checks with
+  the default and actual PR bases passed. Initial package publication remains
+  pending.
+- **API and architecture review (2026-10-11), based on `bf38d85`:** use one
+  conditional-input form across buffered, metadata, streamed, and live options.
+  Retain the ten tasks and existing source mappings. Compiler fixtures verify
+  contextual inference and mutation tracking; 124 in-memory runtime cases cover
+  cache views, retry attempts, defaults, hydration, cancellation, and ownership.
+- **Runtime and guidance audit (2026-10-11), based on `54b6521`:** qualify stream
+  hashing and execution errors, preserve refreshed page totals during overlapping
+  writes, and reconcile command starts after transport failures. Shorten repeated
+  guidance while retaining the ten tasks, domain map, and source mappings. All
+  474 runtime cases and both public API compiler suites pass, alongside typed
+  lint, Effect diagnostics, dead-code checks, and documentation checks.
+- **Functionality and lifetime review (2026-10-11), based on `512cd90`:** organize
+  documentation around queries, mutations, pagination, streaming, and metadata.
+  Request disposal drains ordinary query finalizers and accepted writes; rollback
+  respects newer authoritative cache revisions. Clarify selected return values
+  and opaque middleware's encoder requirement. Preserve the ten tasks and six
+  references; existing source mappings cover the new guides and compiler fixture.
+  Remove runtime cases that duplicate static contracts, upstream behavior, or
+  bookkeeping. All 491 remaining runtime cases and both public API compiler
+  suites pass. Documentation builds with valid links, and all 38 application and
+  documentation Chromium checks pass.
+- **Usability and policy reuse (2026-10-11), based on `8f4723c`:** extend the
+  existing skill and six references with operation inference, supported view
+  prefixes, typed query/mutation policy reuse, minimal native provider setup,
+  Suspense recovery, and consumed-stream tracing. Keep inputs, projections, seeds,
+  page mapping, stream identity, and optimistic context local; call-site callbacks
+  replace shared policy callbacks. Preserve native QueryClient defaults, canonical
+  encoded partial filtering, application lifetime, and all prior task coverage.
+  Semantic near-miss duplication detection found the repeated retry recipe;
+  shared owner invalidation and error descriptions also reduce example drift.
+  Expand source mappings for TSX fixtures and shared example error rendering.
+  A fresh consumer invoked the copied packaged skill and produced typed policy
+  builders in a disposable project. The behavior checks passed and rejected the
+  initial version without shared defaults; its result compiled on TypeScript 7
+  and 5.9. Skill discovery remains unverified. Final compiler, runtime,
+  documentation, and revision-bound Intent outcomes are recorded with the task's
+  maintenance review.
+- **Library-focused documentation (2026-10-11), based on `8f4723c`:** separate
+  library contracts, native integrations, runnable application examples, and API
+  reference. Keep the existing fourteen tasks and six shipped references.
+  Type Inference owns the detailed inference contract; Defaults and Policies owns
+  shared defaults and callbacks; Cache Keys and Filters replaces Cache Management.
+  Fold ready-client mounting into React Query and move the explicit command
+  protocol to Cancellable Commands. Update shipped pointers to those canonical
+  pages and the integration overview. Existing skill-tree source patterns already
+  cover the new and moved pages, so its identities and mappings remain accurate.
+  Preserve the fresh-consumer evidence above; this reorganization changes where
+  guidance is reached, without changing its recommended API behavior.
diff --git a/_artifacts/skill_tree.yaml b/_artifacts/skill_tree.yaml
new file mode 100644
index 0000000..8243983
--- /dev/null
+++ b/_artifacts/skill_tree.yaml
@@ -0,0 +1,58 @@
+library:
+  name: effect-api-query
+  version: 0.1.0
+generated_from:
+  domain_map: _artifacts/domain_map.yaml
+  skill_spec: _artifacts/skill_spec.md
+skills:
+  - name: effect-api-query
+    slug: effect-api-query
+    domain: contract-queries
+    path: skills/effect-api-query/SKILL.md
+    description: 'Use when integrating effect-api-query with an Effect RPC or
+      HttpApi contract: derive TanStack Query keys and options, choose buffered
+      or streaming views, configure metadata, pagination, defaults or cache
+      filters, coordinate writes and cache owners, capture or hydrate SSR data,
+      or rebuild native framework queries from reactive input. Also use when
+      diagnosing execution failures, cancellation, or ready-client lifetime in
+      these integrations.'
+    sources:
+      - src/**/*.ts
+      - tests/**/*.ts
+      - tests/**/*.tsx
+      - '**/examples/shared/*.ts'
+      - '**/examples/vite-react/src/lib/*.ts'
+      - '**/examples/vite-react/src/main.tsx'
+      - '**/examples/vite-react/src/app.tsx'
+      - '**/examples/vite-react/src/components/ui/effect-error-details.tsx'
+      - '**/examples/vite-react/tests/*.ts*'
+      - '**/examples/tanstack-start/src/lib/*.ts'
+      - '**/examples/tanstack-start/src/router.tsx'
+      - '**/examples/tanstack-start/src/components/effect-error-details.tsx'
+      - '**/examples/tanstack-start/tests/*.ts*'
+      - '**/examples/server/src/*.ts'
+      - '**/examples/server/tests/**/*.ts'
+      - GLOSSARY.md
+      - README.md
+      - package.json
+      - pnpm-workspace.yaml
+      - scripts/*.mts
+      - docs/adr/000*.md
+      - docs/adr/0010-*.md
+      - docs/adr/0012-*.md
+      - docs/adr/0014-*.md
+      - docs/adr/0015-*.md
+      - docs/adr/002*.md
+      - '**/apps/docs/src/content/docs/**/*.md'
+      - '**/apps/docs/src/content/docs/**/*.mdx'
+    requires: []
+    purpose: Derive typed TanStack Query keys and options from ready Effect RPC and
+      HTTP clients, preserving cache identity, decoded query views, native
+      framework behavior, and application-owned execution, hydration, and
+      resource lifetime.
+distribution:
+  mode: none
+review:
+  ignore:
+    - node_modules
+    - '**/node_modules'
diff --git a/apps/docs/astro.config.mjs b/apps/docs/astro.config.mjs
deleted file mode 100644
index cc5eb96..0000000
--- a/apps/docs/astro.config.mjs
+++ /dev/null
@@ -1,106 +0,0 @@
-// @ts-check
-
-import starlight from '@astrojs/starlight'
-import { defineConfig } from 'astro/config'
-import starlightLinksValidator from 'starlight-links-validator'
-import starlightLlmsTxt from 'starlight-llms-txt'
-import starlightThemeBlack from 'starlight-theme-black'
-
-import packageManifest from '../../package.json' with { type: 'json' }
-
-const repositoryUrl = 'https://github.com/ueberBrot/effect-api-query'
-const docsBase = '/effect-api-query'
-const packageUrl = `https://www.npmjs.com/package/${packageManifest.name}`
-
-export default defineConfig({
-  base: docsBase,
-  integrations: [
-    starlight({
-      description: 'Use Effect RPC and HttpApi with typed TanStack Query options and cache keys.',
-      editLink: {
-        baseUrl: `${repositoryUrl}/edit/main/apps/docs/`,
-      },
-      lastUpdated: true,
-      head: [
-        {
-          tag: 'script',
-          attrs: {
-            defer: true,
-            src: `${docsBase}/package-version.js`,
-          },
-        },
-      ],
-      logo: {
-        src: './src/assets/icon.svg',
-      },
-      plugins: [
-        starlightLlmsTxt(),
-        starlightThemeBlack({
-          navLinks: [
-            {
-              label: `v${packageManifest.version}`,
-              link: packageUrl,
-            },
-          ],
-        }),
-        starlightLinksValidator({
-          errorOnRelativeLinks: true,
-        }),
-      ],
-      sidebar: [
-        {
-          label: 'Start Here',
-          items: [
-            { label: 'Installation', slug: 'getting-started/installation' },
-            { label: 'RPC Quick Start', slug: 'getting-started/quick-start' },
-            { label: 'HTTP Quick Start', slug: 'getting-started/http-quick-start' },
-            { label: 'Executable Examples', slug: 'examples' },
-            { label: 'Feature Support', slug: 'getting-started/feature-support' },
-            {
-              label: 'Compatibility and Stability',
-              slug: 'getting-started/compatibility-and-stability',
-            },
-          ],
-        },
-        {
-          label: 'Guides',
-          items: [
-            { label: 'React Query', slug: 'guides/react-query' },
-            { label: 'HTTP Queries and Mutations', slug: 'guides/http-queries-and-mutations' },
-            { label: 'TanStack Start', slug: 'guides/tanstack-start' },
-            { label: 'Cache Management', slug: 'guides/cache-management' },
-            { label: 'Cancellation', slug: 'guides/cancellation' },
-            { label: 'Handle Failures', slug: 'guides/handle-failures' },
-            { label: 'Custom Key Encoders', slug: 'guides/custom-key-encoders' },
-            { label: 'Conditional Queries', slug: 'guides/conditional-queries' },
-          ],
-        },
-        {
-          label: 'Concepts',
-          items: [
-            { label: 'RPC Utility Tree', slug: 'concepts/rpc-utility-tree' },
-            { label: 'HTTP Utility Tree', slug: 'concepts/http-utility-tree' },
-            { label: 'Queries and Mutations', slug: 'concepts/queries-and-mutations' },
-            { label: 'Client Lifecycle', slug: 'concepts/client-lifecycle' },
-            { label: 'Semantic Keys', slug: 'concepts/semantic-keys' },
-            { label: 'Data Normalization', slug: 'concepts/data-normalization' },
-          ],
-        },
-        {
-          label: 'Reference',
-          items: [
-            { label: 'RPC Factory', slug: 'reference/factory' },
-            { label: 'HTTP Factory', slug: 'reference/http-factory' },
-            { label: 'RPC Builders', slug: 'reference/generated-builders' },
-            { label: 'Errors', slug: 'reference/errors' },
-            { label: 'Public Exports', slug: 'reference/public-exports' },
-            { label: 'Compatibility and Limits', slug: 'reference/compatibility-and-limits' },
-          ],
-        },
-      ],
-      social: [{ icon: 'github', label: 'GitHub', href: repositoryUrl }],
-      title: packageManifest.name,
-    }),
-  ],
-  site: 'https://ueberbrot.github.io',
-})
diff --git a/apps/docs/astro.config.mts b/apps/docs/astro.config.mts
new file mode 100644
index 0000000..3e73f37
--- /dev/null
+++ b/apps/docs/astro.config.mts
@@ -0,0 +1,354 @@
+import starlight from '@astrojs/starlight'
+import { defineConfig } from 'astro/config'
+import starlightLinksValidator from 'starlight-links-validator'
+import starlightLlmsTxt from 'starlight-llms-txt'
+import starlightThemeBlack from 'starlight-theme-black'
+
+import packageManifest from '../../package.json' with { type: 'json' }
+
+const repositoryUrl = 'https://github.com/ueberBrot/effect-api-query'
+const docsBase = '/effect-api-query'
+const packageUrl = `https://www.npmjs.com/package/${packageManifest.name}`
+
+export default defineConfig({
+  base: docsBase,
+  integrations: [
+    starlight({
+      description: 'Use Effect RPC and HttpApi with typed TanStack Query options and cache keys.',
+      editLink: {
+        baseUrl: `${repositoryUrl}/edit/main/apps/docs/`,
+      },
+      lastUpdated: true,
+      head: [
+        {
+          tag: 'script',
+          attrs: {
+            defer: true,
+            src: `${docsBase}/package-version.js`,
+          },
+        },
+      ],
+      logo: {
+        src: './src/assets/icon.svg',
+      },
+      plugins: [
+        starlightLlmsTxt(),
+        starlightThemeBlack({
+          navLinks: [
+            {
+              label: `v${packageManifest.version}`,
+              link: packageUrl,
+            },
+          ],
+        }),
+        starlightLinksValidator({
+          errorOnRelativeLinks: true,
+        }),
+      ],
+      sidebar: [
+        {
+          label: 'Start Here',
+          items: [
+            {
+              label: 'Installation',
+              slug: 'getting-started/installation',
+            },
+            {
+              label: 'Supported Operations',
+              slug: 'getting-started/feature-support',
+            },
+          ],
+        },
+        {
+          label: 'HTTP API',
+          items: [
+            {
+              label: 'Quick Start',
+              slug: 'getting-started/http-quick-start',
+            },
+            {
+              label: 'Contract and Utility Tree',
+              slug: 'concepts/http-utility-tree',
+            },
+            {
+              label: 'Requests and Uploads',
+              slug: 'guides/http-queries-and-mutations',
+            },
+            {
+              label: 'Response Metadata',
+              slug: 'guides/http-metadata',
+            },
+            {
+              label: 'Factory',
+              slug: 'reference/http-factory',
+            },
+            {
+              label: 'Builders',
+              slug: 'reference/http-builders',
+            },
+          ],
+        },
+        {
+          label: 'RPC',
+          items: [
+            {
+              label: 'Quick Start',
+              slug: 'getting-started/quick-start',
+            },
+            {
+              label: 'Contract and Utility Tree',
+              slug: 'concepts/rpc-utility-tree',
+            },
+            {
+              label: 'Factory',
+              slug: 'reference/factory',
+            },
+            {
+              label: 'Builders',
+              slug: 'reference/generated-builders',
+            },
+          ],
+        },
+        {
+          label: 'Library',
+          items: [
+            {
+              label: 'Contracts and Inputs',
+              items: [
+                {
+                  label: 'Generated Utility Model',
+                  slug: 'concepts/queries-and-mutations',
+                },
+                {
+                  label: 'Inputs and Query Data',
+                  slug: 'concepts/data-normalization',
+                },
+              ],
+            },
+            {
+              label: 'Options and Cache Views',
+              items: [
+                {
+                  label: 'Queries',
+                  slug: 'guides/queries',
+                },
+                {
+                  label: 'Mutations',
+                  slug: 'guides/mutations',
+                },
+                {
+                  label: 'Pagination',
+                  slug: 'guides/pagination',
+                },
+                {
+                  label: 'Conditional Queries',
+                  slug: 'guides/conditional-queries',
+                },
+                {
+                  label: 'Streaming',
+                  slug: 'guides/streaming',
+                },
+                {
+                  label: 'Stream History',
+                  slug: 'guides/choose-stream-history',
+                },
+              ],
+              collapsed: true,
+            },
+            {
+              label: 'Cache and Policies',
+              items: [
+                {
+                  label: 'Semantic Keys',
+                  slug: 'concepts/semantic-keys',
+                },
+                {
+                  label: 'Cache Keys and Filters',
+                  slug: 'guides/cache-filters',
+                },
+                {
+                  label: 'Defaults and Policies',
+                  slug: 'guides/query-defaults',
+                },
+                {
+                  label: 'Custom Key Encoders',
+                  slug: 'guides/custom-key-encoders',
+                },
+                {
+                  label: 'Optimistic Updates',
+                  slug: 'guides/optimistic-writes',
+                },
+                {
+                  label: 'Refresh from Events',
+                  slug: 'guides/refresh-from-events',
+                },
+                {
+                  label: 'Switch Cache Owners',
+                  slug: 'guides/switch-cache-owners',
+                },
+              ],
+              collapsed: true,
+            },
+            {
+              label: 'Execution and Lifetime',
+              items: [
+                {
+                  label: 'Client Lifecycle',
+                  slug: 'concepts/client-lifecycle',
+                },
+                {
+                  label: 'Handle Failures',
+                  slug: 'guides/handle-failures',
+                },
+                {
+                  label: 'Retry Queries',
+                  slug: 'guides/retry-queries',
+                },
+                {
+                  label: 'Cancellation',
+                  slug: 'guides/cancellation',
+                },
+              ],
+              collapsed: true,
+            },
+          ],
+        },
+        {
+          label: 'Integrations',
+          items: [
+            {
+              label: 'Overview',
+              slug: 'integrations',
+            },
+            {
+              label: 'React',
+              items: [
+                {
+                  label: 'Client Setup and Hooks',
+                  slug: 'guides/react-query',
+                },
+                {
+                  label: 'Suspense and Error Recovery',
+                  slug: 'guides/suspense-and-recovery',
+                },
+              ],
+            },
+            {
+              label: 'Reactive Frameworks',
+              items: [
+                {
+                  label: 'Vue Query',
+                  slug: 'guides/vue-query',
+                },
+                {
+                  label: 'Solid Query',
+                  slug: 'guides/solid-query',
+                },
+                {
+                  label: 'Svelte Query',
+                  slug: 'guides/svelte-query',
+                },
+                {
+                  label: 'Angular Query',
+                  slug: 'guides/angular-query',
+                },
+              ],
+              collapsed: true,
+            },
+            {
+              label: 'Router and Server Rendering',
+              items: [
+                {
+                  label: 'Router and Start',
+                  slug: 'guides/tanstack-start',
+                },
+                {
+                  label: 'Hydrate Query Data',
+                  slug: 'guides/hydrate-unary-data',
+                },
+                {
+                  label: 'Hydrate Query Views',
+                  slug: 'guides/hydrate-query-views',
+                },
+                {
+                  label: 'Stream Snapshots',
+                  slug: 'guides/stream-snapshots',
+                },
+              ],
+              collapsed: true,
+            },
+            {
+              label: 'Clients and Hosts',
+              items: [
+                {
+                  label: 'WebSocket Clients',
+                  slug: 'guides/websocket-clients',
+                },
+                {
+                  label: 'Browser and Worker Hosts',
+                  slug: 'reference/browser-and-worker-hosts',
+                },
+                {
+                  label: 'Stream Tracing',
+                  slug: 'guides/trace-streams',
+                },
+                {
+                  label: 'External HTTP Clients',
+                  slug: 'reference/external-http-clients',
+                },
+              ],
+              collapsed: true,
+            },
+          ],
+        },
+        {
+          label: 'Examples',
+          items: [
+            {
+              label: 'Run the Applications',
+              slug: 'examples',
+            },
+            {
+              label: 'Cancellable Commands',
+              slug: 'examples/cancellable-commands',
+            },
+          ],
+          collapsed: true,
+        },
+        {
+          label: 'API Reference',
+          items: [
+            {
+              label: 'Type Inference',
+              slug: 'reference/type-inference',
+            },
+            {
+              label: 'Errors',
+              slug: 'reference/errors',
+            },
+            {
+              label: 'Public Exports',
+              slug: 'reference/public-exports',
+            },
+            {
+              label: 'Compatibility and Limits',
+              slug: 'reference/compatibility-and-limits',
+            },
+            {
+              label: 'Compatibility and Stability',
+              slug: 'getting-started/compatibility-and-stability',
+            },
+            {
+              label: 'Performance and Bundling',
+              slug: 'reference/performance',
+            },
+          ],
+          collapsed: true,
+        },
+      ],
+      social: [{ icon: 'github', label: 'GitHub', href: repositoryUrl }],
+      title: packageManifest.name,
+    }),
+  ],
+  site: 'https://ueberbrot.github.io',
+})
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 4f0fb9b..69c7feb 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -18,6 +18,6 @@
   },
   "devDependencies": {
     "@astrojs/check": "0.9.10",
-    "typescript": "6.0.3"
+    "typescript": "catalog:docs"
   }
 }
diff --git a/apps/docs/public/package-version.js b/apps/docs/public/package-version.js
index 0ddc8cf..ab8f1b4 100644
--- a/apps/docs/public/package-version.js
+++ b/apps/docs/public/package-version.js
@@ -24,7 +24,7 @@
 
       updatePackageVersion(manifest.version)
     } catch {
-      // Keep the version embedded by the last documentation build.
+      return
     }
   }
 
diff --git a/apps/docs/src/content/docs/concepts/client-lifecycle.md b/apps/docs/src/content/docs/concepts/client-lifecycle.md
index a089842..059c0ca 100644
--- a/apps/docs/src/content/docs/concepts/client-lifecycle.md
+++ b/apps/docs/src/content/docs/concepts/client-lifecycle.md
@@ -3,26 +3,19 @@ title: Client Lifecycle
 description: Keep RPC and HTTP clients, runtimes, and resources under caller ownership.
 ---
 
-`createRpcQueryUtils` accepts a ready flat RPC client. Your application acquires the client, keeps
-its `Scope` open, and disposes its resources:
+Both factories use ready clients. The application owns transport, middleware, runtime,
+Scope, and QueryClient:
 
-1. Open the RPC client's `Scope` and build any required runtime.
-2. Create a `QueryClient` and RPC utility tree.
-3. Run ordinary, infinite, accumulated-stream, and live queries or mutations. Their generated
-   functions call the ready client through `runPromiseExit`.
-4. At shutdown, cancel active queries, clear the cache, and then dispose the RPC client's resources.
+1. Acquire the RPC or HTTP client and the services it requires.
+2. Create a QueryClient and utility tree for that owner.
+3. Keep those resources alive while queries, streams, and mutations run.
+4. Stop consumers, cancel queries, await local stream cleanup and accepted mutations,
+   clear the cache, then release the client and runtime.
 
-On the server, create these resources separately for each request to keep request data and scoped
-services isolated. In the browser, keep them for the application lifetime.
-
-The factory has no React, router, transport, provider, or server-rendering lifecycle of its own.
+Server requests own independent resources. Browser applications keep them for their lifetime.
 
 ## HTTP clients and execution services
 
-`createHttpApiQueryUtils` accepts a ready HttpApiClient. The application builds its HTTP transport,
-installs client middleware, and manages any runtime or `Scope` the client uses. On the server,
-create a client and `QueryClient` for each request and dispose their resources when it ends.
-
 Calls that need no services default to `Effect.runPromiseExit`. If an exposed endpoint needs request
 encoding, success decoding, or error decoding services, supply a `runPromiseExit` that provides
 them. The runner must also provide any services the ready client still requires. It must forward its
@@ -42,3 +35,30 @@ processing; it is not a serialized server Context and does not replace the suppl
 
 Manage authentication, middleware, transport setup, runtime services, and `Scope` in your
 application client and runtime.
+
+## Stream creation and consumption
+
+For an accumulated or live RPC or HTTP SSE query, the runner executes
+`Stream.toAsyncIterableEffect` to create an iterable and capture its Effect `Context`. The runner
+returns a successful `Exit` before Query Core pulls values. Iterator pulls then use that captured
+Context while the query remains fetching. Keep its services and the ready client's Scope alive
+until consumption finishes.
+
+Transform or instrument the ready-client stream when the work must cover consumption.
+Preserve its request options, declared value/error types, and HTTP response-mode contract.
+Use a stream finalizer for completion or cancellation cleanup.
+
+A timer, span, finalizer, or retry schedule around the runner's creation Effect ends with iterable
+creation. It does not wrap the later pulls. Put stream-lifetime instrumentation and recovery on the
+stream itself. A retry in generated Query options reruns the query function and creates another
+iterable. Coordinate it with stream and transport schedules as described in
+[retry queries](/effect-api-query/guides/retry-queries/#set-defaults-deliberately).
+
+Native `cancelQueries` settlement can precede asynchronous iterator cleanup. Await the
+resource's completion signal before releasing its services. Mutations settle separately because
+they have no query abort signal.
+
+For an open-stream server capture, await
+[fetchStreamSnapshot](/effect-api-query/guides/stream-snapshots/) before dehydration or client
+disposal. The helper waits for local iterator cleanup; remote completion still requires an
+application acknowledgement.
diff --git a/apps/docs/src/content/docs/concepts/data-normalization.md b/apps/docs/src/content/docs/concepts/data-normalization.md
index d777c60..be1e8e5 100644
--- a/apps/docs/src/content/docs/concepts/data-normalization.md
+++ b/apps/docs/src/content/docs/concepts/data-normalization.md
@@ -22,6 +22,17 @@ with their schemas; the ready HttpApiClient encodes them separately for executio
 Every declared request container remains required, even when its fields are optional. For example,
 an endpoint with optional query filters still takes `input: { query: {} }` when no filter is selected.
 
+## Keep captured inputs unchanged
+
+Query options retain the normalized RPC payload or decoded HTTP request for later execution.
+Keep those values and their nested mutable values unchanged while the options can run. When input
+changes, create new input and options rather than modifying the captured values.
+
+Canonical keys copy and deeply freeze the encoded identity. They do not clone or freeze arbitrary
+execution inputs or decoded query data. RPC construction can retain nested caller values; HTTP
+preparation retains the decoded request. In reactive frameworks, rebuild options inside the
+framework's computed value or accessor.
+
 ## No-content and undefined query results
 
 TanStack Query rejects `undefined` as successful query data. When a buffered RPC or HTTP query succeeds
@@ -34,8 +45,11 @@ An HTTP endpoint using `HttpApiSchema.NoContent` decodes its successful 204 resp
 Mutations keep the original success type. A mutation that succeeds with `undefined` still
 resolves to `undefined`.
 
-Accumulated streamed queries and live queries retain emitted values as supplied; they do not
-apply buffered query normalization.
+Live queries also convert each emitted `undefined` to `null`. A stream emitting a value followed
+by `undefined` ends with `null` as its latest query data. Live keys, selectors, and `initialData`
+use the same normalized type. The first emission makes an open live query successful while it
+remains fetching; completion without any emission raises `EffectRpcQueryEmptyStreamError` for RPC
+or `EffectHttpApiQueryEmptyStreamError` for HTTP SSE.
 
-The [packed RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/packed-consumer/runtime.mts) and
-[packed HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/packed-consumer/http-runtime.mts) exercise these normalization rules.
+Accumulated streamed queries retain emitted values as supplied, including `undefined` elements
+inside their cached arrays.
diff --git a/apps/docs/src/content/docs/concepts/http-utility-tree.md b/apps/docs/src/content/docs/concepts/http-utility-tree.md
index ad6f26b..7a32b1f 100644
--- a/apps/docs/src/content/docs/concepts/http-utility-tree.md
+++ b/apps/docs/src/content/docs/concepts/http-utility-tree.md
@@ -6,6 +6,7 @@ description: Understand literal HTTP identifiers, top-level groups, and omitted
 `createHttpApiQueryUtils` builds and freezes an HTTP utility tree when you call it with a literal
 Effect HttpApi declaration. Buffered endpoints without multipart have ordinary query, infinite-query,
 and mutation builders. Buffered multipart endpoints have mutation builders only, regardless of HTTP method.
+Endpoints with one SSE success expose accumulated and live streamed-query builders.
 
 | Declaration                                | Generated path                      |
 | ------------------------------------------ | ----------------------------------- |
@@ -21,21 +22,28 @@ Every retained branch and endpoint has `key()`. Top-level groups have no branch
 custom key encoders still use their declaration group identifier. The factory rejects unsafe
 names, collisions, and invalid encoder configuration before returning any utilities.
 
-The factory omits an entire endpoint if any success alternative streams, including a stream
-wrapped with response headers, or any request alternative uses streaming multipart. It also omits groups
-containing only omitted endpoints. It never keeps just the buffered alternatives of a partially
-supported endpoint. Contradictory multipart metadata causes factory construction to fail. HTTP
-streams and streaming multipart remain deferred; use the ready client directly when you need them.
+| Endpoint success/payload                   | Generated cache views                                        |
+| ------------------------------------------ | ------------------------------------------------------------ |
+| Buffered without multipart                 | Ordinary, infinite and mutation builders; buffered metadata  |
+| Any buffered multipart payload alternative | Mutations only, including mixed plain/multipart alternatives |
+| Single SSE success without multipart       | Accumulated history and latest-value views                   |
+
+SSE events retain decoded response-header wrappers. Decoder policy contributes to both view
+keys; accumulated keys also include retention and refetch policy. Endpoint prefixes select all
+policies. See [HTTP Factory](/effect-api-query/reference/http-factory/) for exact builders.
+
+Raw byte streams, mixed buffered/SSE successes, SSE endpoints with multipart payloads, and streaming
+multipart requests omit the complete endpoint. Groups containing only omitted endpoints disappear.
+Contradictory multipart metadata causes factory construction to fail. Use the ready client directly
+for unsupported streams; applications own byte sinks, reconnection, and resume policy.
 
 Any buffered multipart payload alternative makes the endpoint mutation-only, including an endpoint
 that also accepts ordinary payloads. Its leaf exposes `key()`, `mutationKey()`, and `mutationOptions()`.
 Files and other mutation variables do not become cache identity, so these leaves require no key
 encoder and reject encoder entries. See [upload a file](/effect-api-query/guides/http-queries-and-mutations/#upload-a-file).
 
-Raw-response modes are also deferred. Generated calls force decoded-only responses and exclude
-response controls from their input. See the [HTTP factory](/effect-api-query/reference/http-factory/)
+Raw response objects remain omitted. Ordinary queries, mutations, and SSE views use decoded-only
+responses; buffered metadata views copy status and headers alongside decoded data. Response
+controls are excluded from request input. See the [HTTP factory](/effect-api-query/reference/http-factory/)
 for request, response, and builder contracts, and [Semantic Keys](/effect-api-query/concepts/semantic-keys/)
 for the `http` namespace.
-
-The [public HTTP type consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts)
-and [factory runtime tests](https://github.com/ueberBrot/effect-api-query/blob/main/tests/create-http-api-query-utils.test.ts) check these projection rules.
diff --git a/apps/docs/src/content/docs/concepts/queries-and-mutations.md b/apps/docs/src/content/docs/concepts/queries-and-mutations.md
index c3d167b..cdc0a38 100644
--- a/apps/docs/src/content/docs/concepts/queries-and-mutations.md
+++ b/apps/docs/src/content/docs/concepts/queries-and-mutations.md
@@ -1,38 +1,51 @@
 ---
-title: Query and Mutation Operations
-description: Choose queries, mutations, pagination, or streams for your API calls.
+title: Generated Utility Model
+description: Understand the contract, input, data, error, and cache identity carried by generated leaves.
 ---
 
-Every unary RPC leaf and buffered HTTP endpoint without multipart has query, infinite-query,
-and mutation builders. Your application chooses how to use each operation; neither the RPC
-definition nor the HTTP method determines the builder. Buffered multipart HTTP endpoints expose
-mutations only. HTTP stream builders are deferred.
+A factory combines an Effect declaration with its ready client and a caller-supplied key prefix.
+It eagerly builds an immutable utility tree. Branches represent declaration namespaces;
+leaves represent RPCs or supported HTTP endpoints. Each leaf supplies the builders for the views
+its contract supports.
 
-Use a query when TanStack should cache a result by semantic request identity. For RPCs with a
-payload, the query key contains the normalized, canonical payload. TanStack can refetch or cancel the query.
+## What a generated leaf carries
 
-Use a mutation when the call represents an action or write. Pass variables when the mutation
-runs; their values do not become part of the mutation key.
+| Part              | Contract                                                                                   |
+| ----------------- | ------------------------------------------------------------------------------------------ |
+| Input             | RPC payload constructor input or the complete decoded HTTP request                         |
+| Query data        | Decoded data for the selected cache view, before an observer's `select`                    |
+| Execution failure | Declaration identity plus the complete Effect Cause from a failed Exit                     |
+| Cache identity    | Caller prefix, adapter/declaration path, view, canonical input, and applicable view policy |
+| Options           | Generated key and function with the applicable native TanStack options                     |
 
-Use an infinite query when TanStack should accumulate paginated results. Map each page parameter
-to an RPC payload or complete decoded HTTP request; the mapped initial request becomes part of
-the semantic key. Keep stable filters in every page request. See
-[HTTP pagination](/effect-api-query/guides/http-queries-and-mutations/#load-pages) or
-[RPC pagination](/effect-api-query/reference/generated-builders/#build-an-infinite-query).
+Ordinary buffered reads cache decoded data. Infinite queries cache pages and page parameters.
+Accumulated streamed queries cache emissions in order; live queries cache the latest value.
+HTTP metadata caches decoded data beside immutable status and raw-header snapshots.
+Mutation variables are execution input and do not become mutation-key identity.
 
-Use an accumulated streamed query when the application needs every emitted value in order. Use a
-live query when it needs only the latest emitted value. Both operations close their stream iterator
-when TanStack cancels the query.
+See [Feature Support](/effect-api-query/getting-started/feature-support/) for supported contract
+shapes. [RPC Utility Tree](/effect-api-query/concepts/rpc-utility-tree/) explains dotted tags;
+[HTTP Utility Tree](/effect-api-query/concepts/http-utility-tree/) explains literal group and endpoint
+identifiers and omitted endpoints.
 
-```ts
-const user = useQuery(rpcQuery.users.get.queryOptions({ input: { id: 1 } }))
+## Keep input, cached data, and observer data distinct
 
-const removeUser = useMutation(rpcQuery.users.delete.mutationOptions())
-removeUser.mutate({ id: 1 })
-```
+RPC constructors can supply defaults before key preparation. HTTP builders accept decoded request
+containers without RPC construction. Equivalent canonical input shares identity, while distinct
+views remain separate. See [Inputs and Query Data](/effect-api-query/concepts/data-normalization/)
+and [Semantic Keys](/effect-api-query/concepts/semantic-keys/).
 
-After a successful mutation, invalidate the affected query prefix explicitly. The package does not
-infer relationships between API operations.
+An observer's `select` projects data without changing the cached representation. Buffered and
+live `undefined` values become `null`; mutation results and accumulated stream elements retain
+`undefined`. Infer these types from the generated leaf when extracting reusable application code.
 
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts) and
-[public HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts) check these builder and hook contracts.
+## Ownership at the boundary
+
+The package owns generated keys/functions, view identity, and adaptation of failed Effect Exits.
+TanStack owns caching, observers, retries, invalidation, and framework hooks. The application owns
+ready clients, runtimes, transport, authentication, providers, lifecycle, and relationships between
+writes and reads.
+
+The same generated options work in native QueryClient calls, framework hooks, and router loaders.
+[Defaults and Policies](/effect-api-query/guides/query-defaults/) keeps reusable policy attached to
+the leaf's types. [Integrations](/effect-api-query/integrations/) shows each consumer's wiring.
diff --git a/apps/docs/src/content/docs/concepts/semantic-keys.md b/apps/docs/src/content/docs/concepts/semantic-keys.md
index f6305cc..0f8dffe 100644
--- a/apps/docs/src/content/docs/concepts/semantic-keys.md
+++ b/apps/docs/src/content/docs/concepts/semantic-keys.md
@@ -21,8 +21,11 @@ The default process is:
 3. Canonicalize strict JSON by sorting object keys recursively.
 4. Store the canonical key payload in a flat, prefix-matchable query key.
 
-The generated `queryKeyHashFn` serializes the already-canonical key so TanStack Query uses the same
-identity as the key builders.
+QueryClient owns hashing through its global and prefix defaults. Generated options omit hash
+fields so fetching, stream publications, and native `getQueryData`/`setQueryData` calls address the
+same cache entry. Builders reject per-call `queryKeyHashFn` and `queryHash` overrides.
+Configure hashing before cache use and keep it stable while entries remain. A stream execution
+rejects with `UnsupportedQueryHash` if changed hashing conflicts with a matching cached entry.
 
 Key objects cannot contain `__proto__` or `constructor` properties at any depth. This applies to
 prefixes, Schema output, and custom encoder output.
@@ -35,6 +38,12 @@ Every RPC operation adds its own segment after the RPC path: `query`, `infinite`
 keep different cache shapes from colliding while root, branch, and RPC prefixes continue to match
 all descendant operations.
 
+Accumulated-stream keys also include normalized retention and refetch policy. Unlimited/reset is
+the default identity; different bounds or modes have separate cache entries. Supply the same policy
+to `streamedKey` and `streamedOptions` for exact cache access. Broad prefixes continue to match all
+views. Treat the concrete suffix as opaque. Applications persisting query data choose schema and
+key-version busters as described in [Switch Cache Owners](/effect-api-query/guides/switch-cache-owners/).
+
 Unsupported values, failed construction, and failed encoding raise `EffectRpcQueryKeyError` before
 network execution. Payloads whose encoding needs services or that contain redacted values require a
 [custom key encoder](/effect-api-query/guides/custom-key-encoders/).
@@ -47,8 +56,5 @@ infer every possible equivalence between HTTP requests.
 
 Client middleware does not contribute to that declared identity. Include safe user, tenant, or
 other identifiers in the caller prefix when they affect results. See the
-[HTTP factory reference](/effect-api-query/reference/http-factory/#cache-identity-and-failures) and
+[HTTP factory reference](/effect-api-query/reference/http-builders/#cache-identity-and-failures) and
 [HTTP encoder guide](/effect-api-query/guides/custom-key-encoders/#http-requests) for the complete rules.
-
-The [RPC key tests](https://github.com/ueberBrot/effect-api-query/blob/main/tests/create-rpc-query-utils-keys.test.ts) and
-[HTTP key tests](https://github.com/ueberBrot/effect-api-query/blob/main/tests/http-semantic-keys.test.ts) verify canonical identity and its failure cases.
diff --git a/apps/docs/src/content/docs/examples.md b/apps/docs/src/content/docs/examples.md
index 8b3f9cd..186f203 100644
--- a/apps/docs/src/content/docs/examples.md
+++ b/apps/docs/src/content/docs/examples.md
@@ -53,38 +53,17 @@ demo authorization header through its HTTP client middleware.
 
 ### Compare HTTP and RPC
 
-The HTTP panel uses `createHttpApiQueryUtils` from `effect-api-query`; the RPC panels
-use `createRpcQueryUtils` from the same package root. The application owns both ready clients,
-their runners, and the QueryClient. During disposal, it cancels queries before releasing client
-resources.
-
-Use the HTTP directory to read users, load another page, and create or delete a user. Each write
-explicitly invalidates both generated user prefixes, so the RPC directory reflects HTTP writes
-and the HTTP directory reflects RPC writes. The two adapters retain separate cache keys.
-Choose **Reset directory** to restore the deterministic shared data.
-
-The HTTP user selector passes `skipToken` until a user is selected. HTTP request inputs use
-structured decoded parts such as `params`, `query`, and `payload`; RPC inputs retain their
-payload-constructor defaults. Deleting a user demonstrates an HTTP no-content mutation whose
-result remains `undefined`.
-
-Trigger the HTTP failure to inspect `EffectHttpApiQueryError` and its preserved `Cause`.
-The package adds declaration identifiers to error metadata; upstream Causes can still contain
-request, response, or schema issue values.
-
-Choose **Start slow HTTP query**, wait for **HTTP: Ready to cancel**, then choose
-**Cancel HTTP query**. After the HTTP request aborts, the example observes server interruption for
-that operation. Each panel owns a distinct operation ID, so cancelling an RPC query leaves a
-concurrent HTTP query running. This cancels observation and work in this handler; it does not
-compensate completed mutations. The RPC cancellable-command panel demonstrates explicit domain
-cancellation.
-
-The executable sources are
-[application ownership](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/application.ts),
-[HTTP contracts](https://github.com/ueberBrot/effect-api-query/tree/main/examples/contracts/src), and
-[server handlers](https://github.com/ueberBrot/effect-api-query/tree/main/examples/server/src).
-The repository type-checks the application against the public package root and exercises it
-through the real server and browser suites.
+| Try                                                           | Observable result                                                | Complete source                                                                                                                          |
+| ------------------------------------------------------------- | ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| Create/delete a user in either directory                      | Both adapters refresh through explicit cross-prefix invalidation | [application.ts](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/application.ts)                     |
+| Trigger a declared HTTP failure                               | HTTP execution metadata and preserved Cause                      | [http-section.tsx](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/components/sections/http-section.tsx) |
+| Start a slow query, wait for **Ready to cancel**, then cancel | Only that operation is interrupted; completed writes remain      | [Cancellation](/effect-api-query/guides/cancellation/)                                                                                   |
+| Switch cache owner or reload                                  | Private caches retire; allowlisted directory DTOs may persist    | [owner-cache.ts](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/owner-cache.ts)                     |
+
+Copy [shared contracts](https://github.com/ueberBrot/effect-api-query/tree/main/examples/contracts/src),
+[ready-client ownership](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/application.ts),
+and [server handlers](https://github.com/ueberBrot/effect-api-query/tree/main/examples/server/src).
+The application owns clients, runners, providers, cross-adapter invalidation and disposal.
 
 ## Run TanStack Start
 
@@ -92,45 +71,39 @@ through the real server and browser suites.
 vp run tanstack-start-dev
 ```
 
-This task starts one full-stack process. The browser and server-rendering clients call the
-Start application's `/rpc` and `/api/$` routes. Choose **HTTP users** to inspect the server-rendered directory
-and first page, reuse the hydrated cache, and try the same HTTP operations as in Vite React.
-Choose **HTTP SSR failure** to see the browser retry a failed server query that was omitted
-from dehydration.
+This task starts one full-stack process at `http://127.0.0.1:3000`, serving `/rpc` and `/api/$`.
+Choose **HTTP users** for server-rendered data and hydrated navigation, or **HTTP SSR failure**
+for browser refetch of a failure omitted from dehydration. Each request owns its cache and
+clients; the browser owns separate resources.
 
-Server rendering uses the trusted origin `http://127.0.0.1:3000`. If the Start server listens
-elsewhere, set the server-only `EXAMPLE_API_ORIGIN` environment variable to its HTTP(S) origin,
-without a path, credentials, query, or fragment. Browser requests stay on the same origin.
-See [TanStack Start](/effect-api-query/guides/tanstack-start/) for request ownership, authentication,
-cache isolation, and hydration setup.
+Copy the [router](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/router.tsx),
+[SSR codecs](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/lib/query-ssr.ts),
+and [failure route](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/routes/http-failure.tsx).
+See [TanStack Start](/effect-api-query/guides/tanstack-start/) for the library integration.
 
-## Pause a query until a user is selected
+## Try cancellable commands
+
+Use the **Cancellable commands** panel to run two commands with independent operation IDs and
+cancel one while the other progresses. The [complete workflow](/effect-api-query/examples/cancellable-commands/)
+explains its start/status/cancel protocol, same-ID retries, and application-owned workers.
 
-In either application, find **Choose before fetching**. With **No user selected**, the generated
-query uses `{ input: skipToken }` and sends no lookup request. Select **User 2: Edsger Dijkstra** to
-load the user summary, then clear and reselect it within 30 seconds to reuse the cached result.
+## Pause a query until a user is selected
 
-The skipped and active queries preserve the same `select` and `staleTime` options. The example uses
-ordinary `useQuery`; the TanStack Start loader leaves this interactive query paused during server rendering.
+In either app's **Choose before fetching** panel, **No user selected** sends no lookup.
+Select a user to fetch its summary; clear and reselect within 30 seconds to reuse the cache.
+Skipped and active options retain the same `select` and `staleTime`.
 
 ## Compare full and bounded stream history
 
-In either application, let the diagnostic stream finish, then choose **Replay newest 2**.
-The accumulated history retains only "Workspace synchronized" and "Ready"; earlier updates disappear
-as new ones arrive. Choose **Replay full history** to retain all four states again. The live query
-continues to show only "Ready".
-
-The bounded replay supplies `maxChunks: 2` to `streamedOptions`. Both controls reuse the generated
-streamed key: the bound changes retention policy, not RPC identity. The application keeps the selected
-policy for subsequent refetches. TanStack Start also demonstrates this after hydrating its server snapshot.
+After diagnostics finish, **Replay newest 2** retains the latest two states; **Replay full history**
+retains all four. The live view shows only the latest state. Each accumulated policy has its own
+key. See [Choose Stream History](/effect-api-query/guides/choose-stream-history/).
 
 ## Inspect request-local metadata
 
-In either application's diagnostics panel, choose **Trigger declared failure**. Its generated
-mutation options supply the `x-request-source: diagnostics-panel` RPC header. Application-wide
-authorization still comes from the shared client runner. The same `rpcOptions` input works with
-queries, infinite queries, and both stream builders; see
-[Generated Builders](/effect-api-query/reference/generated-builders/#request-local-rpc-options).
+**Trigger declared failure** supplies the request-local `x-request-source: diagnostics-panel`
+RPC header while shared authorization stays on the client runner. See
+[Request-local RPC Options](/effect-api-query/reference/generated-builders/#request-local-rpc-options).
 
 ## Build the examples
 
diff --git a/apps/docs/src/content/docs/examples/cancellable-commands.md b/apps/docs/src/content/docs/examples/cancellable-commands.md
new file mode 100644
index 0000000..3958b94
--- /dev/null
+++ b/apps/docs/src/content/docs/examples/cancellable-commands.md
@@ -0,0 +1,104 @@
+---
+title: Cancellable Commands
+description: Run the example's explicit command protocol without treating mutation cancellation as rollback.
+---
+
+This application workflow demonstrates long-running server work with an operation ID, observable
+progress, and an explicit cancellation request. Run the
+[Vite React example](/effect-api-query/examples/#run-vite-react) and use the **Cancellable commands**
+panel. The Start application serves the same contract and handlers.
+
+The library supplies ordinary generated query and mutation options. The application supplies the
+command protocol, server workers, progress policy, and retention. For query signals and iterator
+cleanup, see the [Cancellation contract](/effect-api-query/guides/cancellation/).
+
+## Cancel a command while its mutation is pending
+
+Use an explicit cancel RPC for long-running commands. The Vite React example provides
+`commands.start`, `commands.status`, and `commands.cancel` in the shared contract. Each command
+has a client-generated operation ID. The start mutation waits for a terminal result; a separate
+query observes progress, and a separate mutation requests cancellation.
+
+In the React component setup, import `useState`, `useQuery`, and `useMutation` from their native
+packages. With the example's ready `rpcQuery` and QueryClient:
+
+```ts
+const [operationId] = useState(() => crypto.randomUUID())
+const input = { operationId }
+const reconcile = async () => {
+  await queryClient.invalidateQueries({
+    queryKey: rpcQuery.commands.status.queryKey(input),
+  })
+}
+
+const start = useMutation(rpcQuery.commands.start.mutationOptions({ onSettled: reconcile }))
+const cancel = useMutation(rpcQuery.commands.cancel.mutationOptions({ onSettled: reconcile }))
+const status = useQuery(
+  rpcQuery.commands.status.queryOptions({
+    input,
+    enabled: start.status !== 'idle',
+    refetchInterval: (query) =>
+      query.state.data?.state === 'running' ||
+      query.state.status === 'error' ||
+      query.state.data === undefined ||
+      (query.state.data === null && start.isPending)
+        ? 100
+        : false,
+  }),
+)
+```
+
+In the start and cancel button handlers, call the corresponding mutation:
+
+```ts
+start.mutate(input)
+cancel.mutate(input)
+```
+
+Disable start while pending, after success, or when status confirms an accepted command.
+After a failed start with no accepted command, retry with the same operation ID; an uncertain
+response must not create a second command. Disable cancel before start, while cancellation is
+pending, or after a terminal status. The
+[complete command panel](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/components/sections/commands-section.tsx)
+includes the UI.
+
+The cancel handler signals the worker and waits until it has stopped. The cancel mutation's
+`onSettled` callback then invalidates the generated status key. The active query refetches the
+server's status even if the cancel request failed. Poll unresolved or failed status reads and
+running commands. Stop at a terminal status, or when a settled start has no corresponding command.
+The application chooses this invalidation policy.
+
+A cancelled command returns `{ state: 'cancelled', ... }` successfully. TanStack therefore reports
+both mutations as `success` and runs their normal callbacks. The domain state does not add a
+`cancelled` MutationCache state. Each operation ID has its own query key and worker, so cancelling
+one command leaves another running.
+
+Run the Vite React example and use the **Cancellable commands** panel to try two concurrent
+commands. The TanStack Start application hosts the same contract and handlers at `/rpc`; its
+`application.rpcQuery.commands` exposes these same framework-neutral options for hooks, loaders,
+and QueryClient. It can reuse the workflow above with its own QueryClient.
+
+## Choose what cancellation means
+
+| Action                    | Result                                                                                      |
+| ------------------------- | ------------------------------------------------------------------------------------------- |
+| Stop observing a query    | Removes local observation; whether work stops depends on the query lifecycle and transport. |
+| Interrupt an Effect       | Requests cooperative interruption and runs its finalizers.                                  |
+| Call `commands.cancel`    | Requests cooperative server cancellation by operation ID and waits for a terminal state.    |
+| Compensate committed work | Requires a separate application operation that reverses or offsets prior effects.           |
+
+Transport interruption is cooperative and depends on transport support. An explicit cancel RPC is the
+durable application contract for requesting server cancellation. The slow-query demo
+adds a transport-specific `diagnostics.cancel` call when its local Effect is interrupted; the
+package itself does not provide that behavior.
+
+The command example owns workers in the server Scope. Unmounting a view or interrupting the
+client's wait does not cancel these workers automatically. A cancel request stops future steps;
+completed steps remain recorded. Cancellation after completion returns the completed result without
+promising a rollback. Repeating a start with the same ID returns the existing result; a cancel
+that arrives before start reserves that ID as cancelled.
+
+This example stores operation records in memory until the example is reset or the server stops.
+Production applications need their own authorization, durable storage, and retention policy if
+operations must survive restarts. The explicit RPC contract does not make this in-memory example
+a durable job queue.
diff --git a/apps/docs/src/content/docs/getting-started/compatibility-and-stability.md b/apps/docs/src/content/docs/getting-started/compatibility-and-stability.md
index f605a6c..dbeebb0 100644
--- a/apps/docs/src/content/docs/getting-started/compatibility-and-stability.md
+++ b/apps/docs/src/content/docs/getting-started/compatibility-and-stability.md
@@ -7,16 +7,17 @@ Both factories use the same public `effect-api-query` package root and peer depe
 The package's [manifest](https://github.com/ueberBrot/effect-api-query/blob/main/package.json)
 defines peer requirements; the [workspace catalog](https://github.com/ueberBrot/effect-api-query/blob/main/pnpm-workspace.yaml)
 records the versions tested in this repository. See the
-[compatibility reference](/effect-api-query/reference/compatibility-and-limits/) for how these
-requirements are tested.
+[compatibility reference](/effect-api-query/reference/compatibility-and-limits/) for integration versions and limits.
 
 The package is ESM-only and targets ES2022. Enable strict TypeScript checking.
 
 The tested Effect release is stable, but its RPC and HTTP API modules declare unstable APIs.
-The package therefore pins one exact Effect peer version. Upgrade Effect and this package together.
+The package therefore pins one exact Effect peer version. Keep runtime, testing, and platform
+packages on a compatible coordinated Effect set that matches it. Before changing that set, verify
+the peer requirements and tested integrations of the selected package release.
 
-The first release is still pending, so breaking changes remain possible. Review the release notes
-when upgrading. Query Core's streamed-query interface is experimental and may change between v5 releases.
+Query Core's streamed-query interface is experimental and may change between v5 releases. Keep
+framework Query wrappers aligned with their application's Query Core version.
 
 Choose the [RPC quick start](/effect-api-query/getting-started/quick-start/) or
 [HTTP quick start](/effect-api-query/getting-started/http-quick-start/) for your declaration.
diff --git a/apps/docs/src/content/docs/getting-started/feature-support.md b/apps/docs/src/content/docs/getting-started/feature-support.md
index 6782212..ae4e62b 100644
--- a/apps/docs/src/content/docs/getting-started/feature-support.md
+++ b/apps/docs/src/content/docs/getting-started/feature-support.md
@@ -7,23 +7,23 @@ description: Choose the RPC or HTTP adapter and find its supported TanStack Quer
 definitions. Use `createRpcQueryUtils` for RPC and `createHttpApiQueryUtils` for HTTP, both imported
 from the package root.
 
-The [capability matrix](/effect-api-query/reference/compatibility-and-limits/#capability-matrix)
-compares RPC and HTTP support. It lists generated features, tested integrations, application
-responsibilities, deferred operations, and missing upstream integration points.
+Keep your native Effect declarations and ready clients. Effect and your application own the
+server, transport, authentication, and resource lifetime; this package derives the Query-facing
+keys, functions, and options.
 
 ## Pick the operation
 
-Use ordinary queries for cached reads, infinite queries for pagination, and mutations for commands.
-Unary RPCs and buffered HTTP endpoints without multipart provide all three builders. Buffered
-multipart HTTP endpoints provide mutations only. Writes refresh cached reads only when your
-application invalidates the affected keys.
+| Contract                               | Available views                              | Details                                                                                                                    |
+| -------------------------------------- | -------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| Unary RPC / buffered nonmultipart HTTP | Query, infinite query, mutation              | [RPC Builders](/effect-api-query/reference/generated-builders/), [HTTP Factory](/effect-api-query/reference/http-factory/) |
+| Buffered nonmultipart HTTP             | Separate decoded data/status/header metadata | [ETag workflow](/effect-api-query/guides/http-metadata/#update-with-an-etag)                                               |
+| Buffered multipart HTTP                | Mutation with explicit `FormData`            | [Upload](/effect-api-query/guides/http-queries-and-mutations/#upload-a-file)                                               |
+| RPC stream / unambiguous HTTP SSE      | Accumulated history or latest value          | [Choose Stream History](/effect-api-query/guides/choose-stream-history/)                                                   |
 
-RPC streams also have `streamedOptions` to accumulate values and `liveOptions` to retain the latest
-value. Buffered multipart HTTP uploads accept explicit `FormData` through `mutationOptions`;
-see [upload a file](/effect-api-query/guides/http-queries-and-mutations/#upload-a-file).
-HTTP streams, streaming multipart, and raw-response modes are deferred. The factory omits an
-HTTP endpoint from the generated utility tree if it has any streaming success or streaming multipart
-request alternative.
+Use queries for cached reads and mutations for commands; writes refresh reads only when the
+application invalidates them. Raw byte streams, mixed buffered/SSE successes, streaming
+multipart and raw-response modes are omitted, as are SSE endpoints with multipart payloads.
+See [Compatibility and Limits](/effect-api-query/reference/compatibility-and-limits/).
 
 ## Plan application ownership
 
@@ -35,8 +35,5 @@ Include a safe user or tenant identity in `keyPrefix` whenever client configurat
 returned data. Keep credentials out of keys. See [semantic keys](/effect-api-query/concepts/semantic-keys/)
 and [client lifecycle](/effect-api-query/concepts/client-lifecycle/).
 
-Start with the [RPC tutorial](/effect-api-query/getting-started/quick-start/) or
-[HTTP tutorial](/effect-api-query/getting-started/http-quick-start/), then use the shared guides for
-[conditional queries](/effect-api-query/guides/conditional-queries/),
-[cache management](/effect-api-query/guides/cache-management/), and
-[cancellation](/effect-api-query/guides/cancellation/).
+Start with the [RPC Quick Start](/effect-api-query/getting-started/quick-start/) or
+[HTTP Quick Start](/effect-api-query/getting-started/http-quick-start/).
diff --git a/apps/docs/src/content/docs/getting-started/http-quick-start.md b/apps/docs/src/content/docs/getting-started/http-quick-start.md
index 1fa18c7..887d1e4 100644
--- a/apps/docs/src/content/docs/getting-started/http-quick-start.md
+++ b/apps/docs/src/content/docs/getting-started/http-quick-start.md
@@ -1,21 +1,16 @@
 ---
 title: HTTP Quick Start
-description: Declare an HttpApi, own a ready client, and run a generated query and mutation.
+description: Acquire an HttpApiClient and use generated query and mutation options.
 ---
 
-This tutorial connects an Effect HttpApi client to TanStack Query Core. You will declare two
-endpoints, acquire a ready client, read a user, and create another user.
+First [install the package](/effect-api-query/getting-started/installation/). The server must
+serve the same `usersApi` contract at `http://localhost:3000`. Share the contract between your
+server and browser application.
 
-First [install the package](/effect-api-query/getting-started/installation/). Use a server at
-`http://localhost:3000` that implements the declaration below and has an existing user with ID `1`.
-Change the base URL to your server. For browser requests, configure the server's CORS policy to
-allow the application's origin.
-For complete HTTP handlers and applications, [run the examples](/effect-api-query/examples/).
+## Acquire the client and execute requests
 
-## Declare, connect, and call
-
-Save this as `http-client.ts` in your application. Share the HttpApi declaration with your server;
-keep the runtime, client, and `QueryClient` in the application that manages their lifetime.
+This complete module defines the API, acquires the ready client through a ManagedRuntime,
+reads a user, writes a user, and releases its resources. Replace the base URL with your server.
 
 ```ts
 import { MutationObserver, QueryClient } from '@tanstack/query-core'
@@ -73,35 +68,30 @@ try {
 }
 ```
 
-`HttpApiClient.make` creates a ready client using the application's Fetch runtime. Pass that same
-runtime's `runPromiseExit` to the factory so generated calls use that runner and
-forward TanStack's query abort signal.
-
-HTTP input is the client's decoded request, with the `params`, `query`, `headers`, and `payload`
-containers declared by the endpoint. Pass `id` as a number; the client handles its wire encoding.
-The POST mutation receives `{ payload: { name: 'Ada' } }`.
-
-The request must supply `query: { locale: 'en' }` even though `locale` has a constructor default.
-HTTP builders do not construct RPC payloads or fill constructor defaults.
-
-Groups and endpoint identifiers retain their literal names. `users` and `get` produce
-`http.users.get`; a name containing a dot would require bracket access. A group declared with
-`topLevel: true` places its endpoints at the utility root.
-
-## Choose cache and resource ownership
-
-Buffered endpoints without multipart offer both query and mutation builders, regardless of HTTP method.
-Buffered multipart endpoints expose mutations only; see [upload a file](/effect-api-query/guides/http-queries-and-mutations/#upload-a-file).
-Choose a query for an idempotent cached read and a mutation for a command. After a write, invalidate
-the affected keys explicitly. RPC and HTTP have separate key namespaces, so applications that
-expose the same resource through both must invalidate the affected keys in both namespaces.
-
-The `finally` block cancels queries, clears the cache, and disposes the runtime. In a UI, keep these
-resources alive for the application lifetime and settle pending mutations before disposal. Include
-a safe user or tenant identity in `keyPrefix` whenever client configuration affects returned data.
-
-The repository compiles this complete snippet against the public package root in
-[`tests/types/docs-http-quick-start.ts`](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-http-quick-start.ts)
-and checks that this page matches it. Continue with
-[HTTP queries and mutations](/effect-api-query/guides/http-queries-and-mutations/) and the
-[HTTP factory reference](/effect-api-query/reference/http-factory/).
+HTTP input is the **decoded request**. Supply the endpoint's declared `params`, `query`, `headers`,
+and `payload` containers; the client handles wire encoding. HTTP builders do not apply Schema
+constructor defaults: this request explicitly supplies `locale: 'en'`.
+
+The runtime provides the HTTP transport and forwards TanStack's signal through `runPromiseExit`.
+Keep the runtime and client resources alive while queries and mutations use them. Invalidation is
+application policy; this example refreshes the `users` endpoint prefix after creation.
+
+Buffered nonmultipart endpoints offer query and mutation builders regardless of HTTP method;
+buffered multipart endpoints offer mutations only. Literal group/endpoint names become utility
+paths; dots require bracket access, and `topLevel: true` places endpoints at the root.
+See [HTTP Factory](/effect-api-query/reference/http-factory/).
+
+## Keep a browser client alive
+
+The module above awaits its mutation before disposal. For components, acquire once before
+mounting and keep the client alive for the application lifetime. Follow
+[React client setup](/effect-api-query/guides/react-query/#acquire-and-mount-the-client) for a complete provider,
+component, and cleanup callback.
+
+For streams or concurrent writes, follow
+[Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) before disposal. Continue with
+[pagination](/effect-api-query/guides/pagination/),
+[streaming](/effect-api-query/guides/streaming/), or
+[HTTP metadata](/effect-api-query/guides/http-metadata/).
+For request containers and file uploads, use
+[HTTP Requests and Uploads](/effect-api-query/guides/http-queries-and-mutations/).
diff --git a/apps/docs/src/content/docs/getting-started/installation.md b/apps/docs/src/content/docs/getting-started/installation.md
index f2f8f63..60d4c3d 100644
--- a/apps/docs/src/content/docs/getting-started/installation.md
+++ b/apps/docs/src/content/docs/getting-started/installation.md
@@ -14,7 +14,7 @@ by the package. If your application already pins Effect or disables automatic pe
 install the Effect version from the package's `peerDependencies` and resolve any peer mismatch
 before continuing. The [package manifest](https://github.com/ueberBrot/effect-api-query/blob/main/package.json)
 and [workspace catalog](https://github.com/ueberBrot/effect-api-query/blob/main/pnpm-workspace.yaml)
-are the source for supported and tested versions.
+define peer requirements and repository integration versions.
 
 React applications also need `@tanstack/react-query`, matching their Query Core version:
 
@@ -23,8 +23,7 @@ pnpm add @tanstack/react-query
 ```
 
 Use strict TypeScript checking, ESM, and an ES2022-capable application. See the
-[compatibility reference](/effect-api-query/reference/compatibility-and-limits/) for the tested
-compiler and framework integrations.
+[compatibility reference](/effect-api-query/reference/compatibility-and-limits/) for compiler and framework versions.
 
-Continue with the [RPC quick start](/effect-api-query/getting-started/quick-start/) or
-[HTTP quick start](/effect-api-query/getting-started/http-quick-start/).
+Continue with the [HTTP API quick start](/effect-api-query/getting-started/http-quick-start/) or
+[RPC quick start](/effect-api-query/getting-started/quick-start/).
diff --git a/apps/docs/src/content/docs/getting-started/quick-start.md b/apps/docs/src/content/docs/getting-started/quick-start.md
index 9361b7f..c47bb68 100644
--- a/apps/docs/src/content/docs/getting-started/quick-start.md
+++ b/apps/docs/src/content/docs/getting-started/quick-start.md
@@ -1,21 +1,16 @@
 ---
 title: RPC Quick Start
-description: Declare an RPC group, own a ready client, and run a generated query and mutation.
+description: Acquire an RPC client and use generated query and mutation options.
 ---
 
-This tutorial connects an Effect RPC client to TanStack Query Core. You will declare two operations,
-acquire a ready flat client, read a user, and create another user.
+First [install the package](/effect-api-query/getting-started/installation/). The server must
+serve the same `usersRpc` contract at `http://localhost:3000/rpc` with Effect's JSON RPC protocol.
+Share the contract between your server and browser application.
 
-First [install the package](/effect-api-query/getting-started/installation/). Use a server at
-`http://localhost:3000/rpc` that implements the declaration below with JSON RPC serialization.
-The server must have an existing user with ID `1`. Change the URL to your server. For browser
-requests, configure the server's CORS policy to allow the application's origin. For a complete
-server and browser application, [run the examples](/effect-api-query/examples/).
+## Acquire the client and execute requests
 
-## Declare, connect, and call
-
-Save this as `rpc-client.ts` in your application. The declaration belongs in a shared module when
-you connect your own server and client. Only the client application imports `effect-api-query`.
+This complete module defines the contract, acquires a ready flat client, reads a user, writes a
+user, and releases its resources. Replace the URL with your server's RPC endpoint.
 
 ```ts
 import { MutationObserver, QueryClient } from '@tanstack/query-core'
@@ -75,31 +70,28 @@ try {
 }
 ```
 
-`RpcClient.make(..., { flatten: true })` acquires the ready client inside the application's scope.
-The factory derives the utility tree from that client and uses `Effect.runPromiseExit`
-unless you supply a custom runner.
-
-The query accepts the RPC payload's constructor input. Here `{ id: 1 }` is valid because the
-schema constructor supplies `locale: 'en'`. Use deterministic constructor defaults: key preparation
-and ready-client execution construct the payload separately.
+Dotted tags become nested paths: `users.get` becomes `rpc.users.get`. The factory uses
+`Effect.runPromiseExit` by default; supply a signal-aware `runPromiseExit` when execution needs
+services. Keep the client's Scope and runner alive while the utilities are used.
 
-Dotted RPC tags become nested properties: `users.get` becomes `rpc.users.get`. The query returns
-a decoded user. Pass mutation variables to `mutate`, then invalidate the cached reads affected by
-the write.
+Query input is the RPC payload's **constructor input**: `{ id: 1 }` works because its constructor
+supplies `locale: 'en'`. Defaults must be deterministic because key preparation and client execution
+construct the payload separately. The decoded response is the query data; each mutation receives
+its own variables when `mutate` runs.
 
-## Keep the owner alive
+Invalidation is application policy. This example refreshes all `users` reads after creation.
+A safe user or tenant identity belongs in `keyPrefix` when it affects returned data; credentials
+do not. RPC and HTTP keys have separate namespaces.
 
-The `finally` block cancels queries, clears their cache, and closes the client scope even when a
-call fails. This short program waits for its mutation before cleanup. In a UI, keep the owner alive
-for the application lifetime and settle pending mutations before disposal; query cancellation does
-not cancel mutations.
+## Keep a browser client alive
 
-Use a safe user or tenant identity in `keyPrefix` when client configuration affects which data
-the client can return. See [Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) and
-[Cache Keys](/effect-api-query/concepts/semantic-keys/) before sharing clients or caches.
+The module above finishes each operation before disposing its resources. For an application,
+acquire once before mounting components and release after unmounting them. Use the
+[React client setup](/effect-api-query/guides/react-query/#acquire-and-mount-the-client) for a provider, component,
+and cleanup callback. Its HTTP client setup can be replaced with the RPC acquisition above.
 
-The repository compiles this complete snippet against the public package root in
-[`tests/types/docs-rpc-quick-start.ts`](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-rpc-quick-start.ts)
-and checks that this page matches it. Continue with
-[queries and mutations](/effect-api-query/concepts/queries-and-mutations/) or the
-[generated RPC builders](/effect-api-query/reference/generated-builders/).
+Before disposing clients that also serve streams or concurrent mutations, stop consumers and
+drain queries, local stream cleanup, and accepted mutations. Follow
+[Client Lifecycle](/effect-api-query/concepts/client-lifecycle/).
+For hooks, continue with [React Query](/effect-api-query/guides/react-query/); for exact method
+and input contracts, use [RPC Builders](/effect-api-query/reference/generated-builders/).
diff --git a/apps/docs/src/content/docs/guides/angular-query.md b/apps/docs/src/content/docs/guides/angular-query.md
new file mode 100644
index 0000000..fa84c22
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/angular-query.md
@@ -0,0 +1,52 @@
+---
+title: Angular Query
+description: Rebuild generated options from Angular signals and keep client lifetime in the application.
+---
+
+Build generated options inside Angular's reactive accessor so input changes produce a new key
+and query function. This applies to both factories and every generated query view.
+
+The examples target Angular 22.2.1 with Angular Query experimental 5.104.0 and Query Core 5.104.0.
+
+Keep [captured inputs unchanged](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+while their options can execute.
+
+## Create queries in an injection context
+
+Register `provideTanStackQuery(queryClient)` in your application providers. Construct queries
+inside an Angular injection context and read the signal inside the accessor passed to `injectQuery`.
+Create `rpc` from your [ready client](/effect-api-query/getting-started/quick-start/).
+Here `users.read` accepts `{ id: number }` and returns a user with `name`.
+In an existing component's field initializers, with `signal` from `@angular/core` and
+`injectQuery` from `@tanstack/angular-query-experimental`:
+
+```ts
+readonly id = signal(1)
+readonly user = injectQuery(() =>
+  rpc.users.read.queryOptions({
+    input: { id: this.id() },
+    select: (user) => user.name,
+  }),
+)
+```
+
+Use `injectInfiniteQuery` with `infiniteOptions` and `injectMutation` with `mutationOptions`.
+Supply each mutation's input through its execution variables. Angular query results expose
+signals such as `data()`, `error()`, and `fetchStatus()`.
+
+Use the same accessor for `streamedOptions`, `liveOptions`, and HTTP `metadataOptions`.
+
+## Choose native options carefully
+
+Angular's defined-data overload accepts a query function rather than `skipToken`. A skipped query
+therefore retains `undefined` in its `data()` type even when it has defined `initialData`. An
+initial-data function that may return `undefined` also produces optional result data.
+
+## Own the native integration
+
+Follow the [shared integration lifetime](/effect-api-query/integrations/#own-the-cache-and-client-lifetime)
+for providers, observer removal, stream finalizers, and accepted mutations. Match this native
+wrapper to the application's Query Core and the framework's supported compiler/tooling.
+
+Angular core, common, compiler, and platform-browser should share one release. Server rendering
+and hydration remain application integrations.
diff --git a/apps/docs/src/content/docs/guides/cache-filters.md b/apps/docs/src/content/docs/guides/cache-filters.md
new file mode 100644
index 0000000..85b6428
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/cache-filters.md
@@ -0,0 +1,149 @@
+---
+title: Cache Keys and Filters
+description: Read typed entries and target native cache operations with generated prefixes and exact keys.
+---
+
+Use a generated concrete key for typed `getQueryData` and `setQueryData`. Use root, branch, leaf,
+or view prefixes for native `invalidateQueries`, `cancelQueries`, and query-state filters.
+Import `viewPrefix` from `effect-api-query` to select one supported cache view. Choose the scope before
+adding `type`, `stale`, `fetchStatus`, or `predicate` conditions:
+
+| Scope                 | Key                                                    | Matches                                                                |
+| --------------------- | ------------------------------------------------------ | ---------------------------------------------------------------------- |
+| Root                  | `rpc.key()` or `http.key()`                            | All cached query views in that utility tree                            |
+| Branch                | `rpc.users.key()`                                      | Every descendant leaf and query view                                   |
+| Leaf                  | `rpc.users.get.key()`                                  | Ordinary and infinite queries; HTTP leaves also include metadata views |
+| Operation             | `viewPrefix(rpc.users.get, 'query')`                   | Ordinary queries for that leaf                                         |
+| Encoded partial input | Operation prefix followed by an encoded partial object | Entries containing those encoded fields                                |
+| Exact entry           | Generated concrete key with `exact: true`              | One complete cache identity, including its stream policy               |
+
+A streaming leaf prefix includes accumulated and live views. Use `viewPrefix(leaf, 'streamed')`
+or `viewPrefix(leaf, 'live')` to select one representation. HTTP buffered metadata uses `metadata`; pagination uses `infinite`.
+Mutation keys belong to TanStack's separate mutation cache, and query invalidation does not affect
+pending mutations.
+
+## Choose the cache operation
+
+Invalidation refreshes affected reads according to TanStack's native policy. It does not execute
+or cancel pending mutations. The application chooses which read keys a successful write affects.
+
+RPC roots append `rpc` to the caller prefix. HTTP roots append `http` and the HttpApi identifier.
+The factories keep separate caches even when the caller prefix is the same. Use the original
+caller prefix to deliberately match both; use a generated root to match one utility tree.
+
+For response seeding and rollback, follow [Optimistic Updates](/effect-api-query/guides/optimistic-writes/).
+Map delivered domain events with [Refresh from Events](/effect-api-query/guides/refresh-from-events/).
+[Switch Cache Owners](/effect-api-query/guides/switch-cache-owners/) covers private data when
+users, tenants, sessions, or permissions change. [Defaults and Policies](/effect-api-query/guides/query-defaults/)
+uses the same prefixes to register native cache policy.
+
+## Filter RPC queries
+
+These filters assume your own unary `users.get` and streaming `users.watch` declarations share
+these payload fields. In their contract module, import `Effect` and `Schema` from `effect`:
+
+```ts
+const payload = {
+  id: Schema.FiniteFromString,
+  locale: Schema.String.pipe(Schema.withConstructorDefault(Effect.succeed('en'))),
+}
+```
+
+Derive `rpc` from this group and its ready client using the factory setup in
+[RPC Quick Start](/effect-api-query/getting-started/quick-start/). In a cache callback, select
+every locale for user 1 with an encoded partial filter:
+
+```ts
+const queryPrefix = viewPrefix(rpc.users.get, 'query')
+await queryClient.invalidateQueries({
+  queryKey: [...queryPrefix, { id: '1' }],
+  type: 'inactive',
+  stale: false,
+})
+```
+
+For one complete request, preserve its generated DataTag and use `exact: true`:
+
+```ts
+const queryKey = rpc.users.get.queryKey({ id: 1, locale: 'en' })
+const user = queryClient.getQueryData(queryKey)
+await queryClient.invalidateQueries({ queryKey, exact: true })
+```
+
+Partial matching compares stored canonical key payloads. Here `FiniteFromString` encodes the numeric
+constructor input `1` as `"1"`, so the partial object must use `id: "1"`. A raw `id: 1` matches no
+entry. An omitted field places no constraint; specifying `locale: "en"` selects that locale.
+Nested objects match recursively, arrays match by position, and scalar values must match exactly.
+A scalar string filter does not perform substring matching.
+
+Use the concrete builder for complete constructor input. Calling `queryKey({ id: 1 })` materializes
+the default `locale: "en"`; its key therefore cannot express every locale for user 1. Passing only
+`{ locale: "en" }` rejects the missing required `id`. Do not cast partial constructor input into a
+key builder or run it through the full payload constructor to derive a broad filter.
+
+`[...viewPrefix(rpc.users.watch, 'streamed'), { id: '1' }]` stops before the stream-policy suffix and matches every retention bound and
+refetch mode for that encoded user. For one history, use
+`rpc.users.watch.streamedKey({ id: 1 }, { maxChunks: 2, refetchMode: 'append' })` with `exact: true`.
+The omitted policy and explicit unlimited/reset policy share the same normalized identity. Keep the
+remaining concrete suffix opaque; root, branch, leaf, and operation filters survive policy changes.
+
+## Filter HTTP queries
+
+HTTP filters retain labelled request containers. These filters assume your own `users.get`
+declares `id: Schema.FiniteFromString` in each of `params`, `query`, and `payload`, plus
+`'X-Locale': Schema.String` in `headers`. Its `users.watch` SSE endpoint declares
+`query: { id: Schema.FiniteFromString }`.
+
+Derive `http` from that HttpApi and its ready client using the factory setup in
+[HTTP Quick Start](/effect-api-query/getting-started/http-quick-start/). In a cache callback,
+choose the path parameter or header independently:
+
+```ts
+const queryPrefix = viewPrefix(http.users.get, 'query')
+await queryClient.invalidateQueries({ queryKey: [...queryPrefix, { params: { id: '1' } }] })
+await queryClient.invalidateQueries({
+  queryKey: [...queryPrefix, { headers: { 'x-locale': 'en' } }],
+})
+```
+
+For an exact read, supply the complete decoded request to the builder:
+
+```ts
+const key = http.users.get.queryKey({
+  params: { id: 1 },
+  query: { id: 7 },
+  headers: { 'X-Locale': 'en' },
+  payload: { id: 7 },
+})
+const user = queryClient.getQueryData(key)
+```
+
+The leaf prefix also includes metadata and infinite views. For every history policy of a
+`users.watch` request, use `[...viewPrefix(http.users.watch, 'streamed'), { query: { id: '1' } }]`.
+
+Default HTTP keys Schema-encode each request part, omit encoded `undefined` object members, and
+lowercase header names. In this contract, `params: { id: "1" }` is a meaningful partial object;
+`params: { id: 1 }` is not. Filter `headers: { 'x-locale': 'en' }` even when the decoded request uses
+`'X-Locale'`. Preserve `params`, `query`, `headers`, and `payload`: `{ query: { id: "7" } }` and
+`{ payload: { id: "7" } }` select different requests. An unlabelled `{ id: "7" }` matches neither.
+HTTP request input does not use RPC payload construction.
+
+## Bound partial filters to the encoded shape
+
+A custom encoder replaces the default encoded shape. If it returns
+`{ entity: { identifier: "1" }, language: "en" }`, filter by
+`{ entity: { identifier: "1" } }`, using the same operation prefix. `{ id: "1" }` no longer matches.
+If it returns the scalar `"1:en"`, native partial object matching cannot recover the original `id` or
+locale. HTTP custom encoders also replace request labels and header normalization.
+
+Applications that need partial matching can define an explicit JSON object projection in their
+encoder and build filters against that projection. Preserve every safe value that distinguishes
+results. Treat projection changes as cache-identity changes, including persisted-cache version
+busters. For opaque or noninvertible projections, use generated broad prefixes or a generated exact
+key. A custom predicate can inspect only the information retained in the key or other
+application-owned query metadata; it cannot reconstruct omitted input.
+
+Concrete builders retain DataTags for typed `getQueryData` and `setQueryData`. `viewPrefix` returns an immutable ordinary key for supported leaf views; it has no DataTag.
+Manually composed prefixes and partial keys carry no query-data tag, and native `getQueriesData` does not infer a
+homogeneous result from its filter. Keep broad reads as `unknown` until the application establishes
+the matched representation; an explicit generic or cast does not validate cached values.
diff --git a/apps/docs/src/content/docs/guides/cache-management.md b/apps/docs/src/content/docs/guides/cache-management.md
deleted file mode 100644
index 2f1d1b0..0000000
--- a/apps/docs/src/content/docs/guides/cache-management.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: Cache Management
-description: Invalidate and inspect caches with generated prefix keys.
----
-
-Every branch and leaf exposes `key()`. Use these prefixes to match related cache entries:
-
-```ts
-await queryClient.invalidateQueries({ queryKey: rpcQuery.users.key() })
-await queryClient.invalidateQueries({ queryKey: rpcQuery.users.get.key() })
-```
-
-Use `queryKey(input)` for one payload-specific query:
-
-```ts
-const input = { id: 1 }
-const key = rpcQuery.users.get.queryKey(input)
-
-const cachedUser = queryClient.getQueryData(key)
-await queryClient.invalidateQueries({ queryKey: key, exact: true })
-```
-
-Query keys have this flat shape:
-
-```ts
-;[
-  ...keyPrefix,
-  'rpc',
-  ...rpcTagSegments,
-  'query',
-  canonicalPayload, // payload-bearing queries only
-]
-```
-
-Mutation keys end in `'mutation'` and never include variables. See
-[Semantic Keys](/effect-api-query/concepts/semantic-keys/) for normalization and hashing rules.
-
-## Manage HTTP caches
-
-HTTP utilities also expose branch prefixes and keys for individual queries. Supply the endpoint's
-decoded request input for a specific entry:
-
-```ts
-const key = http.users.get.queryKey({ params: { id: 1 } })
-const cachedUser = queryClient.getQueryData(key)
-await queryClient.invalidateQueries({ queryKey: http.users.key() })
-```
-
-HTTP keys include `'http'` and the HttpApi identifier after your `keyPrefix`. RPC keys include
-`'rpc'`, so the two factories keep separate caches even with the same caller prefix. Use the original
-caller prefix when you deliberately want to invalidate both.
-
-The [packed RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/packed-consumer/runtime.mts) and
-[packed HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/packed-consumer/http-runtime.mts) exercise generated keys through QueryClient.
diff --git a/apps/docs/src/content/docs/guides/cancellation.md b/apps/docs/src/content/docs/guides/cancellation.md
index a3eea30..e570f9c 100644
--- a/apps/docs/src/content/docs/guides/cancellation.md
+++ b/apps/docs/src/content/docs/guides/cancellation.md
@@ -3,13 +3,14 @@ title: Cancellation
 description: Cancel queries and request server-side cancellation for long-running commands.
 ---
 
-Generated query functions forward TanStack's `AbortSignal` to `runPromiseExit`:
+In the application client module, forward TanStack's `AbortSignal` to your runtime.
+Import `RunPromiseExit` from `effect-api-query`:
 
 ```ts
 const runPromiseExit: RunPromiseExit = (effect, options) => runtime.runPromiseExit(effect, options)
 ```
 
-Cancel one request with its generated query key:
+In a loader or event handler using the ready RPC utility tree, cancel one request with its generated key:
 
 ```ts
 const input = { durationMs: 60_000, operationId: 'slow-query' }
@@ -29,6 +30,13 @@ Infinite page requests, accumulated streams, and live queries use the same signa
 stream query also calls `return()` on its AsyncIterator, which runs the Effect stream's finalizers.
 TanStack also cancels an active stream when its last observer unmounts or a refetch supersedes it.
 
+These cancellation guarantees apply to ordinary query observers. TanStack documents that
+cancellation does not work with `useSuspenseQuery`, `useSuspenseQueries`, and
+`useSuspenseInfiniteQuery`; generated options and signal forwarding preserve that limitation.
+Choose ordinary hooks when your screen depends on cancellation, particularly for open streams.
+See [TanStack's limitations](https://tanstack.com/query/latest/docs/framework/react/guides/query-cancellation#limitations)
+and [Suspense and Error Recovery](/effect-api-query/guides/suspense-and-recovery/).
+
 Mutations do not receive TanStack query signals, so generated mutation functions cannot cancel
 a mutation automatically.
 
@@ -47,94 +55,27 @@ Reversing completed work requires a separate compensation operation.
 
 HTTP mutations receive no query abort signal and keep TanStack's normal mutation lifecycle.
 
-## Cancel a command while its mutation is pending
-
-Use an explicit cancel RPC for long-running commands. The Vite React example provides
-`commands.start`, `commands.status`, and `commands.cancel` in the shared contract. Each command
-has a client-generated operation ID. The start mutation waits for a terminal result; a separate
-query observes progress, and a separate mutation requests cancellation.
-
-```tsx
-const [operationId] = useState(() => crypto.randomUUID())
-const input = { operationId }
-const reconcile = async () => {
-  await queryClient.invalidateQueries({
-    queryKey: rpcQuery.commands.status.queryKey(input),
-  })
-}
-
-const start = useMutation(rpcQuery.commands.start.mutationOptions({ onSettled: reconcile }))
-const cancel = useMutation(rpcQuery.commands.cancel.mutationOptions({ onSettled: reconcile }))
-const status = useQuery(
-  rpcQuery.commands.status.queryOptions({
-    input,
-    enabled: start.status !== 'idle',
-    refetchInterval: (query) =>
-      query.state.data == null || query.state.data.state === 'running' ? 100 : false,
-  }),
-)
-
-return (
-  <>
-    <button onClick={() => start.mutate(input)} disabled={start.status !== 'idle'}>
-      Start command
-    </button>
-    <button
-      onClick={() => cancel.mutate(input)}
-      disabled={
-        start.status === 'idle' ||
-        cancel.isPending ||
-        status.data?.state === 'completed' ||
-        status.data?.state === 'cancelled'
-      }
-    >
-      Cancel command
-    </button>
-    <p>Server state: {status.data?.state ?? 'not started'}</p>
-  </>
-)
-```
+## Request server cancellation explicitly
+
+Generated mutations receive no query abort signal. When long-running server work must be
+cancellable, assign an operation ID before starting it and provide an application operation
+that requests cancellation. Observe its terminal domain state through a separate read.
+
+An interrupted client or closed HTTP connection does not establish remote completion. Cancellation
+requests stop future work cooperatively; completed work needs a separate compensation operation.
+Use an application acknowledgement when you must wait for server cleanup.
+
+The [Cancellable Commands example](/effect-api-query/examples/cancellable-commands/) shows one
+protocol with start, status, and cancel operations. It also covers retries with the same operation ID,
+concurrent commands, and the limits of its in-memory workers.
+
+## Release resources after local cleanup
+
+Cancelling a query and releasing its services are separate steps. Native `cancelQueries` settlement
+can precede asynchronous iterator finalizers. Keep the ready client, its Scope, and the runner alive
+until application-owned cleanup signals settle. Mutations settle independently because they have
+no query abort signal.
 
-The cancel handler signals the worker and waits until it has stopped. The cancel mutation's
-`onSettled` callback then invalidates the generated status key. The active query refetches the
-server's status even if the cancel request failed, and polling stops at a terminal state.
-The application chooses this invalidation policy.
-
-A cancelled command returns `{ state: 'cancelled', ... }` successfully. TanStack therefore reports
-both mutations as `success` and runs their normal callbacks. The domain state does not add a
-`cancelled` MutationCache state. Each operation ID has its own query key and worker, so cancelling
-one command leaves another running.
-
-Run the Vite React example and use the **Cancellable commands** panel to try two concurrent
-commands. The TanStack Start application hosts the same contract and handlers at `/rpc`; its
-`application.rpcQuery.commands` exposes these same framework-neutral options for hooks, loaders,
-and QueryClient. It can reuse the workflow above with its own QueryClient.
-
-## Choose what cancellation means
-
-| Action                    | Result                                                                                      |
-| ------------------------- | ------------------------------------------------------------------------------------------- |
-| Stop observing a query    | Removes local observation; whether work stops depends on the query lifecycle and transport. |
-| Interrupt an Effect       | Requests cooperative interruption and runs its finalizers.                                  |
-| Call `commands.cancel`    | Requests cooperative server cancellation by operation ID and waits for a terminal state.    |
-| Compensate committed work | Requires a separate application operation that reverses or offsets prior effects.           |
-
-Transport interruption is cooperative and depends on transport support. An explicit cancel RPC is the
-durable application contract for requesting server cancellation. The slow-query demo
-adds a transport-specific `diagnostics.cancel` call when its local Effect is interrupted; the
-package itself does not provide that behavior.
-
-The command example owns workers in the server Scope. Unmounting a view or interrupting the
-client's wait does not cancel these workers automatically. A cancel request stops future steps;
-completed steps remain recorded. Cancellation after completion returns the completed result without
-promising a rollback. Repeating a start with the same ID returns the existing result; a cancel
-that arrives before start reserves that ID as cancelled.
-
-This example stores operation records in memory until the example is reset or the server stops.
-Production applications need their own authorization, durable storage, and retention policy if
-operations must survive restarts. The explicit RPC contract does not make this in-memory example
-a durable job queue.
-
-The [command panel](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/components/sections/commands-section.tsx)
-and [command tests](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/tests/commands.test.ts) exercise this workflow.
-The [HTTP transport tests](https://github.com/ueberBrot/effect-api-query/blob/main/tests/http-transport-cancellation.test.ts) verify cancellation through fetch.
+Follow [Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) for disposal. Use
+[Stream Snapshots](/effect-api-query/guides/stream-snapshots/) for a finite capture that waits for
+local iterator cleanup before it settles.
diff --git a/apps/docs/src/content/docs/guides/choose-stream-history.md b/apps/docs/src/content/docs/guides/choose-stream-history.md
new file mode 100644
index 0000000..48e2ee1
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/choose-stream-history.md
@@ -0,0 +1,56 @@
+---
+title: Choose Stream History
+description: Choose retained history, transport buffering, and update rates for long-running streams.
+---
+
+Choose the cached representation from what the screen needs:
+
+| Need                         | Builder                            | Retained data                                 |
+| ---------------------------- | ---------------------------------- | --------------------------------------------- |
+| Every emitted value in order | `streamedOptions`                  | Unlimited history by default.                 |
+| A recent event window        | `streamedOptions` with `maxChunks` | Up to the specified number after an emission. |
+| Current state                | `liveOptions`                      | The latest emitted value.                     |
+
+For a long-running event display, choose a finite `maxChunks`. For current progress or a full-state
+feed, choose a live query. Unlimited accumulation grows with the number of emissions; it suits
+finite histories or workloads where that growth is deliberate. Persist durable history outside
+the query cache when it must survive cache eviction or application restarts.
+
+These choices apply to both RPC streams and supported HTTP SSE endpoints. Live queries normalize
+successful `undefined` to `null`; accumulated histories preserve their emitted values.
+
+## Set retention and buffering separately
+
+`maxChunks` limits the number of cached elements after each new emission. Seeded or hydrated history
+can exceed the bound until another element arrives. One element can contain a large object or array,
+so this bound does not limit bytes. It discards older elements while preserving the remaining order.
+Use the same retention and refetch policy when building an exact key and its options.
+
+RPC `rpcOptions.streamBufferSize` controls the ready client's transport buffer before consumption.
+It does not set cache history or the rate of cache writes. HTTP transport buffering belongs to
+the ready HTTP API client. Changing a history bound does not slow the producer.
+
+An initial accumulated or live fetch exposes its first value while the stream remains open.
+An accumulated `replace` refetch publishes its replacement only after successful completion;
+an indefinitely open replacement therefore keeps showing the previous history. See
+[Stream Snapshots](/effect-api-query/guides/stream-snapshots/) for finite server captures.
+
+## Assess writes and references separately
+
+Accumulated streams build new history arrays without mutating previous publications. A history
+bound limits their length; each consumed value still contributes to cache updates. Live queries
+also accept each value, including repeated values. Native structural sharing can preserve equal
+data references without suppressing those cache writes.
+
+For JSON-compatible values, TanStack's default structural sharing can reuse unchanged objects and
+nested values. A moving window changes array positions, so sharing can also produce additional
+distinct references. Compare the data shape your application receives before choosing
+`structuralSharing: false` or a custom native policy.
+
+Cache notifications also include query creation and fetch lifecycle changes. Count data writes,
+data reference changes, and retained elements separately. Framework observer selection and
+render scheduling add their own behavior; cache notification counts do not count component renders.
+
+If the producer outruns the interface, set an explicit rate or sampling policy in the producer or
+an application-owned Effect Stream transformation. Sampling intentionally discards values.
+Retention and transport buffering serve different purposes from publication rate.
diff --git a/apps/docs/src/content/docs/guides/conditional-queries.md b/apps/docs/src/content/docs/guides/conditional-queries.md
index d48f2c9..5cc2041 100644
--- a/apps/docs/src/content/docs/guides/conditional-queries.md
+++ b/apps/docs/src/content/docs/guides/conditional-queries.md
@@ -3,8 +3,14 @@ title: Conditional Queries
 description: Pause queries until their required input is available.
 ---
 
-Use `{ input: skipToken }` when an input-bearing query has no valid input yet and needs TanStack
-options such as `staleTime`, `select`, or `initialData`:
+In component setup, import the native `useQuery` hook and use your application's ready utility
+tree, named `rpcQuery` here. Its `users.get` RPC takes a numeric `id` with a default locale and
+returns a user with an `id` and `name`. Follow the [RPC quick start](/effect-api-query/getting-started/quick-start/)
+for the factory setup pattern.
+
+`userId` is the selected ID, which may be undefined. Use `{ input: skipToken }` when an
+input-bearing query has no valid input yet and needs TanStack options such as `staleTime`,
+`select`, or `initialData`:
 
 ```ts
 import { skipToken } from 'effect-api-query'
@@ -21,7 +27,8 @@ const userOptions = rpcQuery.users.get.queryOptions({
 const user = useQuery(userOptions)
 ```
 
-The same form works for HTTP request input:
+For an HTTP `users.get` endpoint with only a numeric `id` param and a user response, its complete
+decoded request contains only `params`:
 
 ```ts
 const httpUserOptions = http.users.get.queryOptions({
@@ -41,17 +48,18 @@ possibly `undefined`, even with an initial value, because its defined-data overl
 `skipToken`. `useInfiniteQuery` preserves its defined-data overload when `initialData` is a defined
 value or factory, including for conditional and skipped inputs.
 
-The sentinel applies to input-bearing `queryOptions` and `infiniteOptions` in both adapters, and
-to RPC `streamedOptions` and `liveOptions`. Inputless operations run without input, and key and
+The sentinel applies to input-bearing `queryOptions`, `infiniteOptions`, `streamedOptions`, and
+`liveOptions` in both adapters, and buffered HTTP `metadataOptions`. Inputless operations run without input, and key and
 mutation builders do not accept `skipToken`. TanStack suspense and prefetch-only hooks also reject
 skipped options at the type level.
 
-`queryOptions`, RPC `streamedOptions`, and RPC `liveOptions` accept concrete input or `skipToken`,
+`queryOptions`, `metadataOptions`, `streamedOptions`, and `liveOptions` accept concrete input or `skipToken`,
 including a conditional union. Keep the conditional input inside one builder call so the observer
 has one consistent callback type. Concrete inputs and the literal `skipToken` retain their precise
 key and query-function types; conditional inputs preserve both possibilities.
 
-The object form also works for accumulated streams and live queries:
+If your RPC group also declares `events.watch` with a string `channel` input and string
+emissions, build either view in that consumer:
 
 ```ts
 rpcQuery.events.watch.streamedOptions({
@@ -66,22 +74,18 @@ rpcQuery.events.watch.liveOptions({
 ```
 
 `refetchMode` configures accumulation. The builder removes it from the returned options even when
-the query is skipped. Infinite queries accept a page-to-input mapper or `skipToken`, including a
+the query is skipped. Retention, refetch, and HTTP SSE decoder policy validation still occurs for
+skipped streams. Infinite queries accept a page-to-input mapper or `skipToken`, including a
 conditional union, with their required `initialPageParam` and `getNextPageParam`. Choose between
 the mapper and sentinel in `input`; each mapper result must be valid input.
 
-When no caller options are needed, `queryOptions(skipToken)`, `streamedOptions(skipToken)`, and
-`liveOptions(skipToken)` remain available as shorthand. A skipped query has no executable query
-function, so manual `refetch()` cannot run it. Supply valid input to enable it. If a complete
+A skipped query has no executable query function, so manual `refetch()` cannot run it. Supply valid input to enable it. If a complete
 request is available and you need manual refetch, use `enabled: false` instead.
 
 For HTTP pagination, map each page parameter to the complete request and keep stable filters in
-every page. See [Load pages](/effect-api-query/guides/http-queries-and-mutations/#load-pages) for
+every page. See [Load pages](/effect-api-query/guides/pagination/) for
 initial-request identity and cursor progression.
 
 Try this in either [executable example](/effect-api-query/examples/#pause-a-query-until-a-user-is-selected).
 The **Choose before fetching** control demonstrates pausing, selecting a user, and reusing fresh
 cached data after clearing and reselecting the same user.
-
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts) and
-[public HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts) check skipped hook inference and rejected uses.
diff --git a/apps/docs/src/content/docs/guides/custom-key-encoders.md b/apps/docs/src/content/docs/guides/custom-key-encoders.md
index 379f3c9..15c09e3 100644
--- a/apps/docs/src/content/docs/guides/custom-key-encoders.md
+++ b/apps/docs/src/content/docs/guides/custom-key-encoders.md
@@ -6,8 +6,12 @@ description: Supply safe semantic identity for RPC payloads and HTTP requests.
 ## RPC payloads
 
 By default, the factory constructs the RPC payload and synchronously encodes it with its Schema.
-Supply a custom encoder when encoding requires Effect services or the payload contains
-`Schema.Redacted` values, including schemas reached through `Schema.suspend`.
+Supply a custom encoder when encoding requires Effect services, uses opaque encoding middleware,
+or the payload contains `Schema.Redacted` values, including schemas reached through `Schema.suspend`.
+The runtime check treats middleware conservatively even when it is synchronous and service-free.
+
+In the application client module, configure the ready RPC client. Here `identifySecret` is
+your synchronous public-identity projection:
 
 ```ts
 const rpcQuery = createRpcQueryUtils(rpcGroup, {
@@ -23,6 +27,10 @@ const rpcQuery = createRpcQueryUtils(rpcGroup, {
 An encoder receives the normalized payload and must return a strict `JsonValue` synchronously. It
 must not reveal secrets. Return a stable public identifier, digest, or other safe semantic identity.
 
+Broad payload declarations such as `Schema.Unknown`, `Schema.Any`, and void-containing unions
+accept encoders too. Their default keys still require strict JSON: an accepted RPC input such as
+`undefined`, a bigint, or a class instance may require an encoder to supply JSON-safe identity.
+
 Define encoders as own enumerable properties keyed by literal payload-bearing RPC tags. TypeScript
 requires entries for unsafe payloads; the factory also rejects missing or unknown entries at runtime.
 
@@ -39,6 +47,8 @@ Suppose a `forms` group's `submit` endpoint accepts a number encoded as text or
 as JSON. Both schemas can encode to `"1"`, but the HTTP bodies differ. Preserve that distinction
 in the key:
 
+In the HTTP client module, configure that endpoint's request projection:
+
 ```ts
 const http = createHttpApiQueryUtils(contract, {
   client,
@@ -76,9 +86,5 @@ that distinguishes results.
 Return strict `JsonValue` synchronously. The factory copies and freezes the result; it rejects
 undefined object members, undefined or sparse array entries, non-finite numbers, cycles, and
 non-JSON objects. Custom output bypasses the default HTTP rules for omitting `undefined` members and normalizing headers.
-See the [HTTP reference](/effect-api-query/reference/http-factory/#cache-identity-and-failures) for
+See the [HTTP reference](/effect-api-query/reference/http-builders/#cache-identity-and-failures) for
 failure codes. Underlying error Causes remain intact and may contain values supplied by Effect.
-
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts) and
-[public HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts) check encoder inputs and required services.
-The [HTTP key tests](https://github.com/ueberBrot/effect-api-query/blob/main/tests/http-semantic-keys.test.ts) verify alternative payload and binary projections.
diff --git a/apps/docs/src/content/docs/guides/handle-failures.md b/apps/docs/src/content/docs/guides/handle-failures.md
index b5697cb..c90a0cc 100644
--- a/apps/docs/src/content/docs/guides/handle-failures.md
+++ b/apps/docs/src/content/docs/guides/handle-failures.md
@@ -4,7 +4,7 @@ description: Inspect RPC and HTTP Causes and distinguish configuration and key e
 ---
 
 A failed RPC `Exit` becomes `EffectRpcQueryError`. The error records the RPC tag, the generated
-operation that ran, and the complete Effect `Cause`:
+operation that ran, and the complete Effect `Cause`. In the application's error handler:
 
 ```ts
 import { Cause } from 'effect'
@@ -18,9 +18,12 @@ const logRpcError = (error: unknown) => {
 }
 ```
 
+Review the Cause for private messages and transport values before logging it.
+
 These error classes distinguish failure stages:
 
-- `EffectRpcQueryConfigError` reports invalid factory or builder configuration synchronously.
+- `EffectRpcQueryConfigError` reports invalid configuration: synchronously during preparation,
+  or during stream execution with incompatible QueryClient hashing.
 - `EffectRpcQueryKeyError` reports synchronous payload construction, encoding, or JSON
   canonicalization failures.
 - `EffectRpcQueryError` reports a failed RPC execution and preserves its Effect `Cause`.
@@ -28,6 +31,8 @@ These error classes distinguish failure stages:
 
 If a custom runner rejects instead of returning an `Exit`, its rejection passes through unchanged.
 See the [error reference](/effect-api-query/reference/errors/) for stable codes and metadata.
+Use [retry queries](/effect-api-query/guides/retry-queries/) for typed `Cause`/`Result` decisions,
+bounded attempt counts, and synchronous preparation errors.
 
 ## Inspect HTTP failures
 
@@ -41,14 +46,12 @@ The package adds only declaration identity to execution-error metadata. The pres
 contain upstream request headers, bodies, concrete URLs, responses, or Schema issue values.
 Review those values before logging or exposing them. The package does not sanitize the Cause.
 
-`EffectHttpApiQueryConfigError` reports invalid factory configuration synchronously.
+`EffectHttpApiQueryConfigError` reports invalid configuration with the same preparation and
+stream-execution timing as the RPC error.
 `EffectHttpApiQueryKeyError` reports synchronous query-key preparation failures, before HTTP
 execution. Mutations encode their request inside the ready client's Effect, so encoding failures
 become `EffectHttpApiQueryError` instead. Runner rejections and user or TanStack callback failures
 pass through unchanged when they produce no failed Exit.
 
-See the [HTTP factory reference](/effect-api-query/reference/http-factory/#cache-identity-and-failures)
+See the [HTTP factory reference](/effect-api-query/reference/http-builders/#cache-identity-and-failures)
 for key-error codes.
-
-The [packed RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/packed-consumer/runtime.mts) and
-[packed HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/packed-consumer/http-runtime.mts) verify error guards and preserved Causes.
diff --git a/apps/docs/src/content/docs/guides/http-metadata.md b/apps/docs/src/content/docs/guides/http-metadata.md
new file mode 100644
index 0000000..700423d
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/http-metadata.md
@@ -0,0 +1,59 @@
+---
+title: HTTP Metadata
+description: Read decoded HTTP data, response status, and headers in a separate cache view.
+---
+
+Buffered HTTP endpoints with query support expose `metadataOptions`. Use your ready `http` utility
+tree and QueryClient from the [HTTP quick start](/effect-api-query/getting-started/http-quick-start/).
+Here, `users.get` declares `params.id` and `query.locale` and returns a user with `id` and `name`.
+
+## Read status and headers
+
+```ts
+const input = { params: { id: 1 }, query: { locale: 'en' } }
+const metadataOptions = http.users.get.metadataOptions({ input })
+const current = await queryClient.query(metadataOptions)
+console.log(current.data.name, current.status)
+const etag = current.headers['etag']
+```
+
+The cache holds decoded `data`, numeric `status`, and raw string `headers` in a separate view.
+Fetched envelopes and copied headers are immutable. Decoded data keeps its ownership, including
+declared response-header wrappers. Choose safe headers before persistence or hydration.
+Use `metadataOptions.queryKey` or `metadataKey(input)` for exact access; the endpoint's `key()`
+matches ordinary and metadata views.
+
+## Update with an ETag
+
+If `users.get` supplies an ETag and `users.update` declares `params.id`, an `if-match` header,
+a `{ name }` payload, and its precondition failure, preserve the ETag for the write.
+Import `MutationObserver` from `@tanstack/query-core`:
+
+```ts
+if (etag === undefined) throw new Error('The server supplied no ETag')
+await queryClient.cancelQueries({ queryKey: http.users.get.key() })
+const updateUser = new MutationObserver(
+  queryClient,
+  http.users.update.mutationOptions({
+    onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.get.key() }),
+  }),
+)
+```
+
+Send the raw ETag **including quotes**, then read the refreshed metadata before another write:
+
+```ts
+await updateUser.mutate({
+  params: input.params,
+  headers: { 'if-match': etag },
+  payload: { name: 'Ada' },
+})
+const refreshed = await queryClient.query(metadataOptions)
+```
+
+The server enforces the precondition. Inspect its declared failure through the
+[HTTP execution error](/effect-api-query/guides/handle-failures/#inspect-http-failures).
+The invalidation prefix refreshes data and metadata entries.
+
+Native selection, initial data, skipping, and cancellation also apply. For precise immutability
+and structural-sharing behavior, see [Buffered Metadata](/effect-api-query/reference/http-builders/#buffered-metadata).
diff --git a/apps/docs/src/content/docs/guides/http-queries-and-mutations.md b/apps/docs/src/content/docs/guides/http-queries-and-mutations.md
index 5af7775..3c878b3 100644
--- a/apps/docs/src/content/docs/guides/http-queries-and-mutations.md
+++ b/apps/docs/src/content/docs/guides/http-queries-and-mutations.md
@@ -1,149 +1,38 @@
 ---
-title: HTTP Queries and Mutations
-description: Fetch and update data through an Effect HttpApi with TanStack Query.
+title: HTTP Requests and Uploads
+description: Supply decoded request parts and execute buffered multipart mutations.
 ---
 
-Use `createHttpApiQueryUtils` with your HttpApi definition and ready HttpApiClient. The client
-keeps its existing base URL, transport, and middleware configuration.
+Use the HTTP utility tree from the [HTTP quick start](/effect-api-query/getting-started/http-quick-start/).
+Keep base URL, middleware, authentication, and execution services on your ready client and runner.
+For shared builders, see [Queries](/effect-api-query/guides/queries/),
+[Mutations](/effect-api-query/guides/mutations/), [Pagination](/effect-api-query/guides/pagination/),
+[Streaming](/effect-api-query/guides/streaming/), and [HTTP Metadata](/effect-api-query/guides/http-metadata/).
 
-This example assumes your API has a `users` group with `get` and `create` endpoints. The `get`
-endpoint declares a decoded numeric `id` in `params`; `create` accepts `{ name: string }` in
-`payload`. Replace the application module imports with your own contract and client.
+## Supply decoded request parts
 
-## Create the utilities
+HTTP input contains the declared `params`, `query`, `headers`, and `payload` containers.
+Include each declared container even when its fields are optional. For `users.get` declaring
+`params.id` and `query.locale`:
 
 ```ts
-import { MutationObserver, QueryClient } from '@tanstack/query-core'
-import { createHttpApiQueryUtils } from 'effect-api-query'
-
-import { api } from './api.js'
-import { client } from './http-client.js'
-
-const queryClient = new QueryClient()
-const http = createHttpApiQueryUtils(api, {
-  client,
-  keyPrefix: ['my-app'],
-})
-```
-
-This client needs no additional execution services. If your client or its schemas require services,
-also supply a `runPromiseExit` backed by your application runtime. Forward the runner's options
-so [query cancellation](/effect-api-query/guides/cancellation/#cancel-an-http-query) reaches Effect.
-
-## Fetch a user
-
-```ts
-const userOptions = http.users.get.queryOptions({
-  input: { params: { id: 1 } },
+const httpUserOptions = http.users.get.queryOptions({
+  input: { params: { id: 1 }, query: { locale: 'en' } },
   staleTime: 30_000,
 })
-
-const user = await queryClient.query(userOptions)
-```
-
-Pass decoded values in the endpoint's declared `params`, `query`, `headers`, and `payload`
-containers. For example, a `Schema.FiniteFromString` parameter takes a number; the ready client
-encodes it for transport. Include every declared container, even when its fields are optional.
-An endpoint without request input uses `queryOptions()`.
-
-React applications can pass `userOptions` directly to `useQuery`, `useSuspenseQuery`, or
-`usePrefetchQuery`. A `select` callback receives decoded response data; it changes the observer's
-data type without changing the cached value. `queryClient.getQueryData(userOptions.queryKey)`
-still infers the decoded user type.
-
-## Wait for request input
-
-Use `skipToken` until the complete request is available:
-
-```ts
-import { useQuery } from '@tanstack/react-query'
-import { skipToken } from 'effect-api-query'
-
-const user = useQuery(
-  http.users.get.queryOptions({
-    input: userId === undefined ? skipToken : { params: { id: userId } },
-    staleTime: 30_000,
-    select: (user) => user.name,
-  }),
-)
-```
-
-`queryOptions(skipToken)` is shorthand when you need no other options. Skipping preserves caller
-options and performs no request encoding or client call. Its query function is TanStack's exact
-sentinel, so manual `refetch()` cannot execute it. Supply valid input to enable the query. Use
-`enabled: false` with a complete request when you need a query that can run through manual refetch.
-Suspense and prefetch-only hooks require executable options and reject skipped options. See
-[Conditional Queries](/effect-api-query/guides/conditional-queries/) for the shared contract.
-
-## Load pages
-
-For an endpoint `users.list` with decoded query fields `cursor: number` and `filter: string`, and
-a response `{ items: User[]; nextCursor: number | null }`, map each page parameter to a complete
-request:
-
-```ts
-import { useInfiniteQuery } from '@tanstack/react-query'
-
-const filter = 'active'
-const pageOptions = http.users.list.infiniteOptions({
-  initialPageParam: 0,
-  input: (cursor) => ({ query: { cursor, filter } }),
-  getNextPageParam: (page) => page.nextCursor ?? undefined,
-  select: (data) => data.pages.flatMap((page) => page.items),
-})
-
-const users = useInfiniteQuery(pageOptions)
-```
-
-TypeScript infers `cursor` from `initialPageParam`. Return every declared request container from
-`input`, including any `params`, `headers`, or `payload`; each page is a fresh decoded HTTP request.
-Use `users.fetchNextPage()` when `users.hasNextPage` is true. You control cursor progression through
-`getNextPageParam`: return the server's next cursor, or `undefined` or `null` when there are no more
-pages.
-
-The cache key uses `input(initialPageParam)` and an `infinite` discriminator. Keep all stable
-filters in the initial request and every later request. Rebuild the options when a filter
-changes so the first request produces a different key. Keep `input` deterministic and free of
-side effects: it runs during key construction and again for page execution. A custom key encoder
-must preserve these same filters because they affect results.
-
-TanStack owns page storage, invalidation, and refetching. `select` changes the hook result to the
-flattened users; the cache still holds `pages` and `pageParams`. Each page uses the same response
-normalization, wrapped failures, and cancellation as an ordinary HTTP query. To pause pagination, use
-`input: skipToken` with `initialPageParam` and `getNextPageParam`; the infinite builder accepts
-only this object form for skipping.
-
-## Create a user and refresh the cache
-
-```ts
-const createUser = new MutationObserver(
-  queryClient,
-  http.users.create.mutationOptions({
-    onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.key() }),
-  }),
-)
-
-await createUser.mutate({ payload: { name: 'Ada' } })
+const httpUser = await queryClient.query(httpUserOptions)
 ```
 
-Mutation variables use the same decoded request shape as query input. Choose the invalidation
-prefix for the data your write changes. React applications can pass the same mutation options to
-`useMutation`.
-
-Both builders return decoded response data. Successful `undefined` query data becomes `null`;
-mutation results retain `undefined`. Inspect execution failures with
-[`isEffectHttpApiQueryError`](/effect-api-query/guides/handle-failures/#inspect-http-failures).
+The ready client encodes decoded values; HTTP builders apply no RPC constructor defaults.
+Inputless endpoints use `queryOptions()`. Raw response controls are excluded from request input.
+Captured values remain caller-owned, so keep them unchanged while using the options.
 
 ## Upload a file
 
-Declare a buffered multipart payload in your shared API definition. For example, add this endpoint
-to the `users` group and include it in the server implementation:
+In the contract module, declare a buffered multipart payload. Import `Schema` from `effect`,
+`Multipart` from `effect/http`, and `HttpApiEndpoint` and `HttpApiSchema` from `effect/http-api`:
 
 ```ts
-import { Schema } from 'effect'
-import { Multipart } from 'effect/http'
-import { HttpApiEndpoint, HttpApiSchema } from 'effect/http-api'
-
 const upload = HttpApiEndpoint.post('upload', '/users/:id/files', {
   params: { id: Schema.Int },
   payload: Schema.Struct({ file: Multipart.SingleFileSchema }).pipe(HttpApiSchema.asMultipart()),
@@ -151,9 +40,8 @@ const upload = HttpApiEndpoint.post('upload', '/users/:id/files', {
 })
 ```
 
-Create the utilities from the updated API and ready client. This endpoint exposes `key()`,
-`mutationKey()`, and `mutationOptions()`. Build `FormData` explicitly and supply every other declared
-request container in its decoded type:
+Add the endpoint to your API's `users` group and create its utility tree. In the mutation module,
+import `MutationObserver` from `@tanstack/query-core` and prepare the upload:
 
 ```ts
 const uploadFile = new MutationObserver(
@@ -162,46 +50,21 @@ const uploadFile = new MutationObserver(
     onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.key() }),
   }),
 )
-
-const payload = new FormData()
-payload.set('file', new Blob(['profile notes'], { type: 'text/plain' }), 'notes.txt')
-const uploaded = await uploadFile.mutate({ params: { id: 1 }, payload })
 ```
 
-The adapter forwards the `FormData` to the ready client and returns the decoded success. React
-applications can use these options with `useMutation`; callback variables retain the complete request
-type. Request encoding and middleware still use your application's client and runner.
-
-A buffered multipart alternative makes the whole endpoint mutation-only, even when it also accepts
-plain payloads. Mixed alternatives retain Effect's client request union. Leave the endpoint out of
-`keyEncoders`: mutation keys contain no request variables, and encoder entries are rejected. Any
-streaming success or streaming multipart alternative omits the whole endpoint.
-
-## Keep cache entries separate
-
-Use generated keys for individual queries or whole branches:
+In the event handler, build `FormData` and supply the other declared request containers:
 
 ```ts
-const key = http.users.get.queryKey({ params: { id: 1 } })
-const cachedUser = queryClient.getQueryData(key)
-await queryClient.invalidateQueries({ queryKey: http.users.key() })
+const payload = new FormData()
+payload.set('file', new Blob(['profile notes'], { type: 'text/plain' }), 'notes.txt')
+const uploaded = await uploadFile.mutate({ params: { id: 1 }, payload })
 ```
 
-If client middleware changes results by user or tenant, include a safe user or tenant identifier in
-`keyPrefix`. Keep credentials out of keys. Use a
-[custom encoder](/effect-api-query/guides/custom-key-encoders/#http-requests) when request schemas
-need encoding services, contain redacted values, or allow multiple payload alternatives.
-
-Buffered HTTP endpoints without multipart expose ordinary query, infinite query, and mutation
-builders regardless of HTTP method. Choose the builder for the operation you intend. Buffered
-multipart endpoints expose mutations only. Streaming responses and streaming multipart requests
-are omitted; see the [HTTP factory reference](/effect-api-query/reference/http-factory/)
-for supported request formats and the complete builder contract.
-
-When your application or server request ends, cancel its active queries and clear its QueryClient
-before disposing client and runtime resources. See
-[Client Lifecycle](/effect-api-query/concepts/client-lifecycle/#http-clients-and-execution-services).
+The ready client owns encoding; the adapter returns decoded success. Any buffered multipart
+payload alternative makes the endpoint mutation-only. Mutation keys exclude variables and files,
+so omit these endpoints from `keyEncoders`; configured encoder entries are rejected.
+Streaming successes or streaming multipart alternatives omit the endpoint entirely.
 
-The [public HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts) checks query, mutation,
-pagination, and skipped-input types. The [Vite React HTTP panel](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/components/sections/http-section.tsx)
-shows the contract, ready client, hooks, and cache invalidation in a running application.
+See the [HTTP Factory](/effect-api-query/reference/http-factory/) for exact capability boundaries
+and the [multipart example](https://github.com/ueberBrot/effect-api-query/blob/main/tests/http-multipart.test.ts)
+for a complete contract and execution.
diff --git a/apps/docs/src/content/docs/guides/hydrate-query-views.md b/apps/docs/src/content/docs/guides/hydrate-query-views.md
new file mode 100644
index 0000000..49afbfe
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/hydrate-query-views.md
@@ -0,0 +1,129 @@
+---
+title: Hydrate Query Views
+description: Preserve infinite pages, stream histories, live values, and HTTP metadata across JSON hydration and refetch.
+---
+
+Choose one codec for each cached representation. A success Schema describes a decoded result;
+infinite pages also contain page parameters, and HTTP metadata adds an envelope. Keep decoded
+values in the Query Client and encode only the snapshot sent to the browser.
+
+This task extends the [paired Profile codec](/effect-api-query/guides/hydrate-unary-data/).
+The server and browser own independent ready clients, runtimes, Scopes, and Query Clients.
+Use the same contract, input, key prefix, and Query Client hashing defaults on both sides.
+
+## Give each view an explicit codec
+
+Reserve a key prefix of `['hydration-views', codecId, ...applicationIdentity]` when creating each
+utility tree. The generated key suffix retains its usual operation, input, and view policies.
+Choose `codecId` from the map below; add your owner identity after it when data depends on an owner.
+
+| Codec ID          | Cached representation                                         |
+| ----------------- | ------------------------------------------------------------- |
+| `history`         | Ordered `Profile`, `undefined`, and `null` elements           |
+| `infinite`        | Profile pages and explicitly encoded `Cursor` page parameters |
+| `live`            | Latest Profile or normalized `null`                           |
+| `buffered`        | Decoded HTTP header wrapper with either declared success      |
+| `metadata`        | Buffered wrapper, response status, and raw string headers     |
+| `wrapped-history` | Ordered decoded HTTP header wrappers                          |
+| `wrapped-live`    | Latest decoded HTTP header wrapper                            |
+
+Define the view codecs in the application's hydration module. Import `Schema` and
+`SchemaTransformation` from `effect`; reuse the paired `Profile` codec. The
+[complete typed recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-hydration-views.ts)
+includes wrapper codecs, codec dispatch, and awaited snapshot preparation.
+
+Use the linked module's `Cursor` and `BufferedProfile` declarations alongside these codecs.
+For infinite data, encode both pages and page parameters:
+
+```ts
+export const ProfilePage = Schema.Struct({
+  rows: Schema.Array(Profile),
+  next: Schema.NullOr(Schema.Finite),
+})
+const ProfilePages = Schema.Struct({
+  pages: Schema.Array(ProfilePage),
+  pageParams: Schema.Array(Cursor),
+})
+```
+
+For history, preserve an undefined element separately from a real `null`:
+
+```ts
+const UndefinedElement = Schema.Struct({ _tag: Schema.Literal('Undefined') }).pipe(
+  Schema.decodeTo(
+    Schema.Undefined,
+    SchemaTransformation.transform({
+      decode: () => undefined,
+      encode: () => ({ _tag: 'Undefined' as const }),
+    }),
+  ),
+)
+
+export const HistoryElement = Schema.Union([Profile, Schema.Null, UndefinedElement])
+const ProfileHistory = Schema.Array(HistoryElement)
+```
+
+For HTTP metadata, encode the decoded response wrapper and the metadata envelope:
+
+```ts
+const ProfileMetadata = Schema.Struct({
+  data: BufferedProfile,
+  status: Schema.Finite,
+  headers: Schema.Record(Schema.String, Schema.String),
+})
+```
+
+Use a `Cursor` as `infiniteOptions.initialPageParam`. Return the next Cursor from
+`getNextPageParam`, and let the deterministic `input` mapper convert its offset into your
+contract's request input. `ProfilePages` encodes both arrays: its page parameters become decimal
+strings at the JSON boundary and regain their Cursor prototype and methods during hydration.
+A result Schema alone cannot choose this page-parameter representation.
+
+Accumulated history preserves decoded `undefined` elements. Ordinary JSON would turn an
+undefined array element into `null`, so `UndefinedElement` encodes it as a distinct tagged value.
+A real `null` remains `null`. Live queries already normalize an entirely undefined emission to
+`null`; their codec retains that value.
+
+For an HTTP header wrapper, normalization applies to the whole emitted value. A wrapper whose
+`body` is undefined remains a wrapper with an undefined body. `WrappedElement` preserves that
+body with the same tagged encoding and reconstructs the wrapper with
+`HttpApiSchema.withHeaders`. `WithHeaders` is an HTTP declaration; use explicit body/header
+codecs at the JSON boundary so rich body values and decoded numeric headers regain their types.
+
+`BufferedProfile` includes both declared HTTP successes. Adapt that union to your endpoint and
+its status declarations. `ProfileMetadata` preserves decoded data, numeric status, and raw
+string headers. Hydrated envelopes belong to the application and remain unfrozen. A subsequent
+metadata fetch produces the library's frozen envelope and raw headers again; decoded data stays
+mutable. Select public response headers before sending metadata that contains private values.
+
+## Prepare the complete snapshot before continuing
+
+After prefetching finite queries, run `prepareViewSnapshot(serverQueryClient)` through the
+application's runner with `SnapshotEncoding` provided. Supply any asynchronous encoding work
+through `beforeEncode`, then await the returned JSON before publishing it through your framework.
+The original cache keeps decoded classes, bigint values, byte arrays, and page parameters.
+
+For an open HTTP or RPC stream, first await
+[fetchStreamSnapshot](/effect-api-query/guides/stream-snapshots/) with its exact generated stream
+options. It captures the first visible value and awaits local iterator cleanup. Keep exclusive
+ownership of that idle, unobserved key during capture. Only then prepare JSON and dispose the
+server's ready-client resources. Local cleanup does not acknowledge remote cancellation.
+
+On the browser, provide `SnapshotDecoding` and await `prepareViewHydration(browserQueryClient,
+json)` before querying or mounting observers. Encoding and decoding require separate services;
+one cannot satisfy the other. All selected data decodes before a single native `hydrate` call,
+so invalid codec data or an unknown codec ID leaves the browser cache untouched.
+
+The preparation helpers accept the matching trusted server's native dehydrated envelope and
+validate selected query data. Validate arbitrary external snapshots separately. Handle
+malformed JSON and preparation failures in the application's rendering or hydration error path.
+
+Only successful queries in the reserved family enter the snapshot. Mutations and failed-query
+errors/Causes are omitted. Hydration therefore leaves an omitted failed query available for a
+new browser fetch. Error hydration needs its own application-safe representation.
+
+Choose native freshness defaults to control duplicate reads. A successful fresh hydrated query
+can reuse its reconstructed data; later invalidation and refetch use the browser's independent
+ready client and the same decoded representation. For streams, explicit cached capture acquires
+no new work; fresh capture starts the browser stream again. Keep Effects and Promises outside
+query data and finish preparation before publishing or hydrating.
diff --git a/apps/docs/src/content/docs/guides/hydrate-unary-data.md b/apps/docs/src/content/docs/guides/hydrate-unary-data.md
new file mode 100644
index 0000000..89906ee
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/hydrate-unary-data.md
@@ -0,0 +1,140 @@
+---
+title: Hydrate Unary Data
+description: Keep DTOs or rich Schema values consistent across JSON hydration and client refetch.
+---
+
+Choose the cache representation before connecting server rendering to TanStack Query. The server
+and browser must use the same contract, key prefix, and inputs. Each owns its Query Client, ready
+Effect client, and runtime. Cancel outstanding queries before disposing a runtime.
+
+These recipes cover unary profile reads through either factory. They keep only successful profile
+queries and omit mutations. Use the [query-view recipe](/effect-api-query/guides/hydrate-query-views/)
+for infinite pages, stream snapshots, and HTTP metadata.
+
+## Keep DTOs in both caches
+
+Use a JSON-safe success schema when components need plain data. The contract below keeps credits
+as decimal strings and binary data as base64 strings. Return this DTO from the server operation;
+the ready RPC or HTTP client produces the same DTO on the server and browser.
+
+In the shared contract module, import `Schema` from `effect` and declare the DTO:
+
+```ts
+const ProfileDto = Schema.Struct({
+  name: Schema.String,
+  credits: Schema.String,
+  avatar: Schema.String.check(Schema.isBase64()),
+})
+```
+
+The [complete DTO recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-hydration-dto.ts)
+connects this schema to both factories and provides `snapshotDto` and `hydrateDto`.
+
+Prefetch with `queryClient.query(dtoRpcOptions(rpcClient))` or the HTTP equivalent, then publish
+`snapshotDto(queryClient)` through your framework's JSON transport. Call `hydrateDto` on the
+browser's Query Client before its first query. The 60-second freshness window avoids an immediate
+duplicate read; subsequent invalidation and refetch still produce DTOs.
+
+If your domain layer uses classes, convert them to this DTO in the operation or ready-client
+adapter on both sides. TanStack's `select` changes an observer's result; it does not change cached
+query data.
+
+## Reconstruct Schema classes with paired codecs
+
+Keep decoded domain objects in the cache when components need methods or rich values. Encode at
+the snapshot boundary and decode during hydration. This `Profile` encodes bigint credits as a
+string and its `Uint8Array` avatar as base64. Decoding reconstructs the class and its `summary`
+method.
+
+In the shared contract module, define the rich success schema:
+
+```ts
+export class Profile extends Schema.Class<Profile>('Profile')({
+  name: Schema.String,
+  credits: Schema.BigIntFromString,
+  avatar: Schema.Uint8ArrayFromBase64,
+}) {
+  summary(): string {
+    return `${this.name}: ${this.credits} credits`
+  }
+}
+```
+
+In the server snapshot and browser hydration modules, pair
+`serializeData: Schema.encodeUnknownSync(Profile)` with
+`defaultOptions: { deserializeData: Schema.decodeUnknownSync(Profile) }`.
+The [complete rich-value recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-hydration-rich.ts)
+provides `snapshotProfile`, `hydrateProfile`, and options for both factories.
+
+Prefetch with `profileRpcOptions` or `profileHttpOptions`, publish `snapshotProfile`, then call
+`hydrateProfile` on the browser's Query Client. The hydrated value and a later browser refetch
+both have the `Profile` prototype, bigint credits, and byte array. Only the snapshot contains the
+encoded strings. The `'profile'` prefix in this recipe is reserved for unary `Profile` data;
+other query shapes need their own codec selection.
+
+`serializeData` and `deserializeData` are synchronous callbacks. The synchronous Schema functions
+must be able to finish without asynchronous work or required services. A codec failure throws;
+handle it through your rendering or hydration error path.
+
+`structuredClone` is not a paired JSON codec. It copies class properties without restoring the
+class prototype or methods. It preserves bigint and typed arrays in memory, but JSON still
+requires an encoding for those values. Cloning a server class alone also leaves hydration and a
+later class-valued refetch with different representations.
+
+## Finish effectful preparation before publishing or hydrating
+
+When a codec needs services or asynchronous work, prepare the entire snapshot outside TanStack's
+synchronous callbacks. This example adds a caller-owned preparation service to the same Profile
+codec. Its hooks can await application work before encoding or decoding.
+
+The application's hydration module decodes all entries before changing the cache.
+With `PreparedProfile` and its services from the
+[complete asynchronous recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-hydration-async.ts),
+that boundary is:
+
+```ts
+const prepareProfileHydration = Effect.fnUntraced(function* (
+  queryClient: QueryClient,
+  json: string,
+) {
+  const snapshot: DehydratedState = JSON.parse(json)
+  const queries = yield* Effect.forEach(snapshot.queries, (query) =>
+    Schema.decodeUnknownEffect(PreparedProfile)(query.state.data).pipe(
+      Effect.map((data) => ({ ...query, state: { ...query.state, data } })),
+    ),
+  )
+  yield* Effect.sync(() => hydrate(queryClient, { ...snapshot, queries }))
+})
+```
+
+Provide `HydrationPreparation` through your application Context or ManagedRuntime. Await the
+result of `prepareProfileSnapshot` before publishing its JSON. On the browser, await
+`prepareProfileHydration` before allowing queries or components to read the hydrated cache. The
+latter decodes every entry before calling `hydrate`, so decoding failure leaves the destination
+cache untouched. Keep the preparation runtime alive until the Effect completes, and dispose it
+through the application's lifecycle.
+
+Neither preparation function puts an Effect or Promise into query data. The server cache keeps
+`Profile` values, the published snapshot contains encoded data, and the browser cache receives
+fully decoded `Profile` values. The Schema codec validates each profile; the surrounding snapshot
+must come from the matching application encoder. Query keys and metadata must also satisfy your
+JSON transport.
+
+## Omit failed queries by default
+
+Retain `defaultShouldDehydrateQuery` so failed queries stay out of the snapshot. The browser can
+refetch them with its own client and receive a fresh `EffectRpcQueryError` or
+`EffectHttpApiQueryError` and Cause. The recipes above preserve this policy even when selecting a
+profile prefix.
+
+If you deliberately transfer failed queries, define a safe application error representation.
+Encode and decode both `state.error` and `state.fetchFailureReason`; `serializeData` and
+`deserializeData` transform query data, not those error fields. Allowlist public failure tags and
+fields, omit private messages, defects, and transport details, and reconstruct the error behavior
+your UI requires. JSON serialization of an Error or Cause does not supply that policy. A safe
+error DTO will not automatically become either package error class or pass its type guard.
+
+For normal retry and error handling, keep failures local to each client and follow
+[Handle Failures](/effect-api-query/guides/handle-failures/) and
+[Retry Queries](/effect-api-query/guides/retry-queries/). For router ownership and cleanup, see
+[TanStack Start](/effect-api-query/guides/tanstack-start/).
diff --git a/apps/docs/src/content/docs/guides/mutations.md b/apps/docs/src/content/docs/guides/mutations.md
new file mode 100644
index 0000000..9008856
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/mutations.md
@@ -0,0 +1,51 @@
+---
+title: Mutations
+description: Build typed RPC and HTTP writes and refresh affected queries.
+---
+
+Use your ready utility tree and QueryClient from the [RPC quick start](/effect-api-query/getting-started/quick-start/)
+or [HTTP quick start](/effect-api-query/getting-started/http-quick-start/).
+The examples assume `users.create` accepts a `name` and returns a user with `id` and `name`.
+Import `MutationObserver` from `@tanstack/query-core` for imperative execution.
+
+## Execute a write
+
+Build options once, then supply each mutation's variables when it runs:
+
+```ts
+const createUser = new MutationObserver(
+  queryClient,
+  rpc.users.create.mutationOptions({
+    onSuccess: () => queryClient.invalidateQueries({ queryKey: rpc.users.key() }),
+  }),
+)
+const created = await createUser.mutate({ name: 'Ada' })
+```
+
+HTTP variables contain the complete decoded request:
+
+```ts
+const createHttpUser = new MutationObserver(
+  queryClient,
+  http.users.create.mutationOptions({
+    onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.key() }),
+  }),
+)
+const createdHttpUser = await createHttpUser.mutate({ payload: { name: 'Ada' } })
+```
+
+Native mutation hooks accept the same options. Callbacks infer the result, variables, and
+execution errors. Mutation keys identify the operation and exclude variables. Successful
+`undefined` remains `undefined`.
+
+## Choose cache updates
+
+Writes refresh reads through your callback policy. Invalidate affected generated prefixes,
+seed a known result with `setQueryData`, or apply an
+[optimistic write](/effect-api-query/guides/optimistic-writes/).
+The library derives builders from the contract; the call site chooses read or write semantics.
+Buffered multipart endpoints support mutations only.
+
+See [HTTP uploads](/effect-api-query/guides/http-queries-and-mutations/#upload-a-file),
+[Handle Failures](/effect-api-query/guides/handle-failures/), and
+[Cancellation](/effect-api-query/guides/cancellation/) for their execution boundaries.
diff --git a/apps/docs/src/content/docs/guides/optimistic-writes.md b/apps/docs/src/content/docs/guides/optimistic-writes.md
new file mode 100644
index 0000000..dec7f55
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/optimistic-writes.md
@@ -0,0 +1,96 @@
+---
+title: Optimistic User Writes
+description: Seed typed entries, roll back individual writes, and reconcile overlapping mutations.
+---
+
+Use generated concrete keys to update the reads affected by a mutation. Keep the write workflow
+in the application, where the relationship between a domain operation and its reads is known.
+
+The Vite React example applies this workflow to its existing user forms and directory. Copy
+[the user-write module](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/user-writes.ts)
+and compose it with your application's ready clients and QueryClient, as in
+[the application](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/application.ts).
+Its RPC and HTTP forms use the same application workflow and maintain distinct cache entries.
+
+## Seed the mutation response
+
+After creating a user, the example replaces that mutation's temporary entry in each cached
+list with the returned `User`. It also seeds these concrete detail keys:
+
+- `rpcQuery.users.get.queryKey({ id: user.id, locale: user.locale })`
+- `httpQuery.users.get.queryKey({ params: { id: user.id }, query: { locale: user.locale } })`
+
+The locale is part of the read input. A response with locale `fr` does not satisfy a detail query
+whose constructor supplies the default locale `en`.
+
+Use the generated DataTag keys directly with `getQueryData` and `setQueryData`. QueryClient owns
+the hash function, including global and prefix defaults; the generated keys also serve native
+cancellation and invalidation. Do not hash the keys independently.
+
+## Apply and reconcile an optimistic write
+
+The example's mutation options perform these actions:
+
+1. Capture the original owner and reserve the write before awaiting anything.
+2. Cancel the related RPC and HTTP reads through their generated user branch prefixes.
+3. Snapshot the affected list and infinite entries. For deletion, keep the removed entity and its
+   positions. For creation, allocate a temporary negative ID that belongs to this write.
+4. Publish the optimistic change. Pending users cannot be deleted through the forms.
+5. Replace a created user's temporary ID with the response, or roll back the failed write.
+6. Invalidate both user branches when the final overlapping write settles.
+
+Mutation responses remain ordinary Effect success values. An optimistic rollback restores the
+application's cache; it cannot undo work the server has accepted.
+
+## Preserve infinite pages
+
+The example updates its existing four-user page views through their generated infinite keys.
+It retains every page, `pageParams`, and unrelated user. A failed deletion restores only the
+removed user at its former page position, preserving users created in the meantime.
+
+Creation adjusts the total count on cached pages. It appends the new user to the last loaded page
+only when that page has no next cursor. A partial directory waits for reconciliation to determine
+where the user belongs. Each reconstructed page retains the `UserPage` representation.
+
+Offset pagination can change after deletion or insertion. Preserving the current page structure
+keeps the optimistic view usable until settlement invalidation refreshes the server's page
+boundaries and cursors. Add concrete keys for any other page sizes or filters your application
+uses; this example registers only its existing page size and initial cursor.
+
+## Keep overlapping writes safe
+
+A full snapshot rollback can erase a later successful write. The example instead removes a
+failed creation's own temporary user, or restores one deleted user without replacing the list.
+Overlapping deletions retain their original relative order, even when their failures finish in a
+different order. Rollback places the removed user beside surviving original neighbors and keeps
+newly created users.
+An authoritative cache update supersedes the optimistic revision, even if its data is unchanged.
+A failed deletion leaves that newer update intact.
+Deletions started after a refresh capture the current user and position for rollback.
+Overlapping deletions of the same user share the first snapshot: one successful deletion prevents
+an older failure from restoring it, while all failed deletions restore the original entity once.
+
+Each new write cancels an earlier reconciliation fetch before publishing its optimistic change.
+Only the final pending write triggers settlement refetches, so an older settlement does not
+refresh over a newer optimistic result. Success callbacks also cancel reads before seeding the
+returned value. Native cancellation prevents a cancelled query from publishing a late result.
+
+All writes to these views must participate in the same application workflow. Background domain
+refreshes, manual cache replacement, and server-side write conflicts need their own coordination.
+The example does not infer server ordering or define a general conflict-resolution policy.
+
+## Retain the original owner
+
+The `onMutate` result carries the original owner's commit, rollback, and settlement actions.
+Callbacks invoke those actions and check that owner is active. A late response can neither refill
+a cleared retired cache nor seed or invalidate a replacement client's entries.
+
+Native MutationObserver option updates can replace callbacks on a pending mutation. Carrying the
+transaction in `onMutate` prevents a later callback closure from redirecting an already-started
+write. Remount mutation consumers when replacing an application owner: an options change while
+`onMutate` awaits cancellation can otherwise replace the mutation function before it starts.
+
+Track mutation-function completion before releasing the application's ready clients. These
+writes use `networkMode: 'always'` and `retry: false`, so a retired owner does not retain paused
+mutation work. They do not use a native mutation scope queue. Mutations have no query abort signal;
+retirement and cache clearing do not cancel an accepted server write.
diff --git a/apps/docs/src/content/docs/guides/pagination.md b/apps/docs/src/content/docs/guides/pagination.md
new file mode 100644
index 0000000..28d48d5
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/pagination.md
@@ -0,0 +1,53 @@
+---
+title: Pagination
+description: Map page parameters to typed RPC payloads and HTTP requests.
+---
+
+Use a ready [RPC](/effect-api-query/getting-started/quick-start/) or
+[HTTP](/effect-api-query/getting-started/http-quick-start/) utility tree.
+These examples assume `users.page` accepts numeric `cursor` and `pageSize` fields and returns
+`{ users, nextCursor }`, with `null` marking the last page.
+
+## Build page options
+
+Map each page parameter to RPC payload constructor input:
+
+```ts
+const rpcPages = rpc.users.page.infiniteOptions({
+  initialPageParam: 0,
+  input: (cursor) => ({ cursor, pageSize: 20 }),
+  getNextPageParam: (page) => page.nextCursor ?? undefined,
+})
+const pages = await queryClient.infiniteQuery(rpcPages)
+```
+
+For HTTP, return every declared request container from the mapper:
+
+```ts
+const httpPages = http.users.page.infiniteOptions({
+  initialPageParam: 0,
+  input: (cursor) => ({ query: { cursor, pageSize: 20 } }),
+  getNextPageParam: (page) => page.nextCursor ?? undefined,
+})
+```
+
+Pass these options to the native infinite-query hook to load further pages with `fetchNextPage`.
+Inputless operations omit `input`. Input-bearing operations can pause with `input: skipToken`;
+see [Conditional Queries](/effect-api-query/guides/conditional-queries/).
+
+## Keep page identity stable
+
+The mapped initial request determines cache identity. Keep filters in that request and every
+page; rebuild options when filters change. The mapper runs during key construction and page
+execution, so keep it deterministic.
+
+TanStack stores `pages` and `pageParams`. A native `select` can flatten returned data while cache
+reads retain the original pages and inferred page-parameter type:
+
+```ts
+const cachedPages = queryClient.getQueryData(httpPages.queryKey)
+```
+
+Infinite views have separate keys from ordinary queries. Every page uses the query runner and
+abort signal. See [RPC Builders](/effect-api-query/reference/generated-builders/#build-an-infinite-query)
+and [HTTP Builders](/effect-api-query/reference/http-builders/#pagination) for exact option contracts.
diff --git a/apps/docs/src/content/docs/guides/queries.md b/apps/docs/src/content/docs/guides/queries.md
new file mode 100644
index 0000000..6e68904
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/queries.md
@@ -0,0 +1,52 @@
+---
+title: Queries
+description: Build typed query options for cached RPC and HTTP reads.
+---
+
+Start with a ready utility tree and QueryClient from the [RPC quick start](/effect-api-query/getting-started/quick-start/)
+or [HTTP quick start](/effect-api-query/getting-started/http-quick-start/).
+Here, `users.get` returns a user with `id` and `name`; its RPC payload has an `id` and default locale.
+The HTTP endpoint declares `params.id` and `query.locale`.
+
+## Fetch decoded data
+
+Pass RPC payload constructor input to `queryOptions`:
+
+```ts
+const userOptions = rpc.users.get.queryOptions({ input: { id: 1 }, staleTime: 30_000 })
+const user = await queryClient.query(userOptions)
+```
+
+HTTP options take the complete decoded request. Include every declared container:
+
+```ts
+const httpUserOptions = http.users.get.queryOptions({
+  input: { params: { id: 1 }, query: { locale: 'en' } },
+  staleTime: 30_000,
+})
+const httpUser = await queryClient.query(httpUserOptions)
+```
+
+These options also work with native query, suspense, and prefetch hooks. An inputless operation
+uses `queryOptions()`. Queries cache decoded success, with top-level `undefined` converted to `null`.
+Keep captured input values unchanged while using the options.
+
+## Select returned data
+
+Native options such as `staleTime`, `retry`, and `select` pass through:
+
+```ts
+const nameOptions = rpc.users.get.queryOptions({
+  input: { id: 1 },
+  select: (user) => user.name,
+})
+const selectedName = await queryClient.query(nameOptions)
+const cachedUser = queryClient.getQueryData(nameOptions.queryKey)
+```
+
+Hooks, observers, and `queryClient.query` return the selected name. The cache and `getQueryData`
+retain the decoded user; generated keys preserve that type. Builders supply `queryKey` and `queryFn`.
+Configure hashing through [QueryClient defaults](/effect-api-query/guides/query-defaults/).
+
+Continue with [Conditional Queries](/effect-api-query/guides/conditional-queries/),
+[Cache Keys and Filters](/effect-api-query/guides/cache-filters/), or your framework's integration guide.
diff --git a/apps/docs/src/content/docs/guides/query-defaults.md b/apps/docs/src/content/docs/guides/query-defaults.md
new file mode 100644
index 0000000..d74d994
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/query-defaults.md
@@ -0,0 +1,120 @@
+---
+title: Defaults and Policies
+description: Reuse native cache defaults and typed query or mutation policies.
+---
+
+Choose where each setting belongs, then reuse it across generated builders:
+
+| Scope                    | Use                                         | Suitable settings                                               |
+| ------------------------ | ------------------------------------------- | --------------------------------------------------------------- |
+| Cache owner or namespace | QueryClient defaults and generated prefixes | Common freshness, retry, garbage collection, and hashing        |
+| One leaf and query view  | `withQueryPolicy`                           | Freshness and typed data/error callbacks                        |
+| One mutation leaf        | `withMutationPolicy`                        | Typed invalidation and other mutation callbacks                 |
+| One call                 | The options builder                         | Input, selection, initial data, pagination, and local overrides |
+
+Use your existing utility tree and application-owned QueryClient. Policies preserve the original
+builder's inference; the library continues to supply its keys and execution functions.
+
+## Register native defaults
+
+In the cache module, import `QueryClient` from `@tanstack/query-core` and `viewPrefix` from
+`effect-api-query`:
+
+```ts
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: { staleTime: 30_000, gcTime: 600_000, retry: false, retryDelay: 250 },
+    mutations: { retry: false },
+  },
+})
+```
+
+After creating `rpc` with its ready client, register broader prefixes before narrower prefixes:
+
+```ts
+queryClient.setQueryDefaults(rpc.key(), { staleTime: 60_000 })
+queryClient.setQueryDefaults(rpc.users.key(), { retry: 2 })
+queryClient.setQueryDefaults(viewPrefix(rpc.users.get, 'query'), { staleTime: 120_000 })
+```
+
+TanStack merges global defaults, matching registered prefixes in registration order, and explicit
+builder options. It does not sort prefixes by specificity. Here `users.get` inherits
+`gcTime: 600_000`, `retry: 2`, and `staleTime: 120_000`; two retries allow at most three executions.
+
+`rpc.key()` covers the tree, `rpc.users.key()` covers its branch, and the view prefix covers only
+ordinary queries of that leaf, for every input. HTTP uses the same native APIs:
+
+```ts
+queryClient.setQueryDefaults(http.users.key(), { retry: 1 })
+queryClient.setQueryDefaults(viewPrefix(http.users.get, 'metadata'), { staleTime: 5_000 })
+```
+
+This five-second policy applies to metadata without changing the ordinary view's freshness.
+Register mutation defaults separately with native `setMutationDefaults` and `mutationKey()`.
+See [Cache Keys and Filters](/effect-api-query/guides/cache-filters/) for prefix scopes.
+
+Configure hashing through QueryClient defaults before using the cache, and keep it stable for the
+cache owner's lifetime. Builders reject per-call hashing overrides; see
+[Semantic Keys](/effect-api-query/concepts/semantic-keys/) for the identity contract.
+
+## Bind a reusable query policy
+
+Use `withQueryPolicy` when a policy belongs to one leaf and view. `QueryPolicy` gives reusable
+objects that leaf's native option types; retry and refetch callbacks retain its data and error types.
+Import both from `effect-api-query`:
+
+```ts
+const policy = {
+  staleTime: 30_000,
+  refetchOnWindowFocus: false,
+  retry: false,
+} satisfies QueryPolicy<typeof rpc.users.get>
+const userOptions = withQueryPolicy(rpc.users.get, 'query', policy)
+const user = userOptions({ input: { id: 1 }, select: (value) => value.name })
+const refreshUser = userOptions({ input: { id: 1 }, staleTime: 0, retry: false })
+```
+
+The returned builder keeps selected-data, defined-initial-data, skipped-input, and page-parameter
+inference. `QueryPolicy<Leaf, View>` supports only that leaf's query views: `query`, `infinite`,
+`metadata`, `live`, or `streamed`. Specify the view in the type when it is not `query`.
+See [Type Inference](/effect-api-query/reference/type-inference/) for cache and failure types, and
+[Retry Queries](/effect-api-query/guides/retry-queries/) for reusable domain-aware decisions.
+
+Policies accept applicable native freshness, retry, refetch, and cache settings. Keep input,
+`select`, initial and placeholder data, page parameters and mappers, and adapter controls at the
+call site. Stream retention and decoder policies determine cache identity and also stay local.
+
+A bound policy supplies explicit builder options, so it overrides QueryClient defaults. Call-site
+options override the bound policy. Omit a field to inherit it; use `staleTime: 0` or `retry: false`
+to replace an inherited setting.
+
+## Bind mutation invalidation
+
+Import `withMutationPolicy` from `effect-api-query`. Seed the returned user and invalidate affected
+reads once for every use of the creation builder:
+
+```ts
+const createUserOptions = withMutationPolicy(rpc.users.create, {
+  onSuccess: async (created) => {
+    queryClient.setQueryData(rpc.users.get.queryKey({ id: created.id }), created)
+    await queryClient.invalidateQueries({ queryKey: rpc.users.key() })
+  },
+})
+```
+
+Shared callbacks infer data, variables, and execution errors. `MutationPolicy<Leaf>` can annotate a
+reusable object. Its optimistic result is `unknown`: supply `onMutate` at each call site to infer
+that result in local callbacks. Here `reportCreationFailure` is the application's failure notifier:
+
+```ts
+const createUser = createUserOptions({
+  onMutate: (variables) => ({ submittedName: variables.name }),
+  onError: (error, _variables, context) => {
+    reportCreationFailure(context?.submittedName, error)
+  },
+})
+```
+
+A call-site callback replaces the corresponding shared callback. Compose callbacks explicitly
+when both must run. The [complete example](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-policies.ts)
+includes ready-client types and the imports used here.
diff --git a/apps/docs/src/content/docs/guides/react-query.md b/apps/docs/src/content/docs/guides/react-query.md
index a79d954..7aa6075 100644
--- a/apps/docs/src/content/docs/guides/react-query.md
+++ b/apps/docs/src/content/docs/guides/react-query.md
@@ -1,76 +1,195 @@
 ---
 title: React Query
-description: Use generated options with React Query hooks.
+description: Acquire a ready client and use generated options with native React Query hooks.
 ---
 
-Create the RPC utility tree beside the application's `QueryClient`, then provide both through your
-application context. Generated options pass directly to React Query hooks.
+Pass generated options directly to React Query's native hooks. Build the utility tree once for
+its ready client and cache owner. Rebuild options when component input changes; the builders
+capture plain input for that execution.
 
-In the example below, `AppRpcQuery` is your utility tree's type, such as `typeof rpcQuery`.
+## Acquire and mount the client
+
+Create a small client module and mount it once from your application entry point.
+This read-only example requires React, React DOM, `@tanstack/react-query`, Effect, and
+`effect-api-query`. The server must implement the shared contract below: `GET /users/:id`
+returns `{ id: number, name: string }`.
+
+### Contract and ready client
+
+Place this code in `users-app.tsx`. Move `usersApi` to your shared contract module when connecting
+it to a real server. `startUsersApplication` acquires the ready HTTP API client and keeps one runtime
+and QueryClient alive until `dispose` runs.
 
 ```tsx
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
-
-export const Users = ({ rpcQuery }: { rpcQuery: AppRpcQuery }) => {
-  const queryClient = useQueryClient()
-  const users = useQuery(rpcQuery.users.list.queryOptions())
-  const removeUser = useMutation(
-    rpcQuery.users.delete.mutationOptions({
-      onSuccess: () => queryClient.invalidateQueries({ queryKey: rpcQuery.users.key() }),
+import { QueryClient, QueryClientProvider, useQuery } from '@tanstack/react-query'
+import { ManagedRuntime, Schema } from 'effect'
+import { createHttpApiQueryUtils } from 'effect-api-query'
+import type { RunPromiseExit } from 'effect-api-query'
+import { FetchHttpClient } from 'effect/http'
+import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import { createRoot } from 'react-dom/client'
+
+const usersApi = HttpApi.make('users-api').add(
+  HttpApiGroup.make('users').add(
+    HttpApiEndpoint.get('get', '/users/:id', {
+      params: { id: Schema.Int },
+      success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
     }),
-  )
-
-  if (users.data === undefined) return null
-
-  return (
-    <ul>
-      {users.data.map((user) => (
-        <li key={user.id}>
-          {user.name}
-          <button onClick={() => removeUser.mutate({ id: user.id })}>Delete</button>
-        </li>
-      ))}
-    </ul>
-  )
+  ),
+)
+
+const startUsersApplication = async (baseUrl: string) => {
+  const runtime = ManagedRuntime.make(FetchHttpClient.layer)
+  const running = new Set<Promise<unknown>>()
+  const runPromiseExit: RunPromiseExit = (effect, options) => {
+    const pending = runtime.runPromiseExit(effect, options)
+    running.add(pending)
+    void pending.then(
+      () => running.delete(pending),
+      () => running.delete(pending),
+    )
+    return pending
+  }
+  try {
+    const client = await runtime.runPromise(HttpApiClient.make(usersApi, { baseUrl }))
+    const queryClient = new QueryClient()
+    const http = createHttpApiQueryUtils(usersApi, {
+      client,
+      keyPrefix: ['users-app'],
+      runPromiseExit,
+    })
+    return {
+      http,
+      queryClient,
+      dispose: async () => {
+        try {
+          await queryClient.cancelQueries()
+        } finally {
+          try {
+            await Promise.allSettled([...running])
+          } finally {
+            queryClient.clear()
+            await runtime.dispose()
+          }
+        }
+      },
+    }
+  } catch (error) {
+    await runtime.dispose()
+    throw error
+  }
 }
 ```
 
-Payload-bearing queries take constructor input inside the options argument:
+The supplied runner forwards TanStack's abort options and tracks in-flight reads. After cancellation,
+disposal waits for their Effect finalizers before releasing the runtime. Client acquisition finishes
+before React renders. Acquisition failures also dispose the runtime.
 
-```ts
-useQuery(rpcQuery.users.get.queryOptions({ input: { id: 1 } }))
-```
-
-Pass mutation variables when calling `mutate`:
+### Component and provider
 
-```ts
-const createUser = useMutation(rpcQuery.users.create.mutationOptions())
-createUser.mutate({ name: 'Ada' })
-```
+Continue in the same module. The component receives the ready utility tree through props;
+`QueryClientProvider` exposes the matching cache to React Query.
 
-Streaming RPCs use the ordinary `useQuery` and `useSuspenseQuery` hooks. Choose whether the cache
-should retain every value or only the latest value:
+```tsx
+type UsersApplication = Awaited<ReturnType<typeof startUsersApplication>>
+
+const User = ({ application }: { readonly application: UsersApplication }) => {
+  const user = useQuery(application.http.users.get.queryOptions({ input: { params: { id: 1 } } }))
+  if (user.isPending) {
+    return <p>Loading user…</p>
+  }
+  if (user.isError) {
+    return <p role="alert">Could not load the user.</p>
+  }
+  return <h1>{user.data.name}</h1>
+}
 
-```ts
-const events = useQuery(rpcQuery.events.watch.streamedOptions())
-const latestEvent = useQuery(rpcQuery.events.watch.liveOptions())
+export const mountUsersApplication = async (element: HTMLElement, baseUrl: string) => {
+  const application = await startUsersApplication(baseUrl)
+  const root = createRoot(element)
+  root.render(
+    <QueryClientProvider client={application.queryClient}>
+      <User application={application} />
+    </QueryClientProvider>,
+  )
+  return async () => {
+    root.unmount()
+    await application.dispose()
+  }
+}
 ```
 
-The package owns each generated `queryFn`, `queryKey`, `queryKeyHashFn`, `mutationFn`, and
-`mutationKey`. Stream builders own the same query fields. Other TanStack Query options, including `select`,
-`retry`, and lifecycle callbacks, retain their normal TanStack types.
+### Application entry point
 
-## Use an HTTP endpoint
-
-The same hooks accept HTTP options. For an endpoint that declares an `id` parameter, use:
+In `main.tsx`, mount into the root element supplied by your HTML page. Replace the base URL with
+your server's URL.
 
 ```ts
-const user = useQuery(http.users.get.queryOptions({ input: { params: { id: 1 } } }))
-```
+import { mountUsersApplication } from './users-app.tsx'
 
-Follow [HTTP Queries and Mutations](/effect-api-query/guides/http-queries-and-mutations/) to create
-the HTTP utilities and configure mutation invalidation.
+const element = document.getElementById('root')
+if (element === null) {
+  throw new Error('Missing application root element')
+}
+
+export const stopUsers = await mountUsersApplication(element, 'http://localhost:3000')
+```
 
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts) and
-[public HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts) compile these hook patterns.
-The [Vite React example](/effect-api-query/examples/) provides the application setup.
+The host calls and awaits `stopUsers()` when tearing down this application;
+it unmounts React, cancels outstanding reads, awaits their local finalizers, clears the cache,
+and disposes the runtime.
+A browser's unload event cannot guarantee that async cleanup finishes.
+
+This example has one buffered read. Before adding open streams or concurrent writes, use
+[Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) to await their cleanup and settlement.
+For RPC, replace client acquisition with the Scope and protocol in
+[RPC Quick Start](/effect-api-query/getting-started/quick-start/) and pass the resulting RPC utility
+tree to the component. The provider and React hooks stay the same.
+
+## Choose the native hook
+
+The provider and component above use a buffered HTTP query. RPC uses the same hooks with its
+[constructor input](/effect-api-query/concepts/data-normalization/#query-stable-rpc-payloads);
+HTTP takes [decoded request input](/effect-api-query/concepts/data-normalization/#decoded-http-inputs).
+
+| Native consumer    | Generated options                      | Cached representation                                  |
+| ------------------ | -------------------------------------- | ------------------------------------------------------ |
+| `useQuery`         | `queryOptions`, HTTP `metadataOptions` | Decoded data, or decoded data with status and headers  |
+| `useInfiniteQuery` | `infiniteOptions`                      | Pages with their page parameters                       |
+| `useQuery`         | `streamedOptions`, `liveOptions`       | Retained history, or the latest emitted value          |
+| `useMutation`      | `mutationOptions`                      | Mutation result; variables supplied when `mutate` runs |
+
+Pass `select`, `staleTime`, retry policy, and other native options through the builder.
+`select` changes observer data while the cache retains the generated view's query data.
+Configure hashing on QueryClient before cache use. The package owns the generated key and function.
+See [RPC Builders](/effect-api-query/reference/generated-builders/) and
+[HTTP Builders](/effect-api-query/reference/http-builders/) for each view's exact contract.
+
+## Share policy and refresh affected reads
+
+Use [Defaults and Policies](/effect-api-query/guides/query-defaults/) to bind an endpoint-aware
+policy once, then reuse it in components, imperative queries, or route loaders. A call-site
+projection or callback keeps its native inference.
+
+For writes, pass generated mutation options to `useMutation` and supply variables through
+`mutate`. Choose the affected generated keys in the application: writes do not invalidate reads
+automatically. Use [Cache Keys and Filters](/effect-api-query/guides/cache-filters/) for broad or exact
+invalidation and [Optimistic Updates](/effect-api-query/guides/optimistic-writes/) for response seeding,
+rollback, and overlapping writes.
+
+## Streams and Suspense
+
+Ordinary hooks can show stream data while fetching continues. Choose
+[history retention](/effect-api-query/guides/choose-stream-history/) for accumulated views and keep
+clients alive until local iterator finalizers finish.
+
+TanStack documents that cancellation does not work with its Suspense hooks. Use ordinary query
+hooks when cancelling reads or stopping open stream work is part of the screen's lifecycle.
+For buffered reads with Suspense, use
+[Suspense and Error Recovery](/effect-api-query/guides/suspense-and-recovery/) for reset/retry,
+cached-data refetch failures, and independent loading with `useSuspenseQueries`.
+
+For router loaders and server rendering, continue with
+[Router and Start](/effect-api-query/guides/tanstack-start/).
+The [Vite React example](/effect-api-query/examples/#run-vite-react) is a complete application with
+reads, writes, streams, private cache owners, and resource disposal.
diff --git a/apps/docs/src/content/docs/guides/refresh-from-events.md b/apps/docs/src/content/docs/guides/refresh-from-events.md
new file mode 100644
index 0000000..4da4635
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/refresh-from-events.md
@@ -0,0 +1,101 @@
+---
+title: Refresh Reads from Domain Events
+description: Map domain delivery and Effect Reactivity to scoped native Query invalidation.
+---
+
+Use one application-owned consumer to map a domain event to the reads it changes. The mapping
+must name both adapters when RPC and HTTP represent the same domain: their generated cache roots
+remain separate.
+
+Copy [the user-event consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/fixtures/user-events.ts)
+next to your owner, write, and client modules, adjusting its local application imports. Its inputs are the captured owner and
+an application-owned Effect Reactivity service. Supply your own decoded network stream; the module
+creates no connection, broker, provider, or second cache.
+
+## Map events to reads
+
+The `users.v1` envelope includes the consumer's `ownerKey`, a positive safe-integer cursor, and one
+of these event kinds:
+
+| Event                                  | Reads invalidated                                                 |
+| -------------------------------------- | ----------------------------------------------------------------- |
+| `users.changed`                        | RPC and HTTP list/page prefixes, including infinite page entries. |
+| `user.changed`, with `id` and `locale` | Those directory prefixes and both exact user-detail keys.         |
+| `users.reset`                          | Both complete user branches.                                      |
+
+Other user IDs, locales, and diagnostic branches remain untouched by an ordinary detail event.
+Generated keys and native filters retain the owning QueryClient's global and prefix hash defaults.
+The mapping depends on the domain relationship, so the package does not infer it from mutation or
+event names.
+
+The `ownerKey` contains safe tenant, user, session, and permission-generation identity. It is a
+routing partition, not authentication. The application must authenticate the transport and
+validate which owner may receive each event.
+
+## Register one consumer for the owner
+
+`makeUserEventConsumer`, `decodeUserEvent` and `flush` are application helpers from the linked
+consumer module. Import `Effect` and `Stream` from `effect`; provide the captured `owner` and
+application `reactivity` service. Inside the owner's Effect Scope, acquire once:
+
+Acquire `consumer` with `yield* makeUserEventConsumer(owner, reactivity, { observedUsers:
+[{ id: 1, locale: 'en' }] })`. This registers the owner's selected local detail mappings.
+
+In that same scope, attach the supplied network stream with its existing service/error channels:
+
+```ts
+const consume = <E, R>(events: Stream.Stream<unknown, E, R>) =>
+  events.pipe(
+    Stream.mapEffect((event) => decodeUserEvent(event)),
+    Stream.runForEach(consumer.deliver),
+    Effect.ensuring(Effect.promise(consumer.flush)),
+  )
+```
+
+Run `consume(events)` with the application's runtime. The
+[complete typed attachment](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-user-events.ts)
+shows composition. It rejects inactive/duplicate owners and unregisters listeners on Scope closure.
+A retired consumer ignores late delivery and cannot redirect it to a replacement QueryClient.
+Close its Scope, cancel/drain started reads, then release clients before replacing the owner.
+See [Switch Cache Owners](/effect-api-query/guides/switch-cache-owners/).
+
+## Coalesce local invalidation
+
+Use the consumer's `reactivityKeys.directory`, `reactivityKeys.all`, or
+`reactivityKeys.user({ id, locale })` with Effect Reactivity. Exact local user mappings exist for
+the `observedUsers` registered when the consumer starts; include every detail read your local
+writers must refresh. Delivered domain events can target any valid user.
+
+These keys are stable application strings. Reactivity hashes its own keys; a TanStack query tuple
+has no implied Reactivity subscription or prefix relationship. Register the deliberate mapping
+rather than passing generated tuples to both systems.
+
+The consumer coalesces invalidation intent and lets broad refreshes subsume narrow work.
+It defers refresh while its captured QueryClient has pending mutations, protecting optimistic
+writes; other refresh paths need the same application policy. `flush()` drains runnable batches,
+leaving intent queued during pending writes. Refresh-job errors go to `onRefreshError`; query
+errors retain native Query retry/state behavior. See the linked consumer for its bookkeeping
+bounds and [Optimistic User Writes](/effect-api-query/guides/optimistic-writes/) for overlap rules.
+
+## Resume delivery deliberately
+
+This recipe assumes one ordered, monotonically increasing cursor sequence per owner. It ignores
+cursors already accepted. A gap queues a full user-branch refresh and advances the accepted cursor.
+The cursor records accepted invalidation intent; it is not a durable acknowledgement or a claim
+that a read succeeded.
+
+Reconnect using `consumer.cursor()` as the last accepted cursor. Call `consumer.resume(true)` when
+the transport can replay subsequent events in order. Replayed duplicates remain harmless. If
+replay is unavailable, call `consumer.resume(false)` before accepting the new sequence: it resets
+the cursor and refreshes both user branches. Stop delivery from the old connection first.
+
+The application owns reconnect backoff, replay retention, cursor storage, source epochs, schema
+migration, authorization, acknowledgements, and out-of-order delivery handling. A new owner Scope
+starts at cursor zero. Fetch its authoritative reads on startup; this recipe does not promise
+durable or exactly-once delivery. Invalid envelopes fail Schema decoding before changing the cursor.
+
+## Choose a visible stream view
+
+Use a live query for complete snapshots or bounded history for recent events. The latest delta
+alone does not reconstruct state. An indefinitely open `replace` stream does not publish a
+replacement before completion; see [Choose Stream History](/effect-api-query/guides/choose-stream-history/).
diff --git a/apps/docs/src/content/docs/guides/retry-queries.md b/apps/docs/src/content/docs/guides/retry-queries.md
new file mode 100644
index 0000000..0e5da3c
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/retry-queries.md
@@ -0,0 +1,141 @@
+---
+title: Retry Queries
+description: Reuse bounded read policies with typed Effect failures and native Query options.
+---
+
+Bind a retry policy once with `withQueryPolicy`, then call the returned options builder wherever
+you need that read. Each call keeps native `select`, input, and initial-data inference. Call-site
+options replace matching defaults.
+
+The policy below permits two retries after the initial failure: at most three executions. It
+allows a declared `RetryLater` or an application-approved transport failure. Use it for idempotent
+reads whose transport does not already own retries.
+
+## Share the decision and delay
+
+Import `Cause`, `Result`, and `Schema` from `effect`. Define `RetryLater` with a finite
+`retryAfterMs` field in your contract, then reuse this application helper for RPC and HTTP:
+
+```ts
+const retryPolicy = <Error, Failure>(
+  causeOf: (error: Error) => Cause.Cause<Failure> | undefined,
+  isTransient: (failure: Failure) => boolean,
+) => ({
+  retry: (failureCount: number, error: Error) => {
+    const cause = causeOf(error)
+    if (
+      !cause ||
+      failureCount >= 2 ||
+      Cause.hasDies(cause) ||
+      Cause.hasInterrupts(cause) ||
+      cause.reasons.length !== 1
+    ) {
+      return false
+    }
+    const failure = Cause.findError(cause)
+    return (
+      Result.isSuccess(failure) &&
+      (Schema.is(RetryLater)(failure.success) || isTransient(failure.success))
+    )
+  },
+  retryDelay: (attemptIndex: number, error: Error) => {
+    const cause = causeOf(error)
+    if (cause) {
+      const failure = Cause.findError(cause)
+      if (Result.isSuccess(failure) && Schema.is(RetryLater)(failure.success)) {
+        return Math.min(30_000, Math.max(0, failure.success.retryAfterMs))
+      }
+    }
+    return Math.min(1_000 * 2 ** attemptIndex, 30_000)
+  },
+})
+```
+
+This rejects defects, interruptions, and Causes with multiple reasons. `Cause.findError` returns
+a `Result`; the successful value retains the typed failure union. Schema refinement also handles
+unknown values safely. The adapter guard rejects custom runner failures that pass through unchanged.
+
+## Bind a typed RPC policy
+
+Import `withQueryPolicy`, `isEffectRpcQueryError`, and the type `InferQueryError` from
+`effect-api-query`, plus `RpcClientError` from `effect/rpc`. After acquiring your ready client and
+creating `rpc`, bind the profile read:
+
+```ts
+type Error = InferQueryError<typeof rpc.profile.read>
+const read = withQueryPolicy(
+  rpc.profile.read,
+  'query',
+  retryPolicy(
+    (error: Error) => (isEffectRpcQueryError(error) ? error.cause : undefined),
+    (failure) =>
+      Schema.is(RpcClientError.RpcClientError)(failure) &&
+      failure.reason._tag === 'HttpError' &&
+      failure.reason.kind === 'TransportError',
+  ),
+)
+return read()
+```
+
+This application allows only RPC's HTTP transport failures. Socket and worker reconnect policy
+belongs to the application that owns those transports.
+
+## Bind the same decision to HTTP
+
+Import `isEffectHttpApiQueryError` from `effect-api-query` and `HttpClientError` from `effect/http`. Keep the shared retry
+logic and supply HTTP's transport classifier:
+
+```ts
+type Error = InferQueryError<typeof http.profile.read>
+const read = withQueryPolicy(
+  http.profile.read,
+  'query',
+  retryPolicy(
+    (error: Error) => (isEffectHttpApiQueryError(error) ? error.cause : undefined),
+    (failure) =>
+      HttpClientError.isHttpClientError(failure) && failure.reason._tag === 'TransportError',
+  ),
+)
+return read()
+```
+
+Encoding, decoding, response, `NotFound`, and authentication failures receive no retry. Restore an
+expired session before invalidating its affected queries.
+
+The [complete compiled recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-retry.ts)
+contains the contracts and both ready-client factories. See [Query Defaults](/effect-api-query/guides/query-defaults/)
+for policy types, mutation callbacks, and precedence.
+
+## Set defaults deliberately
+
+| Execution                                                      | Native retry default without application overrides |
+| -------------------------------------------------------------- | -------------------------------------------------- |
+| Browser query observer, such as `useQuery`                     | Three retries after the initial attempt            |
+| Server query observer                                          | Zero retries                                       |
+| Imperative `queryClient.query` and `queryClient.infiniteQuery` | Retries disabled                                   |
+| Mutation                                                       | Retries disabled                                   |
+
+QueryClient global and prefix defaults still apply. Set `retry` explicitly when attempt counts
+matter. `retry: 2` permits three executions; `retry: false` permits one.
+
+Choose one layer to own retries. Two retries in TanStack combined with two retries per invocation
+in Effect can make nine client attempts. A retry around iterable creation does not retry later
+stream consumption. Restart a stream only when safe for that operation; retention and refetch policy
+still govern cache publication. Mutation retries require application idempotency.
+
+`retryDelay` receives a zero-based attempt index and returns milliseconds. Query Core can evaluate
+it for terminal failures, so keep it pure. This recipe clamps server delays and exponential backoff
+to 30 seconds.
+
+## Handle preparation before execution
+
+Factory, builder, and key-generation errors are synchronous. Prepare options inside `try` when
+input or custom encoders may fail, then pass successful options to Query Core. Preparation failures
+never enter execution retry. An infinite page-input mapper runs later; its thrown errors pass
+through unchanged. Mutation encoding occurs inside the ready client's Effect and uses its Cause.
+
+Keep QueryClient hashing stable while entries remain cached. `UnsupportedQueryHash` rejects an
+incompatible stream cache policy; retries cannot repair it. Retire the cache before replacing its
+hasher. See [Failure Handling](/effect-api-query/guides/handle-failures/) for error-stage guards and
+[Client Lifecycle](/effect-api-query/concepts/client-lifecycle/#stream-creation-and-consumption)
+for stream execution boundaries.
diff --git a/apps/docs/src/content/docs/guides/solid-query.md b/apps/docs/src/content/docs/guides/solid-query.md
new file mode 100644
index 0000000..edec2ed
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/solid-query.md
@@ -0,0 +1,57 @@
+---
+title: Solid Query
+description: Rebuild generated options with a Solid accessor and keep client resources alive.
+---
+
+Pass generated options from either factory to Solid Query's native hooks. Configure
+`QueryClientProvider` and acquire the ready client before creating the utilities.
+
+The examples target Solid 1.9.15 with Solid Query 5.104.0 and Query Core 5.104.0.
+
+## Rebuild options when input changes
+
+Builders capture plain input when called. Build options inside Solid's options accessor so a
+changed input produces a new key and query function. Passing a builder's result once leaves the
+query attached to the original input.
+
+Keep [captured inputs unchanged](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+while their options can execute.
+
+In component setup, use `rpc` from your [ready client](/effect-api-query/getting-started/quick-start/)
+and pass the builder call as an accessor. Here `users.read` accepts an ID and returns a user
+with `name`:
+
+```ts
+import { useQuery } from '@tanstack/solid-query'
+import { skipToken } from 'effect-api-query'
+import { createSignal } from 'solid-js'
+
+import { rpc } from './queries.ts'
+
+const [userId] = createSignal<number | undefined>(1)
+const user = useQuery(() => {
+  const id = userId()
+  return rpc.users.read.queryOptions({
+    input: id === undefined ? skipToken : { id },
+    select: (value) => value.name,
+  })
+})
+```
+
+Read the selected value from `user.data`. Apply the same accessor pattern to `infiniteOptions`,
+`streamedOptions`, `liveOptions`, and `metadataOptions` when their input changes. Use
+`useMutation(() => rpc.users.write.mutationOptions())` for writes, supplying each execution's
+input through `mutate(variables)`. Read reactive mutation settings inside the accessor.
+
+## Choose native options carefully
+
+Solid accepts Core's `enabled(query)` callback. Solid Query 5.104.0 query and infinite-query
+overloads accept defined initial data or absent initial data. A value or initializer that may
+return `undefined` does not match those overloads. Omit `initialData` or supply a defined seed.
+An explicit `initialData: undefined` overrides inherited QueryClient initial data.
+
+## Own the native integration
+
+Follow the [shared integration lifetime](/effect-api-query/integrations/#own-the-cache-and-client-lifetime)
+for providers, observer removal, stream finalizers, and accepted mutations. Match this native
+wrapper to the application's Query Core and the framework's supported compiler/tooling.
diff --git a/apps/docs/src/content/docs/guides/stream-snapshots.md b/apps/docs/src/content/docs/guides/stream-snapshots.md
new file mode 100644
index 0000000..b4d06c1
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/stream-snapshots.md
@@ -0,0 +1,80 @@
+---
+title: Stream Snapshots
+description: Capture an accumulated or live stream for server rendering and hydrate an independent browser cache.
+---
+
+Use `fetchStreamSnapshot` when server rendering needs data from an open RPC or HTTP SSE query.
+It waits for the first new cache publication or normal completion, cancels the exact query, and
+awaits its local iterator cleanup. Ordinary `queryClient.query` waits for an open stream to finish.
+
+## Capture data before dehydration
+
+Import `fetchStreamSnapshot` from `effect-api-query`. In the request loader or server snapshot
+module, use your existing `rpc`, request-local `queryClient` and abort `signal`. Keep the ready
+client and runner alive until capture settles. For the declared `updates.watch` stream:
+
+```ts
+const input = { channel: 'announcements' }
+const history = await fetchStreamSnapshot(
+  queryClient,
+  rpc.updates.watch.streamedOptions({
+    input,
+    retry: false,
+    maxChunks: 20,
+  }),
+  { signal, timeoutMs: 5_000 },
+)
+```
+
+In the same request, capture the independent latest-value view:
+
+```ts
+const latest = await fetchStreamSnapshot(
+  queryClient,
+  rpc.updates.watch.liveOptions({
+    input,
+    retry: false,
+  }),
+  { signal, timeoutMs: 5_000 },
+)
+```
+
+Then dehydrate successful data with your application's serializer, and dispose request resources
+after cleanup. HTTP SSE accepts the same helper with its generated options. The
+[complete typed recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/docs-stream-snapshot.ts)
+includes contract/client composition; [Hydrate Query Views](/effect-api-query/guides/hydrate-query-views/)
+covers history, live values and paired codecs.
+
+The default `fresh` mode starts a new attempt even when cached or initial data has a future
+timestamp. Old data cannot settle that attempt. Native stream policies still apply: `append`
+includes existing history, and `replace` on a previously fetched query publishes only at completion.
+An open replacement stream therefore needs to complete or reach the timeout.
+
+Choose `mode: 'cached'` to return an existing successful value without starting or cancelling work.
+The helper applies native `select`, including QueryClient defaults. When no successful cache entry
+exists, cached mode starts a fresh capture.
+
+## Keep capture ownership exclusive
+
+Use a request-local QueryClient and reserve the exact key throughout capture. A fresh capture
+rejects a key that is fetching, paused, or observed. Other keys keep running. Avoid same-key writes,
+observers, or concurrent fetches until capture settles: an external `setQueryData` publication can
+otherwise be mistaken for the stream's first value. Configure hashing through QueryClient global
+or prefix defaults; per-call `queryHash` and `queryKeyHashFn` are rejected.
+
+The helper waits for the supplied query function to finish local cleanup before returning or rejecting.
+Dispose the server's ready client, Scope, or runtime after that settlement. This does not await a
+remote server's cancellation acknowledgement. A finalizer that never finishes also prevents
+settlement; `timeoutMs` limits the wait for data, not the duration of finalization.
+
+## Hydrate and reconnect in the browser
+
+Give the browser its own QueryClient, ready client, runner, and Scope. Hydrate the server snapshot
+using the same safe key prefix and input, then observe the generated stream options with your
+usual refetch policy. A new browser fetch reconnects with browser-owned resources; disposing the
+server's resources cannot dispose those resources.
+
+The [TanStack Start example](/effect-api-query/guides/tanstack-start/) captures server snapshots
+and reconnects accumulated and live views after hydration. The
+[helper reference](/effect-api-query/reference/public-exports/#fetchstreamsnapshot) defines timeout,
+abort, failure, empty-stream, and completion outcomes.
diff --git a/apps/docs/src/content/docs/guides/streaming.md b/apps/docs/src/content/docs/guides/streaming.md
new file mode 100644
index 0000000..fb82c49
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/streaming.md
@@ -0,0 +1,68 @@
+---
+title: Streaming
+description: Cache accumulated or latest values from RPC streams and HTTP SSE.
+---
+
+Streaming leaves provide two views: an accumulated streamed query caches emissions in order;
+a live query caches the latest value. Use ordinary query hooks or `QueryObserver` for both.
+Start with a ready [RPC](/effect-api-query/getting-started/quick-start/) or
+[HTTP](/effect-api-query/getting-started/http-quick-start/) utility tree.
+Here, `diagnostics.stream` is an inputless RPC emitting strings, and `events.watch` is an HTTP SSE
+endpoint declaring `query.channel` and emitting strings.
+
+## Accumulate values
+
+Choose a finite history for a long-running feed:
+
+```ts
+const history = rpc.diagnostics.stream.streamedOptions({
+  maxChunks: 100,
+  refetchMode: 'reset',
+})
+```
+
+HTTP SSE supports the same history controls and a separate decoder limit:
+
+```ts
+const sseHistory = http.events.watch.streamedOptions({
+  input: { query: { channel: 'news' } },
+  maxChunks: 100,
+  sseOptions: { maxEventSize: 1024 * 1024 },
+})
+```
+
+The first emission makes the query successful while fetching continues. `maxChunks` bounds
+cached elements after each emission; omitted means unlimited. It does not bound bytes or
+transport buffering. Refetch mode `reset` starts a new history, `append` adds to it, and `replace`
+keeps the old history until successful completion. An indefinitely open replacement keeps
+showing that old history. Accumulated streams can succeed without emissions.
+
+## Keep the latest value
+
+Choose live options for current state:
+
+```ts
+const latest = rpc.diagnostics.stream.liveOptions()
+const latestSse = http.events.watch.liveOptions({
+  input: { query: { channel: 'news' } },
+  sseOptions: { maxEventSize: 1024 * 1024 },
+})
+```
+
+Each emission replaces cached data; completion preserves it. Live queries convert top-level
+`undefined` to `null`, while accumulated elements retain `undefined`. Empty live completion
+raises the adapter's empty-stream error. Live options accept neither `maxChunks` nor `refetchMode`.
+
+## Address and stop a view
+
+Reuse the options' `queryKey` for exact cache access. Accumulated history policies and HTTP decoder
+policies affect identity; live and accumulated views remain separate. Endpoint prefixes match
+all their views.
+
+Cancellation closes the stream iterator. Your application owns reconnection, resume policy,
+and client lifetime. HTTP `sseOptions.maxEventSize` bounds pending parser text in JavaScript string
+code units; its default is 10 × 1024 × 1024 code units. Declared resume headers belong in `input.headers`.
+
+See [Choose Stream History](/effect-api-query/guides/choose-stream-history/) for retention and
+buffering, [Stream Snapshots](/effect-api-query/guides/stream-snapshots/) for finite server captures,
+and [Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) for cleanup ownership.
diff --git a/apps/docs/src/content/docs/guides/suspense-and-recovery.md b/apps/docs/src/content/docs/guides/suspense-and-recovery.md
new file mode 100644
index 0000000..6b5c3da
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/suspense-and-recovery.md
@@ -0,0 +1,194 @@
+---
+title: Suspense and Error Recovery
+description: Reset failed Suspense queries, preserve cached data, and start independent reads together.
+---
+
+Use TanStack's native Suspense hooks inside an existing `QueryClientProvider`, such as the
+[React client setup](/effect-api-query/guides/react-query/#acquire-and-mount-the-client).
+`useSuspenseQuery` provides defined data after its loading boundary resolves. An initial failure
+reaches the nearest React error boundary after retries finish.
+
+TanStack documents that cancellation does not work with `useSuspenseQuery`,
+`useSuspenseQueries`, or `useSuspenseInfiniteQuery`. Choose `useQuery` or `useInfiniteQuery`
+when your screen depends on cancellation, including stopping open stream work when observation
+ends. Generated signal forwarding does not remove this native hook limitation.
+See [TanStack query cancellation](https://tanstack.com/query/latest/docs/framework/react/guides/query-cancellation#limitations).
+
+## Define a displayable failure
+
+This complete recipe uses a ready client for the following RPC contract. The application chooses
+which declared messages are suitable for users. Error boundaries receive `unknown`; recognize the
+execution wrapper and validate its Cause failure with Schema before reading a domain message.
+Transport failures, defects, and unexpected errors use a generic fallback.
+
+```tsx
+import {
+  QueryErrorResetBoundary,
+  useSuspenseQueries,
+  useSuspenseQuery,
+} from '@tanstack/react-query'
+import { Cause, Result, Schema } from 'effect'
+import { createRpcQueryUtils, isEffectRpcQueryError } from 'effect-api-query'
+import type { InferQueryData, InferQueryError } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+import { Component, Suspense } from 'react'
+import type { ReactNode } from 'react'
+
+export class UserUnavailable extends Schema.TaggedError<UserUnavailable>()('UserUnavailable', {
+  message: Schema.String,
+}) {}
+
+export const suspenseGroup = RpcGroup.make(
+  Rpc.make('users.get', {
+    payload: { id: Schema.Int },
+    success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+    error: UserUnavailable,
+  }),
+)
+
+export const makeSuspenseQueries = <E,>(
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof suspenseGroup>, E>,
+) =>
+  createRpcQueryUtils<typeof suspenseGroup, readonly ['suspense-users'], E>(suspenseGroup, {
+    client,
+    keyPrefix: ['suspense-users'],
+  })
+
+export type Queries<E> = ReturnType<typeof makeSuspenseQueries<E>>
+
+export const failureMessage = (error: unknown): string => {
+  if (isEffectRpcQueryError(error)) {
+    const failure = Cause.findError(error.cause)
+    if (
+      error.cause.reasons.length === 1 &&
+      Result.isSuccess(failure) &&
+      Schema.is(UserUnavailable)(failure.success)
+    ) {
+      return failure.success.message
+    }
+  }
+  return 'The request failed. Please try again.'
+}
+```
+
+## Reset both boundaries
+
+React owns the error boundary below. `QueryErrorResetBoundary` supplies its `onReset` callback.
+The retry button first resets TanStack's failed-query boundary, then clears React's error state
+so the component can mount and fetch again. This uses React's built-in Component class and
+requires no additional error-boundary package.
+
+```tsx
+interface BoundaryProps {
+  readonly children: ReactNode
+  readonly onReset: () => void
+}
+
+interface BoundaryState {
+  readonly failed: boolean
+  readonly error: unknown
+}
+
+class RequestErrorBoundary extends Component<BoundaryProps, BoundaryState> {
+  override state: BoundaryState = { failed: false, error: undefined }
+
+  static getDerivedStateFromError(error: unknown): BoundaryState {
+    return { failed: true, error }
+  }
+
+  reset = () => {
+    this.props.onReset()
+    this.setState({ failed: false, error: undefined })
+  }
+
+  override render() {
+    if (this.state.failed) {
+      return (
+        <div role="alert">
+          <p>{failureMessage(this.state.error)}</p>
+          <button type="button" onClick={this.reset}>
+            Try again
+          </button>
+        </div>
+      )
+    }
+    return this.props.children
+  }
+}
+```
+
+## Preserve data after a failed refresh
+
+Use both boundaries around the component. This example disables automatic retries so the user
+can choose when to retry. It retains native Suspense behavior: a failed initial load reaches the
+boundary; a failed background refetch keeps cached data visible and displays an inline error.
+The Refresh button retries that background request.
+
+```tsx
+const UserDetails = <E,>({ rpc }: { readonly rpc: Queries<E> }) => {
+  const user = useSuspenseQuery(
+    rpc.users.get.queryOptions({ input: { id: 1 }, retry: false, staleTime: 30_000 }),
+  )
+  return (
+    <>
+      <h2>{user.data.name}</h2>
+      {user.error !== null && !user.isFetching ? (
+        <p role="alert">{failureMessage(user.error)}</p>
+      ) : null}
+      <button type="button" onClick={() => void user.refetch()} disabled={user.isFetching}>
+        Refresh
+      </button>
+    </>
+  )
+}
+
+export const UserScreen = <E,>({ rpc }: { readonly rpc: Queries<E> }) => (
+  <QueryErrorResetBoundary>
+    {({ reset }) => (
+      <RequestErrorBoundary onReset={reset}>
+        <Suspense fallback={<p>Loading user…</p>}>
+          <UserDetails rpc={rpc} />
+        </Suspense>
+      </RequestErrorBoundary>
+    )}
+  </QueryErrorResetBoundary>
+)
+```
+
+Suspense throws query failures by default only when cached data is absent. If your application
+must route failed refetches to the error boundary too, throw the observer error from the component
+after fetching stops. Handle intentional `null` query data explicitly when using a void contract.
+See [TanStack Suspense recovery](https://tanstack.com/query/latest/docs/framework/react/guides/suspense#resetting-error-boundaries).
+
+## Start independent reads together
+
+Sequential `useSuspenseQuery` calls in one component can create a waterfall: the first hook
+suspends before the later hook runs. Pass independent requests to `useSuspenseQueries` instead.
+With generated options, explicit query descriptors retain the data and error types through
+TanStack's parallel-hook overloads. Derive these descriptors from the leaf so changes to its
+contract update every consumer.
+
+```tsx
+export const TwoUsers = <E,>({ rpc }: { readonly rpc: Queries<E> }) => {
+  type UserQuery = {
+    queryFnData: InferQueryData<typeof rpc.users.get>
+    error: InferQueryError<typeof rpc.users.get>
+  }
+  const [ada, grace] = useSuspenseQueries<[UserQuery, UserQuery]>({
+    queries: [
+      rpc.users.get.queryOptions({ input: { id: 1 }, retry: false, staleTime: 30_000 }),
+      rpc.users.get.queryOptions({ input: { id: 2 }, retry: false, staleTime: 30_000 }),
+    ],
+  })
+  return (
+    <p>
+      {ada.data.name} and {grace.data.name}
+    </p>
+  )
+}
+```
+
+Render `TwoUsers` inside the same reset and Suspense boundaries. Both reads start together.
+Choose a `staleTime` long enough that an earlier completed query remains fresh while the other
+finishes; otherwise mounting after Suspense resolves can cause an immediate refetch.
diff --git a/apps/docs/src/content/docs/guides/svelte-query.md b/apps/docs/src/content/docs/guides/svelte-query.md
new file mode 100644
index 0000000..da59d24
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/svelte-query.md
@@ -0,0 +1,59 @@
+---
+title: Svelte Query
+description: Rebuild generated options from Svelte reactive input and keep client lifetime in the application.
+---
+
+Build generated options inside Svelte's reactive accessor so input changes produce a new key
+and query function. This applies to both factories and every generated query view.
+
+The examples target Svelte 5.57.1 with Svelte Query 6.3.0 and Query Core 5.104.0.
+
+Keep [captured inputs unchanged](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+while their options can execute.
+
+## Create native queries
+
+Create the utility tree in your application module from an acquired ready client. Provide a
+QueryClient through Svelte Query's `QueryClientProvider`, then read reactive inputs inside the
+accessor passed to `createQuery`. Keep the client's `Scope` and any serviceful runner alive while
+queries use them. Here `users.read` accepts an ID and returns a user with `name`.
+In the Svelte component script:
+
+```svelte
+<script lang="ts">
+  import { createQuery } from '@tanstack/svelte-query'
+  import { rpc } from './api'
+
+  let id = $state(1)
+  const user = createQuery(() =>
+    rpc.users.read.queryOptions({
+      input: { id },
+      select: (user) => user.name,
+    }),
+  )
+</script>
+```
+
+Use `createInfiniteQuery(() => rpc.users.list.infiniteOptions(...))` for pagination and
+`createMutation(() => rpc.users.write.mutationOptions(...))` for writes. A mutation's variables
+provide the input for each execution. Mutation options can be static when their callbacks and
+other settings do not depend on reactive state.
+
+Use the same accessor for `streamedOptions`, `liveOptions`, and HTTP `metadataOptions`.
+
+## Choose native options carefully
+
+A skipped query retains the defined-data type when it has defined `initialData`. An initial-data
+function that may return `undefined` produces optional result data.
+
+Compile the Svelte application with `module: "ESNext"` and `moduleResolution: "Bundler"`.
+Svelte Query 6 requires this resolution for its emitted `.svelte` declarations; strict NodeNext
+declaration checking reports an upstream `Box` import error.
+
+## Own the native integration
+
+Follow the [shared integration lifetime](/effect-api-query/integrations/#own-the-cache-and-client-lifetime)
+for providers, observer removal, stream finalizers, and accepted mutations. Match this native
+wrapper to the application's Query Core and the framework's supported compiler/tooling.
+
+Server rendering and hydration remain application integrations.
diff --git a/apps/docs/src/content/docs/guides/switch-cache-owners.md b/apps/docs/src/content/docs/guides/switch-cache-owners.md
new file mode 100644
index 0000000..cf0dda9
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/switch-cache-owners.md
@@ -0,0 +1,121 @@
+---
+title: Switch Cache Owners
+description: Isolate private queries, pending writes, and persisted directory data when an owner changes.
+---
+
+Include every safe identity that changes a result in the key prefix: tenant, user, session
+generation, and permission generation. Use application identifiers and numeric generations;
+bearer credentials never belong in keys or storage names. A permission change needs a new generation
+even when the user and tenant stay the same. These values partition caches; the server still
+owns authorization.
+
+## Capture one owner
+
+In a consumer or mutation module, receive the ready `application` returned by
+[`startViteReactApplication(options)`](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/application.ts).
+Capture that application and its existing utility trees and QueryClient:
+
+```ts
+const owner = application
+const { queryClient, rpcQuery: rpc, httpQuery: http } = owner
+```
+
+The application uses `ownerKeyPrefix(identity)` from its
+[owner-cache module](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/owner-cache.ts)
+in both factories. It acquires clients, restores directory data, and exposes the original owner's
+guards and tracked mutation options. Keep its Scopes and runtimes alive until the owner's work
+finishes.
+
+In this owner's mutation options, guard each cache write and invalidation:
+
+```ts
+const invalidateUsers = async () => {
+  if (!owner.isActive()) {
+    return
+  }
+  await Promise.all([
+    queryClient.invalidateQueries({ queryKey: rpc.users.key() }),
+    queryClient.invalidateQueries({ queryKey: http.users.key() }),
+  ])
+}
+```
+
+```ts
+const createUser = owner.trackMutationOptions(
+  rpc.users.create.mutationOptions({
+    onSuccess: async (user) => {
+      if (!owner.isActive()) {
+        return
+      }
+      queryClient.setQueryData(rpc.users.get.queryKey({ id: user.id, locale: user.locale }), user)
+      await invalidateUsers()
+    },
+    onSettled: invalidateUsers,
+  }),
+)
+```
+
+The success callback captures its original owner. It checks that owner before seeding a concrete
+query, and settlement invalidation uses the same guard. An old callback never looks up a current
+application variable to choose where to write. Apply the guard to rollback, optimistic writes,
+manual cache updates, and any later work after an `await` too.
+
+## Replace the consumer boundary
+
+The [existing Vite application](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/lib/application.ts)
+provides `startViteReactApplication(options)`. Capture `previous`, unmount its consumer tree,
+and await `previous.dispose()` before starting and rendering the replacement application. This
+retires the old owner before constructing the new clients, QueryClient, and utilities. A failed acquisition leaves the
+old owner inactive; handle that failure in the surrounding application. Use the same unmount,
+retire, and replacement sequence when reconnecting clients with an unchanged semantic identity.
+
+[ViteReactExample](https://github.com/ueberBrot/effect-api-query/blob/main/examples/vite-react/src/app.tsx)
+keys its QueryClientProvider by a component key that changes with the application QueryClient.
+Replacing that client therefore remounts query and mutation consumers, including when the safe
+semantic identity stays the same. This component key is not part of query keys or persistence. Passing a new QueryClient through an existing
+provider alone does not replace the QueryClient captured by existing hooks. Reassigning options
+on a pending MutationObserver can also replace its callbacks. Capture originating ownership in
+mutation context and replace observers at the handoff; arbitrary observer reassignment is outside
+this recipe.
+
+Retirement immediately marks the captured owner inactive and removes its persisted snapshot.
+It cancels old queries and streams, clears both native caches, and waits for accepted mutation
+requests to settle. The application then releases its HTTP runtime and RPC client Scope. Complete
+local stream cleanup before acquiring the next owner. Native `cancelQueries()` settlement alone
+is not a finalizer acknowledgement, and local disposal is not a remote server acknowledgement.
+
+The example attempts mutations immediately with `networkMode: 'always'` and `retry: false`.
+It does not keep an offline mutation queue. `runMutation` tracks requests that have started;
+new requests are rejected after retirement. Requests already accepted may complete on the server,
+and switching owners does not undo them. Their `onSuccess` or `onSettled` callbacks may finish
+after the request drain, so the ownership guard remains necessary. A hanging request or local
+finalizer can delay the handoff; this policy supplies no completion deadline. Do not introduce
+serialized mutation queues without an explicit ownership and shutdown policy.
+
+## Restore a directory snapshot
+
+Pass application-approved Storage to the Vite application through `directoryStorage`. The browser
+entry uses sessionStorage. `persistDirectory()` writes only the RPC and HTTP `users.list` DTOs:
+arrays of `{ id: number, name: string, locale: string }`. It stores no mutations, errors, arbitrary
+query keys, classes, streams, infinite pages, or bearer credentials. A pending mutation removes
+the stored snapshot so an optimistic directory cannot be reused after reload.
+
+Storage names include the full safe owner tuple. Each envelope repeats that identity and includes
+`schemaVersion: 1` and `keyVersion: 1`. Restoration validates the complete envelope and all DTO
+entries, checks both busters and all owner fields, then writes through keys derived by the current
+utilities. Foreign or incompatible data is deleted before any cache write. A different owner's
+storage slot is never read. Bump the schema buster when DTO meaning changes and the key buster
+when the persisted view's key contract changes.
+
+Restored DTOs are plain data with `dataUpdatedAt: 0`, so ordinary queries refetch them. Class
+constructors and methods are not restored by this recipe; use a paired codec from
+[Hydrate Unary Data](/effect-api-query/guides/hydrate-unary-data/) when the domain requires them.
+
+Default `dispose()` and owner switches erase persistence. The browser's pagehide cleanup explicitly
+uses `dispose({ discardPersistence: false })` to snapshot a settled directory for a reload while
+retiring the old in-memory owner and releasing its clients. Old-owner persistence calls become
+no-ops. Explicit disposal rejects on storage failure after query, cache, and client cleanup runs.
+The pagehide and HMR callbacks await that cleanup and report a rejection through the console.
+
+Accepted tracked commands finish before a replacement owner is acquired. Retiring their client
+owner does not undo server work; use the explicit command cancellation operation when required.
diff --git a/apps/docs/src/content/docs/guides/tanstack-start.md b/apps/docs/src/content/docs/guides/tanstack-start.md
index 5889727..ac6b928 100644
--- a/apps/docs/src/content/docs/guides/tanstack-start.md
+++ b/apps/docs/src/content/docs/guides/tanstack-start.md
@@ -1,64 +1,36 @@
 ---
-title: TanStack Start
-description: Use generated query options in Start loaders, server rendering, and React components.
+title: TanStack Router and Start
+description: Reuse generated options in Router loaders and components, then connect Start request ownership and hydration.
 ---
 
-Use `effect-api-query` with your existing TanStack Start router and Effect contract. Choose the
-factory for your contract, then use its generated options with TanStack Query in loaders and
-components.
+Use generated options with TanStack Router loaders and native Query hooks. TanStack Start adds
+server rendering to the same Router/Query integration. Choose the factory for your Effect
+contract and expose its utility tree beside the QueryClient in router context.
 
-## Choose a factory
+Create `queryUtils` with the [RPC](/effect-api-query/getting-started/quick-start/) or
+[HTTP](/effect-api-query/getting-started/http-quick-start/) factory in your client module.
+Expose it and its QueryClient through router context. Use a safe identity prefix and a
+signal-aware runner. The application owns the router, providers, API host and authentication.
 
-For an Effect RPC group, pass your ready RPC client to `createRpcQueryUtils`:
-
-```ts
-import { createRpcQueryUtils } from 'effect-api-query'
-
-const queryUtils = createRpcQueryUtils(rpcGroup, {
-  client: rpcClient,
-  keyPrefix: ['app', identity],
-  runPromiseExit,
-})
-```
-
-For an Effect HTTP API, use `createHttpApiQueryUtils` with your ready `HttpApiClient` instead:
-
-```ts
-import { createHttpApiQueryUtils } from 'effect-api-query'
-
-const queryUtils = createHttpApiQueryUtils(httpApi, {
-  client: httpClient,
-  keyPrefix: ['app', identity],
-  runPromiseExit,
-})
-```
-
-Use `identity` to partition the cache safely by the current user or tenant. `runPromiseExit`
-is your application's runner. Configure transport URLs, authentication, and required services when
-creating the client and runner. Use a trusted server destination for SSR and a browser-accessible
-destination for client requests.
-
-The [RPC factory reference](/effect-api-query/reference/factory/) and
-[HTTP guide](/effect-api-query/guides/http-queries-and-mutations/) cover client setup, optional
-runners, and request inputs. The package generates query options; your application owns the API
-host, router, and providers.
-
-## Prefetch in a loader and read in a component
+## Reuse options in a Router loader and component
 
 Expose your `queryUtils` and `QueryClient` through the router context. For a
 contract with a `users.list` operation, the same generated options work in both places:
 
+In the route module, register the loader and the existing `UsersRoute` component:
+
 ```tsx
 export const Route = createFileRoute('/users')({
   loader: ({ context }) => context.queryClient.query(context.queryUtils.users.list.queryOptions()),
   component: UsersRoute,
 })
+```
+
+Inside `UsersRoute`, read the same options with the native hook:
 
-function UsersRoute() {
-  const { queryUtils } = Route.useRouteContext()
-  const users = useSuspenseQuery(queryUtils.users.list.queryOptions())
-  return <pre>{JSON.stringify(users.data, null, 2)}</pre>
-}
+```ts
+const { queryUtils } = Route.useRouteContext()
+const users = useSuspenseQuery(queryUtils.users.list.queryOptions())
 ```
 
 Set `staleTime` on the Query Client or generated options long enough to keep successful loader
@@ -68,10 +40,16 @@ the server and browser to address the same cache entry.
 For pagination, pass generated `infiniteOptions` to `queryClient.infiniteQuery` in the loader and
 `useInfiniteQuery` in the component. After a write, use generated `mutationOptions` and invalidate
 the relevant group key. These are ordinary TanStack Query operations; see
-[Cache Management](/effect-api-query/guides/cache-management/) and
+[Cache Keys and Filters](/effect-api-query/guides/cache-filters/) and
 [Generated Builders](/effect-api-query/reference/generated-builders/).
 
-## Own request lifetimes and hydration
+## Add Start server rendering
+
+The loader/component pattern also works in a browser-only TanStack Router application. For Start
+or another server-rendered host, connect native SSR query integration and give each request its
+own resources and serialization contract.
+
+### Own request lifetimes and hydration
 
 Create a fresh Query Client and request-specific client, runner, and utility tree for each
 server-rendered page. Keep authentication in that request's client or runner. A key prefix can
@@ -94,12 +72,16 @@ setupRouterSsrQueryIntegration({
 
 The server dehydrates its Query Client. The browser hydrates its own Query Client and uses its
 own ready client and runner. Register cleanup with the server request lifecycle. When SSR finishes
-or the request aborts, cancel outstanding queries before disposing their runtime. Keep the browser
+or the request aborts, cancel outstanding queries and await outstanding snapshot captures before
+disposing their ready clients and runtime. Native cancellation alone may settle before local iterator
+finalizers finish. Keep the browser
 runtime alive for the browser application's lifetime.
 
 Successful query data must satisfy your serializer's contract. If an endpoint returns decoded
 Schema class instances, decide whether the browser needs plain data or reconstructed instances.
 The package does not serialize query data for you.
+Use [Hydrate Unary Data](/effect-api-query/guides/hydrate-unary-data/) to keep a DTO representation
+or pair Schema encoding and decoding across hydration and later browser refetch.
 
 ## Let the browser refetch failed queries
 
@@ -113,34 +95,29 @@ When the page should render despite a loader failure, catch the loader rejection
 to reach your route's error handling. See
 [Handle Failures](/effect-api-query/guides/handle-failures/) for inspecting typed failures.
 
-## Capture an RPC stream snapshot
+## Capture a stream snapshot
 
-Completed stream data uses TanStack's normal dehydration contract. An open RPC stream remains
-in `fetchStatus: 'fetching'`. To render its first successful value, start the generated query,
-wait for a successful cache snapshot, then cancel the query before dehydration completes.
-Cancellation closes the iterator and releases its Effect resources. The browser hydrates the
-snapshot and may refetch according to your TanStack policies.
+Use the package's `fetchStreamSnapshot` with generated accumulated or live options when an open
+RPC or HTTP SSE stream must provide data for SSR. It captures a new publication, cancels the exact
+query, and waits for local iterator cleanup before settling. Dehydrate the resulting successful
+cache, then dispose request-owned resources. The browser hydrates its own cache and reconnects
+through its own ready client and runner.
 
-The example's
-[`fetchStreamSnapshot`](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/lib/query-ssr.ts)
-shows the cache subscription, cancellation, and cleanup needed for this pattern.
+[Stream Snapshots](/effect-api-query/guides/stream-snapshots/) covers fresh and cached modes,
+timeouts, aborts, stream policies, and exclusive query ownership.
 
 ## Explore the executable example
 
-The [TanStack Start example](https://github.com/ueberBrot/effect-api-query/tree/main/examples/tanstack-start)
-includes separate RPC and HTTP views to demonstrate both factories. It verifies successful SSR,
-hydration without duplicate reads, cached navigation, pagination, mutations, failures, and
-cancellation. Its `/http-failure` route omits a failed query from dehydration so the browser can
-refetch it.
-See [Executable Examples](/effect-api-query/examples/) for commands and controls.
-
-The example serves RPC at `/rpc` and HTTP at `/api/$`. Both handlers share a demonstration user
-directory, so writes invalidate both sets of query keys. The authorization header contains a
-public demonstration value. The ownership tests use separate identities to verify that caches
-and resource disposal stay isolated. Its SSR setup converts decoded Schema class values to plain
-data with `structuredClone`.
-
-The example also disables Vite preview compression for its API routes. The pinned middleware
-delays response-close listeners until the first write, preventing a pending buffered request from
-observing a disconnect. This host-specific setting lets the browser tests verify both aborted
-requests and server interruption.
+[Run the Start application](/effect-api-query/examples/) for both adapters. Copy the seam you need:
+
+| Task                                     | Complete source                                                                                                                                                                                                                                                  |
+| ---------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Router context and Query integration     | [router.tsx](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/router.tsx)                                                                                                                                                     |
+| Paired codecs and snapshot preparation   | [query-ssr.ts](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/lib/query-ssr.ts), [snapshot-preparation.ts](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/lib/snapshot-preparation.ts) |
+| Request-owned clients and cleanup        | [server-application.ts](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/lib/server-application.ts)                                                                                                                           |
+| HTTP failure followed by browser refetch | [http-failure.tsx](https://github.com/ueberBrot/effect-api-query/blob/main/examples/tanstack-start/src/routes/http-failure.tsx)                                                                                                                                  |
+
+Server destinations must be trusted. The example uses request-owned server-local RPC execution;
+its middleware captures server-owned authority that per-call headers or caller services cannot
+replace. Decoded-message RPC bypasses transport Schema codecs, so use a schema-aware protocol
+when wire validation or codec effects matter. Browser clients acquire separate network resources.
diff --git a/apps/docs/src/content/docs/guides/trace-streams.md b/apps/docs/src/content/docs/guides/trace-streams.md
new file mode 100644
index 0000000..5fe552e
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/trace-streams.md
@@ -0,0 +1,121 @@
+---
+title: Trace Stream Consumption
+description: Keep an application span open through HTTP SSE pulls and asynchronous iterator cleanup.
+---
+
+Configure telemetry in the application's runtime and instrument the stream that a ready client
+returns. A span around the `runPromiseExit` creation Effect ends when it returns the iterable.
+Actual stream pulls happen later; they need their own span.
+
+## Attach a span to the decoded stream
+
+This client module declares a string SSE feed at `GET /events`. Its response transformation wraps
+only decoded streams and passes other values through. HttpApiClient applies that transformation
+before response-mode wrapping, so the client retains its native request options and response
+contract. Keep header-wrapped stream schemas intact if your API declares them; this simple feed
+has no decoded header wrapper.
+
+```ts
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Layer, ManagedRuntime, Schema, Stream, Tracer } from 'effect'
+import { createHttpApiQueryUtils, fetchStreamSnapshot } from 'effect-api-query'
+import type { RunPromiseExit } from 'effect-api-query'
+import { FetchHttpClient } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiClient,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiSchema,
+} from 'effect/http-api'
+import { OtlpSerialization, OtlpTracer } from 'effect/observability'
+
+const feedApi = HttpApi.make('feed-api').add(
+  HttpApiGroup.make('events').add(
+    HttpApiEndpoint.get('watch', '/events', {
+      success: HttpApiSchema.StreamSse({ data: Schema.String }),
+    }),
+  ),
+)
+
+export const traceFeed = <A, E, R>(source: Stream.Stream<A, E, R>) =>
+  Stream.unwrap(
+    Effect.gen(function* () {
+      const span = yield* Effect.makeSpanScoped('events.watch.consume', {
+        attributes: { 'api.id': 'feed-api', endpoint: 'watch' },
+      })
+      return source.pipe(
+        Stream.tap(() => Effect.sync(() => span.attribute('feed.received', true))),
+        Stream.ensuring(Effect.sync(() => span.attribute('feed.cleanup', true))),
+        Stream.provideService(Tracer.ParentSpan, span),
+      )
+    }),
+  )
+
+const traceDecodedResponse = (effect: Effect.Effect<unknown, unknown, unknown>) =>
+  effect.pipe(Effect.map((value) => (Stream.isStream(value) ? traceFeed(value) : value)))
+```
+
+`Stream.unwrap` acquires the scoped span when consumption begins. Providing its ParentSpan
+makes nested pull work a child of that span. The finalizer updates the captured span directly,
+so it does not depend on a pull fiber's current-span context. The span closes after local stream
+finalizers finish, including asynchronous cancellation cleanup.
+
+The attributes identify the declared API and endpoint. The example records receipt and cleanup
+without exporting emitted data, request input, or credentials.
+
+## Supply the runtime and await cleanup
+
+Use Effect's OTLP tracer with an exporter URL, such as your collector's `/v1/traces` endpoint.
+This function configures a runtime, acquires the ready client, injects a signal-aware runner,
+and captures one live value. Its snapshot helper stops the iterator and awaits local cleanup
+before the runtime is disposed.
+
+```ts
+const captureTracedFeed = async (baseUrl: string, collectorUrl: string, signal: AbortSignal) => {
+  const telemetry = OtlpTracer.layer({
+    url: collectorUrl,
+    resource: { serviceName: 'users-browser' },
+  }).pipe(Layer.provide(OtlpSerialization.layerJson), Layer.provide(FetchHttpClient.layer))
+  const runtime = ManagedRuntime.make(Layer.merge(FetchHttpClient.layer, telemetry))
+  const queryClient = new QueryClient()
+  try {
+    const client = await runtime.runPromise(
+      HttpApiClient.make(feedApi, { baseUrl, transformResponse: traceDecodedResponse }),
+    )
+    const runPromiseExit: RunPromiseExit = (effect, options) =>
+      runtime.runPromiseExit(effect, options)
+    const http = createHttpApiQueryUtils(feedApi, {
+      client,
+      keyPrefix: ['feed-app'],
+      runPromiseExit,
+    })
+    return await fetchStreamSnapshot(queryClient, http.events.watch.liveOptions({ retry: false }), {
+      signal,
+      timeoutMs: 5_000,
+    })
+  } finally {
+    try {
+      await queryClient.cancelQueries()
+    } finally {
+      queryClient.clear()
+      await runtime.dispose()
+    }
+  }
+}
+```
+
+Call `captureTracedFeed` with your API base URL, collector URL, and an application-owned
+AbortSignal. A browser collector needs to accept that browser's requests. The telemetry layer
+and span policy belong to the application; the package does not install an exporter or log by default.
+The same response transformation covers accumulated and live HTTP SSE views.
+
+For RPC streams, instrument the stream in the application's client/transport integration while
+preserving the flat client's request options and queue modes. Effect RPC also creates native
+client spans when tracing is enabled. Configure those spans and telemetry during client
+acquisition; wrapping only iterable creation still does not cover later consumption.
+
+For an open browser feed, keep the runtime alive until the local stream finalizer signals completion.
+Native `cancelQueries` can settle before asynchronous cleanup finishes. Use
+[Stream Snapshots](/effect-api-query/guides/stream-snapshots/) for finite capture and
+[Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) for long-lived ownership.
diff --git a/apps/docs/src/content/docs/guides/vue-query.md b/apps/docs/src/content/docs/guides/vue-query.md
new file mode 100644
index 0000000..12ca76a
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/vue-query.md
@@ -0,0 +1,74 @@
+---
+title: Vue Query
+description: Rebuild generated options with Vue computed and keep client resources alive.
+---
+
+Pass generated options from either factory to Vue Query's native hooks. Configure `VueQueryPlugin`
+and acquire the ready client before creating the utilities.
+
+The examples target Vue 3.5.43 with Vue Query 5.104.0 and Query Core 5.104.0.
+
+## Rebuild options when input changes
+
+Builders capture plain input when called. Build options inside Vue `computed` so a changed input
+produces a new key and query function. Passing a builder's result once leaves the query attached
+to the original input.
+
+Keep [captured inputs unchanged](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+while their options can execute.
+
+In component setup, use the `rpc` tree from your [ready client](/effect-api-query/getting-started/quick-start/).
+Here `users.read` returns a user with a `name`:
+
+```ts
+import { useQuery } from '@tanstack/vue-query'
+import { skipToken } from 'effect-api-query'
+import type { InferQueryData, InferQueryError } from 'effect-api-query'
+import { computed, ref } from 'vue'
+
+import { rpc } from './queries.ts'
+
+const userId = ref<number | undefined>(1)
+const options = computed(() =>
+  rpc.users.read.queryOptions({
+    input: userId.value === undefined ? skipToken : { id: userId.value },
+    select: (user) => user.name,
+  }),
+)
+```
+
+In the same component setup, infer the leaf's cache data and error types for the native hook:
+
+```ts
+const user = useQuery<
+  InferQueryData<typeof rpc.users.read>,
+  InferQueryError<typeof rpc.users.read>,
+  string
+>(options)
+```
+
+Read the selected value from `user.data.value`. The explicit native hook generics preserve the
+leaf's data and error types while bounding Vue's recursive ref unwrapping.
+Automatic inference can otherwise exceed TypeScript's instantiation depth when it unwraps an
+Effect `Cause` through a tagged key. Let the builder infer its arguments; put these type arguments
+on the Vue hook.
+
+Apply the same computed pattern to `infiniteOptions`, `streamedOptions`, `liveOptions`, and
+`metadataOptions` when their input changes. Pass `rpc.users.write.mutationOptions()` to
+`useMutation` and supply each execution's input through `mutate(variables)`. Use `computed`
+when mutation settings depend on reactive state.
+
+## Choose native options carefully
+
+Vue evaluates a function-valued `enabled` as a getter with no arguments. Use a boolean inside
+computed options, or a zero-argument getter returning a boolean. A Core `enabled(query)` callback
+cannot be passed directly to Vue.
+
+Vue accepts an initial-data initializer that may return `undefined`, with optional result data.
+An explicit `initialData: undefined` overrides inherited QueryClient initial data.
+
+## Own the native integration
+
+Follow [the shared cache and client lifetime](/effect-api-query/integrations/#own-the-cache-and-client-lifetime)
+when disposing clients or replacing an owner. Match Vue Query to the application's Query Core
+and use a compiler supported by Vue's tooling.
diff --git a/apps/docs/src/content/docs/guides/websocket-clients.md b/apps/docs/src/content/docs/guides/websocket-clients.md
new file mode 100644
index 0000000..efb7ce4
--- /dev/null
+++ b/apps/docs/src/content/docs/guides/websocket-clients.md
@@ -0,0 +1,87 @@
+---
+title: WebSocket ready clients
+description: Acquire a shared RPC connection and keep cancellation and replacement application-owned.
+---
+
+Acquire a flat Effect RPC client inside an application Scope, then pass it to
+`createRpcQueryUtils`. The same connection can carry concurrent unary requests,
+accumulated streamed queries, and live queries. Each request retains its own query key
+and cancellation.
+
+## Acquire the connection
+
+Keep the flat ready client and its parent Scope alive. The
+[complete acquisition recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/fixtures/socket-client.ts)
+owns the socket, protocol, client and QueryClient cleanup. In that application setup:
+
+```ts
+const rpc = createRpcQueryUtils(socketGroup, { client, keyPrefix: ['socket', owner] })
+```
+
+The host supplies `Socket.layerWebSocketConstructorGlobal` in browsers or
+`NodeSocket.layerWebSocketConstructorWS` in Node. The server uses the same group and
+serialization through `RpcServer.toHttpEffectWebsocket`; this recipe uses JSON.
+
+## Read and capture stream data
+
+Use generated `queryOptions` for unary reads and native observers for `streamedOptions` or
+`liveOptions`. Independent keys share the connection without sharing cancellation.
+The first stream emission becomes successful data while `fetchStatus` remains `fetching`.
+
+In a server/request loader, await `fetchStreamSnapshot(queryClient, options, controls)`
+with the generated history or live options. For this recipe, `input` is
+`{ channel: 'clock' }`; history uses
+`rpc.values.watch.streamedOptions({ input, maxChunks: 20 })`, while latest data uses
+`rpc.values.watch.liveOptions({ input })`. Each capture has `timeoutMs: 5000` and settles
+local cleanup before disposal.
+
+The [complete typed snapshot recipe](https://github.com/ueberBrot/effect-api-query/blob/main/tests/fixtures/docs-websocket-use.ts)
+includes concurrent reads and disposal. [Stream Snapshots](/effect-api-query/guides/stream-snapshots/)
+explains exclusive capture and local finalizer drain. `maxChunks` bounds cached history;
+`rpcOptions.streamBufferSize` bounds the transport queue. They govern different resources.
+
+## Cancel and replace an owner
+
+Cancel one stream with its generated exact key, for example
+`cancelQueries({ queryKey: options.queryKey, exact: true })`. Other stream keys and
+concurrent unary calls continue on the same connection. TanStack retains its native
+cancellation result: after a stream has published data, cancellation can settle its
+query promise successfully with cached data.
+
+Drain local work and call `application.dispose` before disposing the server or an enclosing runtime. The
+registered finalizer cancels queries and clears their cache before the client and socket
+close. For a replacement owner, await disposal, acquire a new application Scope and
+ready client, and construct a new QueryClient. The same semantic prefix can produce
+the same keys while resource lifetimes and cache instances remain independent. Follow
+[owner-switching rules](/effect-api-query/guides/switch-cache-owners/) when authentication changes.
+
+Replacement acquires a new connection. Transport reconnection, backoff, credentials,
+event replay, and whether failed queries retry belong to the application and Effect's
+transport configuration. Reconnection does not imply that a cancelled stream resumes
+from its last cached event.
+
+## Interpret cancellation and failures
+
+The WebSocket transport forwards an interrupted request to the RPC server. Cooperative
+handler finalizers were observed on this transport for both stream views. A local abort
+signal or idle query state alone cannot prove remote completion; use a domain
+acknowledgement when an application must wait for server work to stop. Closing a
+connection immediately after cancellation can race delivery of that interrupt.
+
+An independent server interruption remains an `EffectRpcQueryError`, even when TanStack
+has not cancelled the query. Its Cause preserves the failure received by the ready client;
+wire serialization can change the original server's Cause representation. A failed stream
+leaves already published data available alongside its error.
+
+With Effect 4.0.0, cancelling a paused stream with a full transport buffer of size 1 can
+stall other calls on the connection. This recipe uses the native default of 16. Verify
+smaller buffers against the pinned transport version before changing that setting.
+
+The default buffer is not a guarantee for larger chunks or unfinished queue offers.
+
+Keep streaming success schemas compatible on both ends. With Effect 4.0.0, a chunk that fails
+client Schema decoding can also fail unrelated calls sharing the connection. A larger buffer
+does not isolate decoding failures.
+
+Query cancellation stops future work cooperatively. It does not undo completed writes;
+use an [explicit cancellable command](/effect-api-query/guides/cancellation/) when the domain requires one.
diff --git a/apps/docs/src/content/docs/index.mdx b/apps/docs/src/content/docs/index.mdx
index 069a6c2..c69fc7e 100644
--- a/apps/docs/src/content/docs/index.mdx
+++ b/apps/docs/src/content/docs/index.mdx
@@ -1,42 +1,81 @@
 ---
 title: effect-api-query
-description: Use Effect RPC and HttpApi with typed TanStack Query options and cache keys.
+description: Typed TanStack Query options and semantic cache keys from ready Effect RPC and HttpApi clients.
 template: splash
 hero:
-  tagline: Use your Effect RPC or HttpApi definition to query, mutate, and cache data with TanStack Query.
+  tagline: Derive typed TanStack Query options and cache keys from your Effect RPC or HttpApi contract.
   actions:
-    - text: Get started
-      link: /effect-api-query/getting-started/installation/
+    - text: HTTP API
+      link: /effect-api-query/getting-started/http-quick-start/
       icon: right-arrow
       variant: primary
+    - text: RPC
+      link: /effect-api-query/getting-started/quick-start/
+      icon: right-arrow
     - text: View on GitHub
       link: https://github.com/ueberBrot/effect-api-query
       icon: external
 ---
 
-`effect-api-query` turns your Effect RPC group or HttpApi definition into typed query options,
-mutation options, and cache keys. Pass them directly to TanStack Query while your application
-controls its client, cache policies, and resource lifetime.
-
-## What it provides
-
-- Queries and mutations for unary RPCs and buffered HTTP endpoints without multipart.
-- Mutations for buffered HTTP multipart uploads with explicit `FormData`.
-- Infinite and conditional queries for both adapters.
-- Accumulated streams and live queries for RPCs.
-- Semantic cache keys for prefetching, cache updates, and invalidation.
-- Typed execution failures that retain the complete Effect Cause.
-
-## Choose a path
-
-- Create utilities and run a query with the [RPC quick start](/effect-api-query/getting-started/quick-start/)
-  or [HTTP quick start](/effect-api-query/getting-started/http-quick-start/).
-- [Run the examples](/effect-api-query/examples/) to compare standalone Vite hosting with
-  TanStack Start routes for both protocols.
-- Check [feature support](/effect-api-query/getting-started/feature-support/) to choose operations
-  and plan your integration.
-- Use the [React Query guide](/effect-api-query/guides/react-query/) for hooks and mutations.
-- Use the [TanStack Start guide](/effect-api-query/guides/tanstack-start/) for loaders, SSR, and
-  hydration.
-- Read [compatibility and limits](/effect-api-query/reference/compatibility-and-limits/) before
-  adopting the package.
+import { CardGrid, LinkCard } from '@astrojs/starlight/components'
+
+`effect-api-query` combines an Effect declaration, a ready client, and your cache prefix into a
+typed utility tree. Its leaves build options for native TanStack Query consumers: buffered reads,
+mutations, pages, RPC streams, HTTP SSE, and buffered HTTP metadata.
+
+## Choose your contract
+
+<CardGrid>
+  <LinkCard
+    title="HTTP API"
+    description="Start from an Effect HttpApi declaration and ready HttpApiClient. Generate typed reads, writes, pages, SSE views, and response metadata."
+    href="/effect-api-query/getting-started/http-quick-start/"
+  />
+  <LinkCard
+    title="RPC"
+    description="Start from an Effect RpcGroup and ready RpcClient. Generate typed reads, writes, pages, and stream views."
+    href="/effect-api-query/getting-started/quick-start/"
+  />
+</CardGrid>
+
+[Install the package](/effect-api-query/getting-started/installation/), then follow your adapter's
+quick start for complete client acquisition, generated options, requests, and cleanup. Check
+[Supported Operations](/effect-api-query/getting-started/feature-support/) for the views your
+contract exposes.
+
+## Learn the library contract
+
+| Goal                                       | Read                                                                                                                                                                                                         |
+| ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| Understand generated branches and leaves   | [Generated Utility Model](/effect-api-query/concepts/queries-and-mutations/)                                                                                                                                 |
+| Supply input and interpret decoded data    | [Inputs and Query Data](/effect-api-query/concepts/data-normalization/)                                                                                                                                      |
+| Choose a cached representation             | [Queries](/effect-api-query/guides/queries/), [Pagination](/effect-api-query/guides/pagination/), [Streaming](/effect-api-query/guides/streaming/), [HTTP Metadata](/effect-api-query/guides/http-metadata/) |
+| Target reads and writes in the cache       | [Cache Keys and Filters](/effect-api-query/guides/cache-filters/)                                                                                                                                            |
+| Share typed retries and mutation callbacks | [Defaults and Policies](/effect-api-query/guides/query-defaults/)                                                                                                                                            |
+| Reuse contract types in application code   | [Type Inference](/effect-api-query/reference/type-inference/)                                                                                                                                                |
+| Inspect failures and release resources     | [Handle Failures](/effect-api-query/guides/handle-failures/), [Client Lifecycle](/effect-api-query/concepts/client-lifecycle/)                                                                               |
+
+The library owns generated keys, functions, cache-view identity, and adaptation of Effect failures.
+TanStack owns the cache and its native consumers. Your application owns its ready client,
+transport, authentication, providers, runtime, and resource lifetime.
+
+## Connect your application
+
+Use the generated options with your existing native integration:
+
+- [React Query](/effect-api-query/guides/react-query/) includes a complete client/provider setup and
+  links [Suspense recovery](/effect-api-query/guides/suspense-and-recovery/).
+- [Vue](/effect-api-query/guides/vue-query/), [Solid](/effect-api-query/guides/solid-query/),
+  [Svelte](/effect-api-query/guides/svelte-query/), and [Angular](/effect-api-query/guides/angular-query/)
+  explain each wrapper's reactive options and typing constraints.
+- [Router and Start](/effect-api-query/guides/tanstack-start/) covers loaders, request ownership,
+  and server rendering. [Hydration](/effect-api-query/guides/hydrate-unary-data/) and
+  [Stream Snapshots](/effect-api-query/guides/stream-snapshots/) preserve decoded cache data.
+
+The [integration overview](/effect-api-query/integrations/) explains the shared provider,
+reactivity, and client-lifetime boundaries. [Run the examples](/effect-api-query/examples/) for
+complete Vite React and TanStack Start applications.
+
+Use [API Reference](/effect-api-query/reference/public-exports/) for exported values and types,
+and [Compatibility and Limits](/effect-api-query/reference/compatibility-and-limits/) for the
+tested dependency contracts and runtime limits.
diff --git a/apps/docs/src/content/docs/integrations/index.md b/apps/docs/src/content/docs/integrations/index.md
new file mode 100644
index 0000000..55e375e
--- /dev/null
+++ b/apps/docs/src/content/docs/integrations/index.md
@@ -0,0 +1,75 @@
+---
+title: Integrations
+description: Connect generated Core options to native framework, router, server-rendering, and transport APIs.
+---
+
+`effect-api-query` produces static TanStack Query Core options. Use the native consumer that owns
+your application: a framework hook, QueryClient, or router loader. The generated key, input,
+query data, and Effect failure contract stay the same across these consumers.
+
+## Connect a native consumer
+
+| Integration                                                  | Adapter-specific guidance                                                               |
+| ------------------------------------------------------------ | --------------------------------------------------------------------------------------- |
+| [React Query](/effect-api-query/guides/react-query/)         | Complete ready-client/provider setup, static options, and shared policies               |
+| [Suspense](/effect-api-query/guides/suspense-and-recovery/)  | Boundary reset, cached refetch failures, parallel reads, and native cancellation limits |
+| [Vue](/effect-api-query/guides/vue-query/)                   | Computed options, bounded hook inference, and Vue's `enabled` getter                    |
+| [Solid](/effect-api-query/guides/solid-query/)               | Accessors and defined initial-data overloads                                            |
+| [Svelte](/effect-api-query/guides/svelte-query/)             | Reactive accessors and Svelte declaration resolution                                    |
+| [Angular](/effect-api-query/guides/angular-query/)           | Signal accessors, injection context, and skipped-query result types                     |
+| [Router and Start](/effect-api-query/guides/tanstack-start/) | Shared loader/component options and independent SSR resources                           |
+
+These pages explain how generated options participate in each native API. Use the framework's
+own TanStack documentation for its provider, rendering, and reactive primitives.
+
+## Rebuild options at the reactive boundary
+
+Acquire the ready client and create its utility tree once for a cache owner. Call a builder inside
+React render or the other framework's computed value/accessor when its input depends on reactive
+state. Passing one previously built options object keeps the captured request attached to its
+original input.
+
+Keep [captured inputs unchanged](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+while options can execute. The immutable key does not freeze arbitrary request values.
+A new request needs new input and options. Mutation variables belong to each execution;
+rebuild mutation options only when their callbacks or settings depend on reactive state.
+
+## Own the cache and client lifetime
+
+Provide the matching QueryClient through the native framework's provider or router context.
+Match its Query wrapper to the application's Query Core version and use a compiler supported by
+the framework tooling. The [compatibility reference](/effect-api-query/reference/compatibility-and-limits/)
+records the tested combinations.
+
+A changed input or removed component detaches its observer. An abort-aware open stream cancels
+when its last ordinary observer leaves; another observer can keep it active. TanStack's Suspense
+hooks retain their documented cancellation limitation. Transport interruption depends on the
+ready client.
+
+Stop consumers, cancel queries, await local finalizers and accepted mutations, then clear the cache
+and release the client and runtime. Follow [Client Lifecycle](/effect-api-query/concepts/client-lifecycle/)
+for disposal and [Switch Cache Owners](/effect-api-query/guides/switch-cache-owners/) when identity changes.
+Native cancellation can settle before asynchronous iterator cleanup finishes.
+
+## Server rendering and hydration
+
+A server request owns a fresh QueryClient and request-specific clients. The browser owns separate
+resources, while equivalent inputs and prefixes address equivalent cache entries. Choose codecs
+that preserve the decoded values across dehydration, hydration, and later client refetches.
+
+Use [Hydrate Query Data](/effect-api-query/guides/hydrate-unary-data/) for DTOs or Schema classes,
+[Hydrate Query Views](/effect-api-query/guides/hydrate-query-views/) for pages, metadata, and stream
+representations, and [Stream Snapshots](/effect-api-query/guides/stream-snapshots/) to settle a finite
+capture and local cleanup before disposing a request.
+
+## Configure the client and host
+
+Applications configure transport, authentication, middleware, runtime services, and telemetry
+before passing a ready client to a factory. See
+[WebSocket Clients](/effect-api-query/guides/websocket-clients/),
+[Browser and Worker Hosts](/effect-api-query/reference/browser-and-worker-hosts/), and
+[Stream Tracing](/effect-api-query/guides/trace-streams/).
+[External HTTP Clients](/effect-api-query/reference/external-http-clients/) explains encoded OpenAPI
+interop; those Promise clients do not replace the ready Effect HttpApiClient accepted by the factory.
+
+For complete hosts and applications, [run the examples](/effect-api-query/examples/).
diff --git a/apps/docs/src/content/docs/reference/browser-and-worker-hosts.md b/apps/docs/src/content/docs/reference/browser-and-worker-hosts.md
new file mode 100644
index 0000000..d039640
--- /dev/null
+++ b/apps/docs/src/content/docs/reference/browser-and-worker-hosts.md
@@ -0,0 +1,34 @@
+---
+title: Browser and Worker Hosts
+description: Ready-client ownership in browsers and dedicated workers, and the worker transport boundary.
+---
+
+Use the same factories and TanStack Query Core options in a browser window or dedicated worker.
+Each host acquires its own ready clients and owns their `Scope`, runner, QueryClient, and disposal.
+
+## Own the worker lifetime
+
+Create a utility tree inside the worker after acquiring its ready client. Run queries and maintain
+their QueryClient in that worker. Messages to the window may carry application DTOs or events;
+the utility tree, client, Effect runtime, and QueryClient remain owned by their host.
+
+On shutdown, stop accepting work, cancel the owner's queries, and await the application's active
+stream finalizers and accepted mutations before clearing private cache data and closing the
+client's `Scope`. Native query cancellation can settle before asynchronous finalizers finish.
+Wait for application-owned cleanup acknowledgements before terminating the worker. Disposing one
+owner must not close another owner's clients or cancel its queries.
+
+See [client lifecycle](/effect-api-query/concepts/client-lifecycle/) and
+[cancellation](/effect-api-query/guides/cancellation/) for the shared ownership contract.
+
+## Worker transport boundary
+
+A worker can own its ready client and QueryClient. Sending Effect RPC requests from a window to
+a worker over `postMessage` requires a separate transport integration.
+
+Effect exposes worker protocols through `effect/rpc` and worker services through `effect/workers`.
+`RpcClient.layerProtocolWorker` requires application-supplied `WorkerPlatform` and `Spawner`
+services. The server's worker protocol requires `WorkerRunnerPlatform`. The package supplies none
+of these services and does not construct a worker transport. A browser worker transport needs a
+compatible platform integration and its own acquisition, interruption, and disposal contract.
+Supplying an already acquired client preserves the factories' existing ready-client boundary.
diff --git a/apps/docs/src/content/docs/reference/compatibility-and-limits.md b/apps/docs/src/content/docs/reference/compatibility-and-limits.md
index 88f05ea..2f79274 100644
--- a/apps/docs/src/content/docs/reference/compatibility-and-limits.md
+++ b/apps/docs/src/content/docs/reference/compatibility-and-limits.md
@@ -5,82 +5,100 @@ description: Supported versions, RPC and HTTP operations, cache identity, and ru
 
 ## Supported integrations
 
-The package targets Effect 4 and TanStack Query Core 5, with React Query and TanStack Start
-integrations checked in this repository. It is ESM-only and targets ES2022. Use TypeScript with
-`strict: true`.
+The package declares one exact Effect peer and Query Core `>=5.103.1 <6`. It is ESM-only and
+targets ES2022. Use TypeScript with `strict: true`. The repository uses these versions:
+
+| Integration                                         | Versions                           |
+| --------------------------------------------------- | ---------------------------------- |
+| Effect runtime, testing, and Node platform packages | 4.0.0                              |
+| Query Core and React Query                          | 5.104.0, with matching versions    |
+| Published TypeScript contract                       | 5.9.3 and 7.0.2                    |
+| React                                               | 19.3.0                             |
+| TanStack Start                                      | 1.168.60                           |
+| TanStack Router and Router SSR Query                | 1.170.41 and 1.167.3, respectively |
+
+The stable Effect release contains unstable RPC and HTTP API modules. Keep the application's
+Effect packages coordinated with the exact peer; see
+[Compatibility and Stability](/effect-api-query/getting-started/compatibility-and-stability/).
+
+Use native reactive accessors with generated Core options. See
+[Vue Query](/effect-api-query/guides/vue-query/), [Solid Query](/effect-api-query/guides/solid-query/),
+[Svelte Query](/effect-api-query/guides/svelte-query/), and [Angular Query](/effect-api-query/guides/angular-query/)
+for option rebuilding,
+compiler resolution, hook overloads, and resource ownership.
 
 Consult [package metadata](https://github.com/ueberBrot/effect-api-query/blob/main/package.json) for
 peer ranges and the [workspace catalog](https://github.com/ueberBrot/effect-api-query/blob/main/pnpm-workspace.yaml)
-for the pinned Effect release and framework versions. The
-[packed consumer verifier](https://github.com/ueberBrot/effect-api-query/blob/main/scripts/verify-packed-consumer.mts)
-defines the compiler and peer combinations tested against the packaged library.
-
-The repository checks both factories with TypeScript 5.9 and its own compiler against the minimum
-supported Query Core version and the version installed for development. Isolated consumers install
-the tarball with their own peers and
-verify runtime exports, peer identity, and private-subpath rejection. Separate RPC and HTTP
-contracts each exercise roughly 250 operations; compiler diagnostics record their combined cost
-without imposing a timing threshold.
+for the pinned Effect release and example dependencies.
 
 ## Capability matrix
 
-**Generated** means the package supplies the typed builders and runtime behavior. **Tested** means
-an executable consumer verifies the integration. **Application-owned** means your application
-supplies the client, policy, or lifecycle. **Deferred** means the adapter does not expose it.
-
-| Capability                                        | RPC                                                                                                      | HTTP                                                                                        |
-| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------- |
-| Ordinary queries and mutations                    | Generated for unary RPCs                                                                                 | Generated for buffered endpoints without multipart, regardless of method                    |
-| Pagination                                        | Generated `infiniteOptions`; pages map to payloads                                                       | Generated for buffered endpoints without multipart; pages map to decoded requests           |
-| Accumulated streams and live queries              | Generated for streaming RPCs; tested cancellation and SSR snapshots                                      | Deferred; any streaming success alternative omits the endpoint                              |
-| Buffered multipart uploads                        | Application-owned transport and payload contract                                                         | Generated mutation-only builders; application supplies `FormData`                           |
-| Streaming multipart                               | Application-owned transport and payload contract                                                         | Deferred; any streaming multipart request alternative omits the endpoint                    |
-| Raw HTTP response modes                           | Outside the RPC contract                                                                                 | Deferred; generated calls force decoded-only responses                                      |
-| Conditional queries                               | Generated `skipToken` support for input-bearing queries                                                  | Generated `skipToken` support for input-bearing queries                                     |
-| Cache keys and invalidation prefixes              | Generated `rpc` namespace and dotted tag paths                                                           | Generated `http` namespace, API identifier, and literal projected paths                     |
-| Failure inspection                                | Generated wrapper preserves the failed Exit Cause                                                        | Generated wrapper preserves the failed Exit Cause and declaration identity                  |
-| Query cancellation                                | Generated signal forwarding and stream iterator cleanup; transport support is application-owned          | Generated signal forwarding; fetch abort is tested                                          |
-| Mutation cancellation                             | No upstream TanStack mutation abort signal; explicit cancellable command is application-owned and tested | No upstream TanStack mutation abort signal; domain cancellation is application-owned        |
-| Authentication, middleware, and residual services | Application-owned ready client and runner                                                                | Application-owned ready client and runner                                                   |
-| React hooks and QueryClient                       | Tested public consumers and Vite React example                                                           | Tested public consumers and Vite React example                                              |
-| SSR and hydration                                 | Application-owned; tested Start route loading and stream snapshots                                       | Application-owned; tested Start SSR, hydration, failed-query refetch, and request isolation |
-| Host routes                                       | Application-owned; tested standalone server and Start `/rpc`                                             | Application-owned; tested standalone server and Start `/api/$`                              |
-| Cache serialization and mutation invalidation     | Application-owned                                                                                        | Application-owned                                                                           |
+| Operation                                | RPC                                                                              | HTTP                                                                 |
+| ---------------------------------------- | -------------------------------------------------------------------------------- | -------------------------------------------------------------------- |
+| Ordinary queries, pagination, mutations  | Unary RPCs                                                                       | Buffered endpoints without multipart, regardless of method           |
+| Accumulated and live streams             | Streaming RPCs                                                                   | One unambiguous SSE success without multipart                        |
+| Buffered multipart uploads               | Client and payload contract owned by the application                             | Mutation-only; the application supplies `FormData`                   |
+| Streaming multipart and raw byte streams | Client transport contract                                                        | Omitted endpoints                                                    |
+| Response metadata                        | Declared RPC result                                                              | Buffered decoded data with plain status/header snapshots             |
+| Conditional reads                        | `skipToken` for input-bearing query builders                                     | Same, including buffered metadata                                    |
+| Query cancellation                       | Signal forwarding and iterator cleanup; transport determines server interruption | Same; fetch can abort the pending request                            |
+| Mutation cancellation                    | Explicit application command                                                     | Explicit application operation                                       |
+| Keys and failures                        | `rpc` namespace, dotted paths, full Cause                                        | `http` namespace, literal paths, full Cause and declaration identity |
+
+Clients, authentication, middleware, residual services, framework providers, host routes,
+SSR, serialization, mutation invalidation, and disposal belong to the application. The generated
+Core options work with native framework wrappers; the framework guides describe their accessors
+and inference limits.
 
 The package executes calls through the ready client. TanStack provides query cancellation
 signals but has no corresponding mutation signal for the adapter to forward. Configure request
 interception through client middleware and transport construction. Use an explicit domain
 operation when server cancellation must be observable; compensation is a separate operation.
 
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts),
-[public HTTP consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/http-contract.ts),
-and [executable examples](/effect-api-query/examples/) establish the tested scope. Streaming RPC
+For complete integrations, [run the examples](/effect-api-query/examples/). Streaming RPC
 builders use TanStack's experimental `streamedQuery` helper. Use the ready client directly for
 calls that do not need TanStack Query.
 
-## Runtime and cache behavior
-
-- The caller owns RPC or HTTP client acquisition, `Scope`, transport, Query Client, providers, router, SSR,
-  hydration, and disposal.
-- The package provides no framework adapter, provider, or Node-specific integration helper.
-- Query cancellation reaches the runner as an `AbortSignal`; stream cancellation closes the
-  AsyncIterator. Transport-level interruption depends on the client integration.
-- Mutation cancellation is outside the generated API.
-- Mutations do not invalidate queries automatically. Applications choose the affected key prefix.
-- RPC and HTTP query successes that may be `undefined` become `null` because TanStack Query rejects
-  `undefined` query data. Mutation results keep their original success type.
-- Cache identity must be strict JSON. Encoding services, redacted values, and multiple HTTP payload
-  alternatives require safe custom encoders for endpoints with query support. Binary query input needs
-  a JSON-safe projection. Multipart mutation-only endpoints require no encoder and reject encoder entries.
-- Key encoders are synchronous; asynchronous and Effect-returning encoders are unsupported.
-- RPC payload Schemas must be query-stable because key preparation and ready-client execution
-  construct the payload separately. HTTP builders accept decoded request input without RPC construction.
+[Browser and worker hosts](/effect-api-query/reference/browser-and-worker-hosts/) explains
+ready-client ownership and the worker transport boundary.
+
+WebSocket clients support unary calls, both stream views, and application-owned connection
+replacement. Follow the [WebSocket recipe](/effect-api-query/guides/websocket-clients/) for
+buffering and chunk-decoding limits. Local cancellation alone does not prove remote completion.
+
+[External HTTP clients](/effect-api-query/reference/external-http-clients/) covers generated
+OpenAPI consumption with `openapi-fetch` and `openapi-typescript`. Encoded DTOs,
+multipart serialization, and raw SSE access retain their own contracts; the external client does
+not replace a ready Effect client.
+
+With Effect 4.0.0, single-element arrays in GET and form-urlencoded payloads can fail server
+decoding. Array query parameters and JSON array responses retain their usual representation.
+
+## Input and cache limits
+
+Cache identity must be strict JSON. Encoding services, redacted values, and multiple HTTP payload
+alternatives require safe [custom encoders](/effect-api-query/guides/custom-key-encoders/)
+for endpoints with query support. Binary query input needs a JSON-safe projection. Multipart
+mutation-only endpoints require no encoder and reject encoder entries. Encoders are synchronous;
+asynchronous and Effect-returning encoders are unsupported.
+
+RPC payload Schemas must be query-stable because preparation and ready-client execution construct
+the payload separately. HTTP builders accept decoded request input without RPC construction.
+Keep captured input unchanged while its options can run; frozen keys do not freeze arbitrary
+input or decoded data.
+
+Buffered queries and live emissions normalize successful `undefined` to `null`. Accumulated stream
+elements and mutation results preserve it. See [Data Normalization](/effect-api-query/concepts/data-normalization/)
+for payload construction, input ownership and query data, and
+[Performance and Bundling](/effect-api-query/reference/performance/) for construction costs.
 
 ## Server rendering and errors
 
 - The package does not serialize errors for SSR. Omit failed queries from dehydration and refetch
   them in the browser, or provide your own error serializer.
-- Completed stream data dehydrates normally. An open stream must be cancelled after its first
-  successful server snapshot before route loading and dehydration can finish.
+- Await [fetchStreamSnapshot](/effect-api-query/guides/stream-snapshots/) to capture an open stream
+  before dehydration. A fresh capture exclusively owns an idle, unobserved exact query and awaits
+  local iterator cleanup. Its timeout limits the wait for data, not finalizer duration or remote
+  cancellation acknowledgement.
 - HTTP binary data and other domain values need an application serialization strategy.
 - Both execution-error guards use `instanceof` and recognize errors from the same JavaScript realm.
diff --git a/apps/docs/src/content/docs/reference/errors.md b/apps/docs/src/content/docs/reference/errors.md
index fc56f86..5441995 100644
--- a/apps/docs/src/content/docs/reference/errors.md
+++ b/apps/docs/src/content/docs/reference/errors.md
@@ -5,14 +5,18 @@ description: Configuration, key-generation, and execution errors for RPC and HTT
 
 ## `EffectRpcQueryConfigError`
 
-Thrown synchronously while configuring the utility tree or an option builder. Its `code` is one of:
+Thrown synchronously for invalid factory or builder configuration. Stream execution also rejects
+incompatible QueryClient hashing. Its `code` is one of:
 
 - `InvalidMaxChunks`: a streamed-query bound is not a positive safe integer.
+- `InvalidRefetchMode`: a streamed-query mode is not `reset`, `append`, or `replace`.
 - `InvalidKeyPrefix`
 - `InvalidRpcPath`
 - `RpcPathCollision`
 - `MissingKeyEncoder`
 - `UnknownKeyEncoder`
+- `UnsupportedQueryHash`: a builder received `queryKeyHashFn` or `queryHash`, or stream execution
+  found a default hash inconsistent with its key hasher or a conflicting cached identity.
 
 It can also expose `rpcTag`, `path`, and an underlying `cause`.
 
@@ -44,14 +48,20 @@ Thrown when a live query's stream completes before emitting a value. It exposes
 
 ## `EffectHttpApiQueryConfigError`
 
-Thrown synchronously while configuring HTTP utilities. Its `code` is one of:
+Thrown synchronously for invalid factory or builder configuration. Stream execution also rejects
+incompatible QueryClient hashing. Its `code` is one of:
 
+- `InvalidMaxChunks`: a streamed-query bound is not a positive safe integer.
+- `InvalidRefetchMode`: a streamed-query mode is not `reset`, `append`, or `replace`.
+- `InvalidMaxEventSize`: an SSE parser limit is not a positive safe integer.
 - `InvalidKeyPrefix`
 - `InvalidEndpointPath`
 - `EndpointPathCollision`
 - `MissingKeyEncoder`
 - `UnknownKeyEncoder`
 - `UnsupportedEndpointMetadata`
+- `UnsupportedQueryHash`: a builder received `queryKeyHashFn` or `queryHash`, or stream execution
+  found a default hash inconsistent with its key hasher or a conflicting cached identity.
 
 It exposes `apiId` and, when available, `groupId`, `endpoint`, `method`, `path`, and an underlying
 `cause`.
@@ -65,15 +75,24 @@ Thrown synchronously while preparing an HTTP query key, before client execution.
 - `KeyEncoderFailed`
 - `InvalidKeyValue`
 
-See [HTTP cache identity and failures](/effect-api-query/reference/http-factory/#cache-identity-and-failures)
+See [HTTP cache identity and failures](/effect-api-query/reference/http-builders/#cache-identity-and-failures)
 for each code's trigger.
 
 ## `EffectHttpApiQueryError<E>`
 
 Thrown when the HTTP runner returns a failed `Exit`. It exposes `apiId`, `groupId`, `endpoint`,
-`method`, `operation`, and the full `Cause.Cause<E>`. The operation is `query`, `infinite`, or `mutation`.
+`method`, `operation`, and the full `Cause.Cause<E>`. The operation is `query`, `infinite`, `mutation`,
+`metadata`, `streamed`, or `live`.
 Use `isEffectHttpApiQueryError(value)` to narrow errors within the same JavaScript realm.
 
 The Cause preserves endpoint, middleware, Schema, and HTTP client errors, including defects and
-interruption. It can contain upstream requests, responses, or sensitive input values; inspect those
+interruption. SSE failures also preserve declared event errors, `Sse.Retry`, and `Sse.SseError`.
+It can contain upstream requests, responses, or sensitive input values; inspect those
 values before logging or exposing them. Runner rejections pass through unchanged.
+
+## `EffectHttpApiQueryEmptyStreamError`
+
+Thrown when an HTTP live SSE query completes before emitting a value. It exposes `apiId`,
+`groupId`, `endpoint`, `method`, and operation `live`. A decoded `undefined` emission counts as a
+value and becomes `null`; a declared header wrapper preserves its body. Accumulated streams
+complete with an empty or retained history according to their refetch mode.
diff --git a/apps/docs/src/content/docs/reference/external-http-clients.md b/apps/docs/src/content/docs/reference/external-http-clients.md
new file mode 100644
index 0000000..397e011
--- /dev/null
+++ b/apps/docs/src/content/docs/reference/external-http-clients.md
@@ -0,0 +1,94 @@
+---
+title: External HTTP Clients
+description: Generated OpenAPI consumers, encoded request values, multipart uploads, and raw SSE limits.
+---
+
+An external HTTP client can call an Effect HttpApi server through its declared HTTP contract.
+For example, use `openapi-typescript` to generate `paths` from the JSON document returned by
+native `OpenApi.fromApi(api)` and call the server with `openapi-fetch`.
+The examples target `openapi-fetch` 0.17.0, `openapi-typescript` 7.13.0, and Effect 4.0.0.
+
+`createHttpApiQueryUtils` accepts a ready Effect HttpApiClient. Keep that client and its runner
+native; the external Promise client calls HTTP independently. This interoperability does not
+establish compatibility with the Effect RPC wire protocol.
+
+## Encoded and decoded values
+
+OpenAPI describes encoded HTTP values. An endpoint using `Schema.NumberFromString` accepts a
+string on the wire and a number through the ready Effect client. A generated external client
+returns a plain encoded DTO; native Schema decoding constructs the domain value.
+The external client's generated types add no runtime Schema decoding or validation.
+
+| Value                   | External client                   | Ready Effect client                                           |
+| ----------------------- | --------------------------------- | ------------------------------------------------------------- |
+| Request path parameter  | `params.path.id: '5'`             | `params.id: 5`                                                |
+| Request query parameter | `params.query.limit: '2'`         | `query.limit: 2`                                              |
+| Declared request header | `params.header['x-factor']: '3'`  | `headers['x-factor']: 3`                                      |
+| JSON request payload    | `body.amount: '7'`                | `payload.amount: 7`                                           |
+| Response body           | Plain object with `total: '17'`   | Schema class with `total: 17` and methods                     |
+| Response headers        | Raw strings on `response.headers` | Decoded declared header wrapper; raw strings in metadata view |
+
+## Call the declared HTTP contract
+
+Generate `paths` from your server's OpenAPI document. Its declared paths, headers and success/error
+responses determine the external client interface; the utility tree's decoded input does not.
+
+In the external client module, use the generated `paths` type and create the client:
+
+```ts
+import createClient from 'openapi-fetch'
+
+import type { paths } from './openapi-generated.ts'
+
+const external = createClient<paths>({ baseUrl: 'https://api.example.test' })
+```
+
+For a contract declaring `POST /reports/:id` with these fields, send encoded values:
+
+```ts
+const report = await external.POST('/reports/{id}', {
+  params: {
+    path: { id: '5' },
+    query: { limit: '2', labels: ['a b', 'c+d'] },
+    header: { 'x-factor': '3' },
+  },
+  body: { amount: '7', title: 'Quarter 1' },
+})
+if (report.error) {
+  throw new Error(`Report failed with HTTP ${report.response.status}`)
+}
+const revision = report.response.headers.get('x-revision')
+```
+
+Read declared failures through `error` and inspect `response.status`; the external client does
+not construct an Effect execution-error wrapper. Its `Response` keeps status and raw headers.
+The native [metadata view](/effect-api-query/reference/http-builders/#buffered-metadata) instead
+keeps decoded data and immutable plain status/header snapshots.
+
+Array query parameters use repeated names, including a single-element array. JSON array
+responses retain their ordinary representation. GET and form-urlencoded payloads have separate
+[upstream limits](/effect-api-query/reference/compatibility-and-limits/#capability-matrix).
+
+## Serialize multipart uploads explicitly
+
+Map a binary schema to `Blob` with the generator's `transform` hook. Supply a `bodySerializer`
+that builds `FormData` from the declared text fields and files, preserving filenames. Let Fetch
+set the multipart boundary; the default JSON serializer receives HTTP 415 from a multipart-only
+endpoint. The ready Effect client instead takes `FormData` directly as its decoded payload;
+see [Upload a File](/effect-api-query/guides/http-queries-and-mutations/#upload-a-file).
+
+## SSE boundary
+
+Request `parseAs: 'stream'` for a raw `ReadableStream<Uint8Array>`. It does not parse events, decode
+Schema values, or turn a reserved failure event into an error. Default JSON parsing fails on
+an SSE response.
+
+Effect's SSE data mode encodes each value as JSON in an event's `data` field. A custom event can
+also carry `id` and `event`. A stream failure uses the reserved event name
+`effect/http-api/stream/failure` and an encoded Cause body while HTTP status remains 200.
+The generated document records these details in `x-effect-stream`; this client does not consume
+that extension. Typed SSE consumption requires the native ready Effect client or an
+application-owned compatible decoder. Raw stream access alone gives no typed SSE guarantee.
+
+See the [external client's API](https://openapi-ts.dev/openapi-fetch/api) and
+[generator's Node API](https://openapi-ts.dev/node) for their configuration.
diff --git a/apps/docs/src/content/docs/reference/factory.md b/apps/docs/src/content/docs/reference/factory.md
index f68276a..3e87cae 100644
--- a/apps/docs/src/content/docs/reference/factory.md
+++ b/apps/docs/src/content/docs/reference/factory.md
@@ -9,12 +9,12 @@ Builds and freezes a `RpcQueryUtils` tree for the group's unary and streaming RP
 
 ### Options
 
-| Option           | Meaning                                                                                                                       |
-| ---------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `client`         | Ready flat RPC client. The caller owns its `Scope` and lifecycle.                                                             |
-| `keyPrefix`      | Non-empty, JSON-safe tuple that namespaces every generated key.                                                               |
-| `runPromiseExit` | Runner used for RPC Effects. Required when client-side services remain; otherwise defaults to `Effect.runPromiseExit`.        |
-| `keyEncoders`    | Synchronous encoders keyed by literal RPC tags. Required for payloads that need encoding services or contain redacted values. |
+| Option           | Meaning                                                                                                                                                                                             |
+| ---------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `client`         | Ready flat RPC client. The caller owns its `Scope` and lifecycle.                                                                                                                                   |
+| `keyPrefix`      | Non-empty, JSON-safe tuple that namespaces every generated key.                                                                                                                                     |
+| `runPromiseExit` | Runner used for RPC Effects. Required when client-side services remain; otherwise defaults to `Effect.runPromiseExit`.                                                                              |
+| `keyEncoders`    | Synchronous encoders keyed by literal RPC tags. Required for payloads that need encoding services or contain redacted values; runtime inspection also requires them for opaque encoding middleware. |
 
 ```ts
 const rpcQuery = createRpcQueryUtils(rpcGroup, {
@@ -27,4 +27,6 @@ const rpcQuery = createRpcQueryUtils(rpcGroup, {
 The factory throws `EffectRpcQueryConfigError` for an invalid prefix, RPC path collision, reserved
 path segment, or invalid encoder map. It performs no network request.
 
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts) checks factory inference and runner requirements.
+Query options retain the normalized payload for execution. Keep captured values unchanged; see
+[Data Normalization](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+for the distinction between immutable keys and caller-owned input.
diff --git a/apps/docs/src/content/docs/reference/generated-builders.md b/apps/docs/src/content/docs/reference/generated-builders.md
index 575e894..8f4ee8c 100644
--- a/apps/docs/src/content/docs/reference/generated-builders.md
+++ b/apps/docs/src/content/docs/reference/generated-builders.md
@@ -10,44 +10,44 @@ Each unary RPC leaf also exposes:
 | Builder                     | Result                                                                                                       |
 | --------------------------- | ------------------------------------------------------------------------------------------------------------ |
 | `queryKey(input?)`          | Payload-specific, data-tagged query key. Payload-bearing RPCs require constructor input.                     |
-| `queryOptions(options?)`    | Fresh Query Core options with generated `queryFn`, `queryKey`, and `queryKeyHashFn`.                         |
+| `queryOptions(options?)`    | Fresh Query Core options with generated `queryFn` and `queryKey`.                                            |
 | `infiniteKey(input?)`       | Data-tagged infinite-query key derived from the initial page's payload.                                      |
 | `infiniteOptions(options)`  | Fresh infinite-query options that map each `pageParam` to an RPC payload.                                    |
 | `mutationKey()`             | Immutable operation key shared by mutations of this RPC.                                                     |
 | `mutationOptions(options?)` | Fresh mutation options with generated `mutationFn` and `mutationKey`. Pass variables when the mutation runs. |
 
-Payloadless query builders take no input. Payload-bearing builders require an `input` field:
+Omitting `payload` or declaring `Schema.Void` makes an RPC payloadless. `Schema.Unknown`,
+`Schema.Any`, and unions containing `Schema.Void` remain payload-bearing: key builders accept their
+constructor input, query builders require an `input` field, and infinite queries require a page-input
+mapper. Mutation variables and custom encoders retain the declaration's input and normalized payload
+types, respectively.
 
-```ts
-rpcQuery.health.ping.queryOptions()
-rpcQuery.users.get.queryOptions({ input: { id: 1 }, staleTime: 30_000 })
-```
+Payloadless query builders take no input. Payload-bearing builders require an `input` field.
+Disable one with `input: skipToken`, retaining its other TanStack options. See
+[Queries](/effect-api-query/guides/queries/) and
+[Conditional Queries](/effect-api-query/guides/conditional-queries/) for usage.
 
-Disable a payload-bearing query with `input: skipToken`, retaining its other TanStack options:
+RPC payload Schemas with opaque encoding middleware require a custom key encoder, even when
+the middleware is synchronous and service-free. TypeScript may not detect opaque middleware;
+factory construction also validates this requirement at runtime. See
+[Custom Key Encoders](/effect-api-query/guides/custom-key-encoders/).
 
-```ts
-import { skipToken } from 'effect-api-query'
-
-const options = rpcQuery.users.get.queryOptions({
-  input: userId === undefined ? skipToken : { id: userId },
-  staleTime: 30_000,
-})
-```
-
-`queryOptions`, `streamedOptions`, and `liveOptions` also accept the direct `skipToken` shorthand.
-The object form preserves applicable caller options. The builder consumes `input` and, for
-accumulated streams, `refetchMode` and `maxChunks`, removing them from the returned options.
-Skipped options retain the exact sentinel, operation-level key, and package-owned hash function.
+The builder consumes `input` and, for accumulated streams, `refetchMode` and `maxChunks`,
+removing them from the returned options.
+Skipped options retain the exact sentinel and operation-level key.
 
 `queryOptions`, `streamedOptions`, and `liveOptions` accept conditional `input` unions of payload
 constructor input and `skipToken`. Concrete inputs retain callable query functions and
 payload-specific keys. Conditional inputs retain the possible sentinel and both key shapes.
+Inputs typed `unknown` or `any` can contain the sentinel and therefore return conditional options.
 
 `skipToken` is valid only for payload-bearing query options. It is not accepted by key or mutation
 builders, and skipped options are unsuitable for suspense and prefetch-only hooks.
 
-Generated query options also reserve `queryHash`: a caller-supplied hash cannot override generated
-cache identity.
+Configure custom hashing through QueryClient global or prefix defaults. Builders reject per-call
+`queryKeyHashFn` and `queryHash` with `EffectRpcQueryConfigError` code `UnsupportedQueryHash`.
+Keep hash defaults stable while entries remain cached. Stream execution also rejects with that
+code when changed hashing conflicts with a matching cached entry.
 
 ## Request-local RPC options
 
@@ -63,14 +63,6 @@ execution and removes it from the returned Query Core options, including skipped
 `streamBufferSize` is a number that configures the Effect client's stream buffer. It is independent of
 `maxChunks`, which limits the accumulated query cache.
 
-```ts
-const options = rpcQuery.users.get.queryOptions({
-  input: { id: 1 },
-  rpcOptions: { headers: { 'x-request-source': 'user-details' } },
-  staleTime: 30_000,
-})
-```
-
 Request options are fixed for each builder result. Infinite pages, retries, refetches, and repeated
 mutations use those same options. Callbacks based on variables or page parameters are unsupported.
 Omitting `rpcOptions` leaves the ready client's defaults in effect.
@@ -85,40 +77,10 @@ See [Client Lifecycle](/effect-api-query/concepts/client-lifecycle/) for applica
 ## Build an infinite query
 
 Map each page parameter to the unary RPC payload. The initial mapped payload also determines the
-semantic cache key.
-
-```ts
-const userPages = useInfiniteQuery(
-  rpcQuery.users.page.infiniteOptions({
-    initialPageParam: 0,
-    input: (cursor) => ({ cursor, pageSize: 20 }),
-    getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,
-  }),
-)
-
-const initialKey = rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 20 })
-```
+semantic cache key. See [Pagination](/effect-api-query/guides/pagination/) for usage.
 
 Payloadless RPCs omit `input`. To disable a payload-bearing infinite query, set its `input` field to
-`skipToken`:
-
-```ts
-const options = rpcQuery.users.page.infiniteOptions({
-  initialPageParam: 0,
-  input: skipToken,
-  getNextPageParam: () => undefined,
-})
-```
-
-The mapper and `skipToken` can also share one conditional input:
-
-```ts
-const options = rpcQuery.users.page.infiniteOptions({
-  initialPageParam: 0,
-  input: canLoadPages ? (cursor) => ({ cursor, pageSize: 20 }) : skipToken,
-  getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,
-})
-```
+`skipToken`. The mapper and sentinel can also share one conditional input.
 
 Concrete mappers retain callable query functions and payload-specific keys. The exact sentinel
 retains the operation key; conditional inputs preserve both key shapes and the query-function
@@ -129,24 +91,34 @@ A defined `initialData` value or factory remains required in the generated optio
 including conditional and skipped inputs. A factory that may return `undefined` keeps hook data
 possibly undefined.
 
-The builder forwards applicable Query Core options but owns `queryFn`, `queryKey`, and
-`queryKeyHashFn`. Each page uses the same Effect runner and cancellation signal as an ordinary
-query.
+The builder forwards applicable Query Core options and owns `queryFn` and `queryKey`.
+QueryClient defaults own hashing. Each page uses the same Effect runner and cancellation signal
+as an ordinary query.
 
 ## Stream values
 
 Each streaming RPC leaf exposes:
 
-| Builder                     | Result                                                                      |
-| --------------------------- | --------------------------------------------------------------------------- |
-| `streamedKey(input?)`       | Data-tagged key for the accumulated sequence.                               |
-| `streamedOptions(options?)` | Fresh Query Core options that append each emitted value to an array.        |
-| `liveKey(input?)`           | Data-tagged key for the latest value.                                       |
-| `liveOptions(options?)`     | Fresh Query Core options that replace the cached value after each emission. |
+| Builder                       | Result                                                                         |
+| ----------------------------- | ------------------------------------------------------------------------------ |
+| `streamedKey(input, policy?)` | Data-tagged key for the accumulated sequence and its retention/refetch policy. |
+| `streamedOptions(options?)`   | Fresh Query Core options that append each emitted value to an array.           |
+| `liveKey(input?)`             | Data-tagged key for the latest value.                                          |
+| `liveOptions(options?)`       | Fresh Query Core options that replace the cached value after each emission.    |
+
+See [Streaming](/effect-api-query/guides/streaming/) for usage.
 
 Both option builders publish the query as successful after its first value and keep
-`fetchStatus: 'fetching'` until the stream ends. An empty accumulated stream resolves to `[]`; an
-empty live stream fails with `EffectRpcQueryEmptyStreamError`.
+`fetchStatus: 'fetching'` until the stream ends. An empty accumulated stream succeeds; a new
+unseeded view resolves to `[]`. An empty live stream fails with `EffectRpcQueryEmptyStreamError`.
+
+Live queries convert emitted `undefined` to `null`; explicit `null` stays `null`. Their keys,
+selectors, and initial-data options describe this normalized value. Accumulated arrays preserve
+`undefined` elements.
+
+For an inputless RPC, call `streamedKey(policy?)`. Omitted policy means unlimited history and
+reset refetches. Pass the same policy to the key and options builders when
+reading, seeding, cancelling, or refetching an exact accumulated view.
 
 Accumulated streams accept TanStack's `refetchMode` option:
 
@@ -155,15 +127,7 @@ Accumulated streams accept TanStack's `refetchMode` option:
 - `append` adds the new stream's values to the cached sequence.
 - `replace` retains the old sequence until the new stream ends, then replaces it atomically.
 
-Set `maxChunks` to a positive safe integer to retain only the newest emitted elements in order:
-
-```ts
-const options = utils.events.watch.streamedOptions({
-  input: { channel: 'news' },
-  maxChunks: 100,
-  refetchMode: 'append',
-})
-```
+Set `maxChunks` to a positive safe integer to retain only the newest emitted elements in order.
 
 After each emission, the accumulated array contains at most `maxChunks` elements. On refetch:
 
@@ -178,13 +142,19 @@ array.
 The bound discards older history to limit the number of elements; it does not limit byte size.
 Without it, accumulation remains unbounded. Use `liveOptions` when only the latest value matters.
 
-`maxChunks` configures accumulation, not key identity. Builders consume it before returning options,
-including skipped options. Invalid bounds throw `EffectRpcQueryConfigError` with code
-`InvalidMaxChunks` synchronously, even when `input` is `skipToken`.
+`maxChunks` and `refetchMode` both contribute to concrete accumulated-stream identity. Omitted
+values mean unlimited retention and `reset`; explicit `undefined` and explicit `reset` produce
+the same default identity. Different policies have separate histories, including concurrent views
+of the same RPC payload. Root, branch, RPC, and streamed-operation prefixes still match every policy.
+
+Builders consume both fields before returning options, including skipped options. Invalid bounds
+throw `EffectRpcQueryConfigError` with code `InvalidMaxChunks`; invalid modes use
+`InvalidRefetchMode`. Both fail synchronously, even when `input` is `skipToken`.
 
-Live queries always replace the cached value and therefore expose no `refetchMode`. Cancelling,
-unmounting, or superseding either stream closes its iterator and interrupts its Effect resources.
+Derive exact accumulated-stream keys through the builders with the view's policy, and treat their
+concrete suffix as opaque. Applications persisting data choose their own schema and key-version
+busters; see [Switch Cache Owners](/effect-api-query/guides/switch-cache-owners/#restore-a-directory-snapshot).
 
-The [public RPC consumer](https://github.com/ueberBrot/effect-api-query/blob/main/tests/types/public-contract.ts) checks the builder examples
-and hook types. The [streaming tests](https://github.com/ueberBrot/effect-api-query/blob/main/tests/create-rpc-query-utils-streaming.test.ts)
-verify accumulation, replacement, bounds, and cancellation.
+Live queries always replace the cached value and therefore expose no `refetchMode`. Cancelling
+or superseding a query closes its iterator and interrupts its Effect resources. Unmounting the
+last observer cancels active work; other observers keep a shared query active.
diff --git a/apps/docs/src/content/docs/reference/http-builders.md b/apps/docs/src/content/docs/reference/http-builders.md
new file mode 100644
index 0000000..ffac846
--- /dev/null
+++ b/apps/docs/src/content/docs/reference/http-builders.md
@@ -0,0 +1,219 @@
+---
+title: HTTP Builders
+description: HTTP query, metadata, mutation, pagination, and SSE option contracts.
+---
+
+Every retained branch and endpoint provides `key()` for prefix filtering. The
+[HTTP Factory](/effect-api-query/reference/http-factory/) specifies construction, supported endpoint
+shapes, and the decoded request contract.
+
+Query key builders return immutable, data-tagged keys. Option builders return fresh native
+Query Core options for the corresponding view.
+
+| Builder                                                     | View                                                         |
+| ----------------------------------------------------------- | ------------------------------------------------------------ |
+| `queryKey(input?)`, `queryOptions(options?)`                | Decoded query data.                                          |
+| `metadataKey(input?)`, `metadataOptions(options?)`          | Decoded data, status, and raw headers.                       |
+| `infiniteKey(input?)`, `infiniteOptions(options)`           | Native `InfiniteData` for paginated responses.               |
+| `mutationKey()`, `mutationOptions(options?)`                | Mutation options whose variables are supplied at execution.  |
+| `streamedKey(input?, policy?)`, `streamedOptions(options?)` | Accumulated SSE emissions with retention and decoder policy. |
+| `liveKey(input?, policy?)`, `liveOptions(options?)`         | Latest SSE emission with decoder policy.                     |
+
+Input-bearing key builders require the complete request. Inputless streamed and live key
+builders take their policy as the first argument. Buffered multipart endpoints expose only
+mutation builders; SSE endpoints expose only accumulated and live builders.
+
+## Query options
+
+See [Queries](/effect-api-query/guides/queries/) for usage.
+
+Ordinary options work with native query, suspense, and prefetch hooks and QueryClient operations.
+Callbacks retain the decoded result, complete failure union, and request types. `select` changes
+consumer data; data-tagged keys retain the underlying cache data and error types. The type of
+`initialData`, whether defined or possibly undefined, preserves the corresponding TanStack hook
+overload.
+
+Applicable TanStack options pass through. The package owns the key and function and removes
+`input` before returning options. QueryClient global and prefix defaults own hashing. Builders
+reject per-call `queryKeyHashFn` and `queryHash` with `EffectHttpApiQueryConfigError` code
+`UnsupportedQueryHash`.
+Keep hash defaults stable while entries remain cached. Stream execution also rejects with that
+code when changed hashing conflicts with a matching cached entry.
+
+Input-bearing `queryOptions` accepts a complete request in `input` or
+`queryOptions({ input: skipToken, ...options })`. Import `skipToken` from `effect-api-query` or
+TanStack. Skipping preserves caller options and returns the exact sentinel as `queryFn`, with the
+operation-level key and no request identity. It performs no request encoding or client call.
+Supplied initial data remains available, but native skipped hook data stays possibly undefined.
+
+Inputless builders, key builders, and mutations reject `skipToken`. A skipped function cannot run
+through manual refetch; supply valid input or use `enabled: false` with a complete request when
+manual execution is required. Native suspense and prefetch-only hooks reject skipped options.
+
+## Mutation options
+
+`mutationOptions(options?)` supplies `mutationKey` and `mutationFn`. Pass the complete decoded
+request as variables when a native mutation hook or observer executes it. Variables never enter
+the key. Callbacks retain result, request, and execution-error types. Successful `undefined`
+remains `undefined`.
+
+Mutations have no query abort signal and no automatic relationship to cached reads. Choose
+invalidation, seeding, or optimistic updates in native callbacks; see
+[Mutations](/effect-api-query/guides/mutations/).
+
+## Buffered metadata
+
+Query-enabled buffered endpoints also provide `metadataKey(request)` and `metadataOptions({ input,
+...options })`; inputless endpoints omit the request. The ready client runs in decoded-and-response
+mode, and the cache contains:
+
+```ts
+type Metadata<DecodedSuccess> = {
+  readonly data: QueryData<DecodedSuccess>
+  readonly status: number
+  readonly headers: Readonly<Record<string, string>>
+}
+```
+
+The outer envelope and copied plain header record are frozen. `data` preserves the declared decoded
+value and its ownership, including decoded `WithHeaders` wrappers. Only top-level successful
+`undefined` becomes `null`. Raw headers retain their string values without Effect's inspection
+redaction; applications decide which headers may be persisted or dehydrated.
+
+Fetched snapshots remain frozen after structural sharing. Global and prefix sharing policies apply
+to fetched data; a policy passed to `metadataOptions` overrides them. Mutable envelopes or header
+records selected by sharing are copied
+before freezing, retaining the selected decoded data reference. The adapter does not freeze
+decoded data or caller-supplied `initialData`, hydrated values, or manual cache writes.
+
+Selected observer results and, after execution, manual cache writes use the sharing policy explicitly
+passed to `metadataOptions`, or standard deep sharing when it is absent. Inherited global and prefix
+sharing policies apply only to fetched metadata snapshots.
+
+A fresh-cache hit from imperative `queryClient.query(newOptions)` retains the Query's existing
+options. Install a changed sharing policy through an observer or an actual fetch before relying
+on it for later manual writes.
+
+Metadata keys use a `metadata` discriminator and the ordinary request identity. Endpoint prefixes
+match every view. Native `select`, `initialData`, skip-token inference, QueryClient hashing defaults,
+and cancellation apply to metadata options. Execution failures identify operation `metadata` and
+preserve that client mode's full error and service channels. Metadata adds no mutation or infinite
+builders and is absent on multipart and streaming endpoints.
+
+The cache retains the decoded value and metadata snapshot, without a response object or open body.
+See [Update with an ETag](/effect-api-query/guides/http-metadata/#update-with-an-etag)
+for conditional writes.
+
+## Accumulated SSE options
+
+`streamedOptions` accepts native query options, decoded `input` when declared, and:
+
+| Option                    | Contract                                                                                                |
+| ------------------------- | ------------------------------------------------------------------------------------------------------- |
+| `maxChunks`               | Positive safe integer limiting retained events; omitted means unlimited.                                |
+| `refetchMode`             | `reset` (default), `append`, or `replace`.                                                              |
+| `sseOptions.maxEventSize` | Positive safe integer limiting pending parser text; defaults to 10 MiB of JavaScript string code units. |
+
+Decoded data is an ordered readonly array. Accumulated elements keep `undefined`; decoded header
+wrappers surround each emitted body. Empty completion succeeds. Acquisition and consumption errors
+use `EffectHttpApiQueryError` with operation `streamed`, preserving declared event failures,
+`Sse.Retry`, `Sse.SseError`, HTTP and Schema errors, and additional client channels.
+The caller's runner supplies acquisition and consumption services and receives Query's abort signal.
+Cancellation closes the iterator and follows native Query cache reversion.
+
+`streamedKey(input, policy)` accepts the same decoder, retention, and refetch policy; inputless
+endpoints use `streamedKey(policy)`. Equivalent defaults have equal keys. Different effective
+policies occupy separate entries. Endpoint `key()` selects them all. Decoder controls are excluded
+from decoded request input and custom encoders. Declared resume headers remain request identity.
+
+See [Accumulate Values](/effect-api-query/guides/streaming/#accumulate-values).
+
+## Live SSE options
+
+`liveOptions` accepts native query options, declared decoded `input`, and `sseOptions`.
+`liveKey(input, { sseOptions })`, or `liveKey({ sseOptions })` for inputless endpoints, includes
+normalized decoder policy in its separate `live` identity. Its keys carry the latest decoded value
+and the execution error union, including `EffectHttpApiQueryEmptyStreamError`. Live builders
+preserve selection, initial-data, and skipped-input inference.
+
+The first emission makes the query successful. Later emissions replace the cached value, and
+completion preserves the latest value. Only a top-level `undefined` becomes `null`; declared
+header wrappers retain their decoded body and headers. An empty live completion fails with
+declaration metadata. Live queries accept no `maxChunks` or accumulated `refetchMode`.
+
+The acquisition and consumption error/service channels, decoder limit validation, iterator cleanup,
+and caller-owned reconnection contract match accumulated SSE queries. Input-bearing builders
+validate decoder policy even when skipped. Endpoint prefixes match both representations and every
+concrete decoder policy. See [Keep the Latest Value](/effect-api-query/guides/streaming/#keep-the-latest-value).
+
+## Pagination
+
+`infiniteOptions` requires `initialPageParam` and `getNextPageParam`. For an input-bearing endpoint,
+`input(pageParam)` returns the complete decoded HTTP request for that page. Inputless endpoints
+omit `input`. Input-bearing endpoints can pause with `input: skipToken` in the options object;
+the direct sentinel form is unavailable.
+
+The initial request determines cache identity. Infinite keys use an `infinite` discriminator, so
+they remain separate from ordinary queries for the same request. `infiniteKey(request)` builds
+the corresponding key from a complete initial request; `infiniteKey()` serves inputless endpoints.
+Keys returned by `infiniteOptions` also retain the inferred page-parameter type for cache reads.
+
+Keep stable filters in the initial request and every page. Change the initial request when those
+filters change, and advance cursors through `getNextPageParam`. The input mapper must be
+deterministic: the builder evaluates it for the initial key, and execution evaluates it for every
+page.
+
+QueryClient stores native `InfiniteData` and owns invalidation and refetching. Selections can
+transform consumer data without changing cached pages. Every page preserves the
+ordinary HTTP execution contract, including `undefined`-to-`null` normalization, wrapped errors,
+and cancellation. See [Pagination](/effect-api-query/guides/pagination/).
+
+## Cache identity and failures
+
+HTTP keys begin with `keyPrefix`, `http`, and the HttpApi identifier, followed by the projected
+endpoint path and operation discriminator. Query keys append canonical request identity when the
+endpoint has input. `utils.key()` includes the generated root and matches every HTTP descendant.
+RPC utilities use a separate `rpc` discriminator. Use the original caller prefix deliberately
+when invalidating across both adapters.
+
+Default query preparation synchronously encodes the declared `params`, `query`, `payload`, and
+`headers` schemas. The key retains these labels, including when a bodyless method sends its payload
+as URL parameters. Preparation uses the endpoint's effective schemas without constructing an HTTP
+request or body. The same rule applies to JSON, text, form-urlencoded requests, and requests without
+bodies.
+
+Encoded object members whose value is `undefined` are omitted. An encoded `null` stays `null`,
+including when Effect's JSON codec produces it from a decoded optional value. Arrays retain their
+order; sparse arrays and encoded `undefined` items are rejected. Header field names become lowercase;
+equal duplicates collapse and conflicting duplicates fail. Other values follow strict canonical
+JSON: finite numbers, plain objects, copied arrays, sorted object properties, cycle rejection, and
+deep freezing.
+
+For endpoints with query support, multiple effective payload schemas require a custom encoder,
+including alternatives with the same content type. Types enforce this requirement when declarations retain distinct schemas. Runtime
+validation also covers alternatives that the declaration types no longer distinguish. Buffered binary
+input needs an explicit JSON-safe projection because default keys cannot contain `Uint8Array`. See
+[custom key encoders](/effect-api-query/guides/custom-key-encoders/#http-requests).
+
+`EffectHttpApiQueryKeyError` identifies the API, group, endpoint, and method and distinguishes:
+
+| Code                    | Trigger                                                                   |
+| ----------------------- | ------------------------------------------------------------------------- |
+| `RequestEncodingFailed` | A default request-schema encoder fails.                                   |
+| `KeyEncoderFailed`      | A custom encoder throws.                                                  |
+| `InvalidKeyValue`       | Encoded identity violates canonical JSON or has conflicting header names. |
+
+These failures occur in `queryKey` or `queryOptions`, before the client runs. Mutation preparation
+does not encode a query key; request encoding runs inside the ready client's Effect. Custom encoder
+output follows strict JSON and bypasses the default HTTP rules for omitting `undefined` members
+and normalizing headers.
+
+Multipart mutation keys contain no request variables or files. `mutationKey()` identifies the
+operation, and `key()` retains the endpoint's normal invalidation prefix. Use mutation callbacks
+to invalidate the affected read endpoints. Multipart leaves have no query or infinite-query builders.
+
+`EffectHttpApiQueryError` wraps a failed execution `Exit`, identifies the API, group, endpoint,
+method, and operation, and preserves its complete Cause. The package adds no concrete request
+values to that metadata; upstream Causes can still contain requests, responses, or Schema issue
+values. `isEffectHttpApiQueryError` narrows execution errors. Configuration and key preparation
+failures use `EffectHttpApiQueryConfigError` and `EffectHttpApiQueryKeyError` respectively.
diff --git a/apps/docs/src/content/docs/reference/http-factory.md b/apps/docs/src/content/docs/reference/http-factory.md
index 7578678..7c855cb 100644
--- a/apps/docs/src/content/docs/reference/http-factory.md
+++ b/apps/docs/src/content/docs/reference/http-factory.md
@@ -7,15 +7,21 @@ description: HTTP factory options, decoded request input, response data, and cac
 uses an Effect HttpApi and a ready HttpApiClient whose lifetime your application manages. Import
 it from `effect-api-query`.
 
-For a step-by-step example, see [HTTP Queries and Mutations](/effect-api-query/guides/http-queries-and-mutations/).
+Start with the [HTTP Quick Start](/effect-api-query/getting-started/http-quick-start/).
+[HTTP Builders](/effect-api-query/reference/http-builders/) specifies each generated option and key.
 
-Ordinary groups appear as `utils[groupIdentifier][endpointIdentifier]`. Top-level groups place
-their endpoints at `utils[endpointIdentifier]`. Identifiers containing dots remain literal
-properties. Every retained branch and endpoint has `key()`; buffered endpoints without multipart have
-`queryKey`, `queryOptions`, `mutationKey`, `mutationOptions`, `infiniteKey`, and `infiniteOptions`.
-An endpoint with any buffered multipart payload alternative exposes only `key`, `mutationKey`, and
-`mutationOptions`, even when it also accepts plain payload alternatives. This classification applies
-regardless of HTTP method; applications choose the builder for endpoints with query support.
+Ordinary groups project to `utils[groupIdentifier][endpointIdentifier]`; top-level groups
+project endpoints to `utils[endpointIdentifier]`. Dots remain literal properties. Every retained
+branch and endpoint has `key()`.
+
+| Endpoint                                   | Builders beside `key()`                                                                 |
+| ------------------------------------------ | --------------------------------------------------------------------------------------- |
+| Buffered without multipart                 | `queryKey/Options`, `metadataKey/Options`, `infiniteKey/Options`, `mutationKey/Options` |
+| Any buffered multipart payload alternative | `mutationKey`, `mutationOptions`                                                        |
+| Exactly one SSE success, no multipart      | `streamedKey/Options`, `liveKey/Options`                                                |
+
+Any multipart alternative makes a buffered endpoint mutation-only, including mixed plain and
+multipart alternatives. HTTP method does not determine the builder for query-enabled endpoints.
 
 ## Factory options
 
@@ -27,8 +33,10 @@ regardless of HTTP method; applications choose the builder for endpoints with qu
 | `keyEncoders`    | Synchronous encoders keyed first by declaration group identifier, then endpoint identifier, including top-level groups.     |
 
 A key encoder receives the complete decoded HTTP request input and returns `JsonValue`. For endpoints
-with query support, request encoding services, explicit redacted values, and multiple payload
-alternatives require an encoder.
+with query support, request encoding services, opaque encoding middleware, explicit redacted
+values, and multiple payload alternatives require an encoder. Opaque middleware requires an
+encoder even when it is synchronous and service-free; TypeScript may not detect that requirement,
+so factory construction also validates it at runtime.
 For alternatives, preserve every body and content-type distinction that affects the result. An
 encoder does not provide execution services; the runner remains independently required.
 Multipart mutation-only endpoints require no encoder and reject configured encoder entries.
@@ -47,7 +55,11 @@ query filter still needs `input: { query: {} }`. A `Schema.FiniteFromString` fie
 which the ready client encodes as a string. Raw response controls are excluded from query input,
 mutation variables, and encoder input.
 
-The adapter forces decoded-only responses. Queries cache a successful `undefined` as `null`;
+Query options retain the decoded request for execution. Keep captured values unchanged; see
+[Data Normalization](/effect-api-query/concepts/data-normalization/#keep-captured-inputs-unchanged)
+for the distinction between immutable keys and caller-owned input.
+
+Ordinary queries and mutations use decoded-only responses. Queries cache a successful `undefined` as `null`;
 mutations retain `undefined`. Buffered text stays a string, binary data stays a `Uint8Array`, and
 declared response-header wrappers retain their decoded body and headers. Applications own the
 serialization strategy for binary and other domain values; the package supplies no automatic SSR
@@ -58,106 +70,16 @@ client errors, and additional ready-client errors in the wrapped Cause's type.
 
 Required services include those needed by request encoders, success and error decoders, and the
 ready client for exposed endpoints. Compatible custom clients retain the errors and remaining
-service requirements of their decoded-only call signatures; raw-response overloads contribute neither.
+service requirements of their decoded-only and decoded-and-response call signatures;
+response-only overloads contribute neither.
 See [client lifecycle](/effect-api-query/concepts/client-lifecycle/#http-clients-and-execution-services)
 and [cancellation](/effect-api-query/guides/cancellation/#cancel-an-http-query) for runtime ownership.
 
-Any streaming success alternative, including a header-wrapped stream, omits the complete endpoint.
-Any streaming multipart request alternative does the same. Buffered multipart alternatives retain
+A single SSE success, including `WithHeaders(StreamSse(...), ...)`, supports accumulated and live queries.
+Raw byte streams and mixed buffered/SSE success alternatives omit the complete endpoint.
+Any streaming multipart request alternative does the same. SSE endpoints with buffered multipart
+payload alternatives are also omitted. Buffered multipart alternatives retain
 the endpoint's mutation builders. Groups containing only omitted endpoints disappear.
 Factory construction rejects unsafe names, path collisions, and contradictory multipart metadata
 before returning a tree. Preserve literal declaration types so the inferred tree omits the same
 endpoints.
-
-## Query options
-
-Ordinary options work with native query, suspense, and prefetch hooks and QueryClient operations.
-Callbacks retain the decoded result, complete failure union, and request types. `select` changes
-observer data; data-tagged keys retain the underlying cache data and error types. The type of
-`initialData`, whether defined or possibly undefined, preserves the corresponding TanStack hook
-overload.
-
-Applicable TanStack options pass through. The package owns the key, function, and query hash
-fields, including the precomputed `queryHash`. It removes `input` before returning options.
-
-Input-bearing `queryOptions` accepts a complete request, `queryOptions(skipToken)`, or
-`queryOptions({ input: skipToken, ...options })`. Import `skipToken` from `effect-api-query` or
-TanStack. Skipping preserves caller options and returns the exact sentinel as `queryFn`, with the
-operation-level key and no request identity. It performs no request encoding or client call.
-Supplied initial data remains available, but native skipped hook data stays possibly undefined.
-
-Inputless builders, key builders, and mutations reject `skipToken`. A skipped function cannot run
-through manual refetch; supply valid input or use `enabled: false` with a complete request when
-manual execution is required. Native suspense and prefetch-only hooks reject skipped options.
-
-## Pagination
-
-`infiniteOptions` requires `initialPageParam` and `getNextPageParam`. For an input-bearing endpoint,
-`input(pageParam)` returns the complete decoded HTTP request for that page. Inputless endpoints
-omit `input`. Input-bearing endpoints can pause with `input: skipToken` in the options object;
-the direct sentinel form is unavailable.
-
-The initial request determines cache identity. Infinite keys use an `infinite` discriminator, so
-they remain separate from ordinary queries for the same request. `infiniteKey(request)` builds
-the corresponding key from a complete initial request; `infiniteKey()` serves inputless endpoints.
-Keys returned by `infiniteOptions` also retain the inferred page-parameter type for cache reads.
-
-Keep stable filters in the initial request and every page. Change the initial request when those
-filters change, and advance cursors through `getNextPageParam`. The input mapper must be
-deterministic: the builder evaluates it for the initial key, and execution evaluates it for every
-page.
-
-QueryClient stores native `InfiniteData` and owns invalidation and refetching. Selections can
-transform observer data without changing cached pages. Every page preserves the
-ordinary HTTP execution contract, including `undefined`-to-`null` normalization, wrapped errors,
-and cancellation. See [Load pages](/effect-api-query/guides/http-queries-and-mutations/#load-pages).
-
-## Cache identity and failures
-
-HTTP keys begin with `keyPrefix`, `http`, and the HttpApi identifier, followed by the projected
-endpoint path and operation discriminator. Query keys append canonical request identity when the
-endpoint has input. `utils.key()` includes the generated root and matches every HTTP descendant.
-RPC utilities use a separate `rpc` discriminator. Use the original caller prefix deliberately
-when invalidating across both adapters.
-
-Default query preparation synchronously encodes the declared `params`, `query`, `payload`, and
-`headers` schemas. The key retains these labels, including when a bodyless method sends its payload
-as URL parameters. Preparation uses the endpoint's effective schemas without constructing an HTTP
-request or body. The same rule applies to JSON, text, form-urlencoded requests, and requests without
-bodies.
-
-Encoded object members whose value is `undefined` are omitted. An encoded `null` stays `null`,
-including when Effect's JSON codec produces it from a decoded optional value. Arrays retain their
-order; sparse arrays and encoded `undefined` items are rejected. Header field names become lowercase;
-equal duplicates collapse and conflicting duplicates fail. Other values follow strict canonical
-JSON: finite numbers, plain objects, copied arrays, sorted object properties, cycle rejection, and
-deep freezing.
-
-For endpoints with query support, multiple effective payload schemas require a custom encoder,
-including alternatives with the same content type. Types enforce this requirement when declarations retain distinct schemas. Runtime
-validation also covers alternatives that the declaration types no longer distinguish. Buffered binary
-input needs an explicit JSON-safe projection because default keys cannot contain `Uint8Array`. See
-[custom key encoders](/effect-api-query/guides/custom-key-encoders/#http-requests).
-
-`EffectHttpApiQueryKeyError` identifies the API, group, endpoint, and method and distinguishes:
-
-| Code                    | Trigger                                                                   |
-| ----------------------- | ------------------------------------------------------------------------- |
-| `RequestEncodingFailed` | A default request-schema encoder fails.                                   |
-| `KeyEncoderFailed`      | A custom encoder throws.                                                  |
-| `InvalidKeyValue`       | Encoded identity violates canonical JSON or has conflicting header names. |
-
-These failures occur in `queryKey` or `queryOptions`, before the client runs. Mutation preparation
-does not encode a query key; request encoding runs inside the ready client's Effect. Custom encoder
-output follows strict JSON and bypasses the default HTTP rules for omitting `undefined` members
-and normalizing headers.
-
-Multipart mutation keys contain no request variables or files. `mutationKey()` identifies the
-operation, and `key()` retains the endpoint's normal invalidation prefix. Use mutation callbacks
-to invalidate the affected read endpoints. Multipart leaves have no query or infinite-query builders.
-
-`EffectHttpApiQueryError` wraps a failed execution `Exit`, identifies the API, group, endpoint,
-method, and operation, and preserves its complete Cause. The package adds no concrete request
-values to that metadata; upstream Causes can still contain requests, responses, or Schema issue
-values. `isEffectHttpApiQueryError` narrows execution errors. Configuration and key preparation
-failures use `EffectHttpApiQueryConfigError` and `EffectHttpApiQueryKeyError` respectively.
diff --git a/apps/docs/src/content/docs/reference/performance.md b/apps/docs/src/content/docs/reference/performance.md
new file mode 100644
index 0000000..5bd993c
--- /dev/null
+++ b/apps/docs/src/content/docs/reference/performance.md
@@ -0,0 +1,42 @@
+---
+title: Performance and Bundling
+description: Construction costs, source workloads, and the distinction between adapter and application bundles.
+---
+
+## Construction
+
+Factories eagerly build and freeze the complete RPC or HTTP utility tree. Build each tree once
+for its ready client and cache owner. A larger contract increases factory work even when an
+application uses only a few leaves.
+
+Payload-bearing keys prepare a fresh immutable canonical payload. RPC preparation constructs
+and Schema-encodes the normalized payload; HTTP preparation encodes the declared request parts.
+Larger payloads increase this work. Executable query options also capture the request and create a fresh
+query function. Repeated calls do not memoize payloads or option objects.
+
+A custom RPC key encoder replaces Schema encoding. Payload construction, JSON validation,
+canonical copying, and freezing still run. Choose an encoder for correct semantic identity;
+it must preserve every input field that can change the result.
+
+## Repeatable measurements
+
+Run the optional construction workload against repository sources:
+
+```sh
+vp run construction-baseline
+```
+
+The [stream workload](https://github.com/ueberBrot/effect-api-query/blob/main/tests/create-rpc-query-utils-stream-baseline.test.ts)
+and [transport workload](https://github.com/ueberBrot/effect-api-query/blob/main/examples/server/tests/rpc-transport-overhead.test.ts)
+measure publication and transport costs. Compare the same workload and dependency versions;
+elapsed time and memory depend on the machine.
+
+## Adapter and application bundles
+
+The package marks its exports as free of side effects and keeps Effect and Query Core as peers.
+An application can import one factory or an error guard from the package root. Unused factories
+and the stream snapshot helper can then be removed by the bundler.
+
+An adapter-only bundle with peers external excludes dependency code. An application's contract
+Schemas, transport, QueryClient, framework, and other imports contribute to its final bundle.
+Compare the same imports and dependency versions before attributing a size change to the adapter.
diff --git a/apps/docs/src/content/docs/reference/public-exports.md b/apps/docs/src/content/docs/reference/public-exports.md
index b34e9ce..959409f 100644
--- a/apps/docs/src/content/docs/reference/public-exports.md
+++ b/apps/docs/src/content/docs/reference/public-exports.md
@@ -5,31 +5,96 @@ description: Package-root values and types.
 
 All supported imports come from `effect-api-query`.
 
-| Export                           | Purpose                                                               |
-| -------------------------------- | --------------------------------------------------------------------- |
-| `createRpcQueryUtils`            | Build the RPC utility tree.                                           |
-| `skipToken`                      | Query Core's exact sentinel for disabling queries that require input. |
-| `EffectRpcQueryConfigError`      | Invalid factory or builder configuration.                             |
-| `EffectRpcQueryKeyError`         | Payload or key preparation failure.                                   |
-| `EffectRpcQueryError`            | Failed RPC `Exit` with its Effect `Cause`.                            |
-| `EffectRpcQueryEmptyStreamError` | Live stream completed without a value.                                |
-| `isEffectRpcQueryError`          | Runtime guard for RPC execution errors.                               |
-| `CreateRpcQueryUtilsOptions`     | Factory option type.                                                  |
-| `RpcQueryUtils`                  | Generated utility-tree type.                                          |
-| `RunPromiseExit`                 | Runner adapter type with optional abort signal.                       |
-| `KeyEncoder`                     | Synchronous semantic key-encoder type.                                |
-| `JsonValue`                      | Immutable strict-JSON key value.                                      |
-| `QueryData`                      | Query success type with possible `undefined` normalized to `null`.    |
-| `SkipToken`                      | Type of the exported skip sentinel.                                   |
-| `EffectRpcQueryConfigErrorCode`  | Stable configuration error-code union.                                |
-| `EffectRpcQueryKeyErrorCode`     | Stable key error-code union.                                          |
+| Export                                    | Purpose                                                                   |
+| ----------------------------------------- | ------------------------------------------------------------------------- |
+| `createRpcQueryUtils`                     | Build the RPC utility tree.                                               |
+| `viewPrefix`                              | Select every input of one supported leaf view.                            |
+| `withQueryPolicy`                         | Bind typed defaults to an existing query options builder.                 |
+| `withMutationPolicy`                      | Bind typed defaults to an existing mutation options builder.              |
+| `QueryPolicy`, `MutationPolicy`           | Annotate reusable leaf-specific native policies.                          |
+| `InferInput`                              | Derive the operation input from a generated leaf.                         |
+| `InferQueryData`, `InferQueryError`       | Derive cached data and failures for a supported query view.               |
+| `InferMutationData`, `InferMutationError` | Derive a buffered mutation's result and execution error.                  |
+| `fetchStreamSnapshot`                     | Capture stream data and await exact-query cancellation and local cleanup. |
+| `StreamSnapshotOptions`                   | Fresh/cached mode, request abort signal, and publication timeout.         |
+| `skipToken`                               | Query Core's exact sentinel for disabling queries that require input.     |
+| `EffectRpcQueryConfigError`               | Invalid factory or builder configuration.                                 |
+| `EffectRpcQueryKeyError`                  | Payload or key preparation failure.                                       |
+| `EffectRpcQueryError`                     | Failed RPC `Exit` with its Effect `Cause`.                                |
+| `EffectRpcQueryEmptyStreamError`          | Live stream completed without a value.                                    |
+| `isEffectRpcQueryError`                   | Runtime guard for RPC execution errors.                                   |
+| `CreateRpcQueryUtilsOptions`              | Factory option type.                                                      |
+| `RpcQueryUtils`                           | Generated utility-tree type.                                              |
+| `RunPromiseExit`                          | Runner adapter type with optional abort signal.                           |
+| `KeyEncoder`                              | Synchronous semantic key-encoder type.                                    |
+| `JsonValue`                               | Immutable strict-JSON key value.                                          |
+| `QueryData`                               | Query success type with possible `undefined` normalized to `null`.        |
+| `SkipToken`                               | Type of the exported skip sentinel.                                       |
+| `EffectRpcQueryConfigErrorCode`           | Stable configuration error-code union.                                    |
+| `EffectRpcQueryKeyErrorCode`              | Stable key error-code union.                                              |
 
 The [HTTP factory](/effect-api-query/reference/http-factory/) adds `createHttpApiQueryUtils`,
 `HttpApiQueryUtils`, `CreateHttpApiQueryUtilsOptions`, and `HttpApiKeyEncoder`. Its errors are
-`EffectHttpApiQueryError`, `EffectHttpApiQueryConfigError`, and `EffectHttpApiQueryKeyError`, with
+`EffectHttpApiQueryError`, `EffectHttpApiQueryEmptyStreamError`, `EffectHttpApiQueryConfigError`, and
+`EffectHttpApiQueryKeyError`, with
 `isEffectHttpApiQueryError`, `EffectHttpApiQueryConfigErrorCode`, and
 `EffectHttpApiQueryKeyErrorCode` for narrowing and stable codes.
 
 `UnaryRpcOptions` describes request-local headers and Context for unary builders.
 `StreamingRpcOptions` also accepts the Effect client's stream buffer size.
 See [Generated Builders](/effect-api-query/reference/generated-builders/#request-local-rpc-options) for their behavior.
+
+## fetchStreamSnapshot
+
+`fetchStreamSnapshot(queryClient, options, controls?)` returns `Promise<TData>`, preserving native
+`select` and its result type. Supply a callable query function, usually through generated
+`streamedOptions` or `liveOptions`. Skipped queries and infinite-query options are excluded.
+
+| Control     | Default   | Meaning                                                                                         |
+| ----------- | --------- | ----------------------------------------------------------------------------------------------- |
+| `mode`      | `'fresh'` | Start an owned attempt; `'cached'` returns an existing successful value without acquiring work. |
+| `signal`    | Omitted   | Reject on request abort using `signal.reason`. An already aborted signal acquires no work.      |
+| `timeoutMs` | `10_000`  | Wait for publication or completion; a finite positive value at most `2_147_483_647`.            |
+
+Fresh capture requires an idle exact query without observers and starts despite cached freshness
+or future timestamps. `cached` preserves native selection, even when another owner is fetching
+or observing that successful entry. If no successful entry exists, it uses fresh capture.
+QueryClient owns hashing; helper options reject `queryHash` and `queryKeyHashFn`.
+
+| Outcome                                  | Result                                                                                  |
+| ---------------------------------------- | --------------------------------------------------------------------------------------- |
+| First new publication                    | Return selected data after cancelling and finalizing the exact query.                   |
+| Successful completion                    | Return the completed selected data.                                                     |
+| Empty accumulated stream                 | Return the native empty history, subject to its refetch policy.                         |
+| Empty live stream                        | Reject with the adapter's empty-stream error.                                           |
+| Terminal query failure                   | Reject with the original failure after native retry policy and local cleanup.           |
+| Timeout                                  | Reject with a `DOMException` named `TimeoutError` after cancellation and local cleanup. |
+| Request abort                            | Reject with the abort reason after cancellation and local cleanup.                      |
+| External cancellation before publication | Reject with Query Core's `CancelledError` after local cleanup.                          |
+
+All outcomes detach listeners and the timer. Local cleanup must cooperate with cancellation and
+finish before the Promise settles; the timeout does not bound finalizers or acknowledge remote
+server cleanup. Keep the exact key exclusively owned throughout capture, including manual writes.
+See [Stream Snapshots](/effect-api-query/guides/stream-snapshots/) for request disposal and independent
+browser reconnection.
+
+## Type inference
+
+Use [Type Inference](/effect-api-query/reference/type-inference/) for accepted inputs, supported
+query views, cached data before `select`, mutation results, and failure types.
+
+## Select a view prefix
+
+`viewPrefix(leaf, view)` returns an immutable ordinary key for every input and stream policy of a
+supported leaf view. Pass it to native query filters or `setQueryDefaults`. It carries no DataTag;
+broad cache reads remain `unknown`. Use a concrete generated key for typed exact cache access.
+See [Cache Filters](/effect-api-query/guides/cache-filters/) for encoded partial input.
+
+## Reuse typed policies
+
+`withQueryPolicy(leaf, view, defaults)` and `withMutationPolicy(leaf, defaults)` return the leaf's
+original options builder with shared policy fields applied first. Call-site fields replace matching
+defaults, including callbacks. `QueryPolicy<Leaf, View>` and `MutationPolicy<Leaf>` annotate reusable
+objects. Inputs, projections, initial data, pagination setup, and adapter controls remain local.
+Shared mutation callbacks have an unknown optimistic result; supply `onMutate` and callbacks that
+use its result at the call site. See [Defaults and Policies](/effect-api-query/guides/query-defaults/).
diff --git a/apps/docs/src/content/docs/reference/type-inference.md b/apps/docs/src/content/docs/reference/type-inference.md
new file mode 100644
index 0000000..7c1da5d
--- /dev/null
+++ b/apps/docs/src/content/docs/reference/type-inference.md
@@ -0,0 +1,97 @@
+---
+title: Type Inference
+description: Derive operation inputs, cached data, mutation results, and failures from generated leaves.
+---
+
+Import these types from `effect-api-query` and apply them to a generated leaf:
+
+| Type                          | Result                                                    |
+| ----------------------------- | --------------------------------------------------------- |
+| `InferInput<Leaf>`            | The accepted operation input                              |
+| `InferQueryData<Leaf, View>`  | Cached data for a supported query view, before `select`   |
+| `InferQueryError<Leaf, View>` | Execution and package failures carried by that query view |
+| `InferMutationData<Leaf>`     | The successful buffered mutation result                   |
+| `InferMutationError<Leaf>`    | The buffered mutation's execution error                   |
+
+These helpers follow the utility tree's contract and ready-client types. Keep those declaration
+names literal to preserve leaf paths and supported views.
+
+## Operation input
+
+With the utility tree from your client module:
+
+```ts
+const input: InferInput<typeof rpc.users.get> = { id: 1 }
+type UserData = InferQueryData<typeof rpc.users.get>
+type HistoryData = InferQueryData<typeof rpc.diagnostics.stream, 'streamed'>
+type UserError = InferQueryError<typeof rpc.users.get>
+```
+
+RPC input is **payload constructor input**, so fields supplied by constructor defaults may be
+omitted. HTTP input is the **decoded request** with its declared `params`, `query`, `headers`, and
+`payload` containers. Multipart HTTP requests use `FormData` in the payload container. Inputless
+leaves use `void`. `skipToken` disables an options-builder call; it does not change the leaf's
+operation input contract.
+
+## Query views and cached data
+
+Query data and error helpers default to `query`. A streaming leaf needs an explicit `live` or
+`streamed` view. Each leaf constrains `View` to its supported key and option builders:
+
+| Leaf                             | Query views                     |
+| -------------------------------- | ------------------------------- |
+| Unary RPC                        | `query`, `infinite`             |
+| Buffered nonmultipart HTTP       | `query`, `infinite`, `metadata` |
+| RPC stream or supported HTTP SSE | `streamed`, `live`              |
+| Buffered multipart HTTP          | Mutation-only                   |
+
+An unsupported explicit view fails typechecking. Omitting the view on a leaf with no ordinary
+query produces `never`; specify its supported view.
+
+Buffered and live query data normalize top-level successful `undefined` to `null`. Accumulated
+histories preserve each emitted value. Infinite data includes pages and page parameters; metadata
+contains decoded data, status, and headers. See
+[Data Normalization](/effect-api-query/concepts/data-normalization/) for ownership rules.
+
+`InferQueryData` describes cache contents. A native `select` changes the returned value:
+
+```ts
+const selectedOptions = rpc.users.get.queryOptions({
+  input: { id: 1 },
+  select: (value) => value.name,
+})
+const selectedName = await queryClient.query(selectedOptions)
+const cachedUser = queryClient.getQueryData(selectedOptions.queryKey)
+```
+
+Here `selectedName` is a string and `cachedUser` is the decoded user or `undefined`. The generated
+key retains the unselected cache type. Broad prefix/filter reads can contain different views;
+keep those results `unknown` until the application establishes their representation.
+
+Standalone infinite keys, and therefore `InferQueryData<Leaf, 'infinite'>`, use `unknown` for page
+parameters. An `infiniteOptions(...)` result retains the page parameter inferred from that call.
+
+## Mutation results
+
+Infer the write contract separately:
+
+```ts
+type CreateUserInput = InferInput<typeof rpc.users.create>
+type CreatedUser = InferMutationData<typeof rpc.users.create>
+type CreateUserError = InferMutationError<typeof rpc.users.create>
+```
+
+Mutation data preserves the successful decoded value, including `undefined`. Mutation callbacks
+infer variables, data, errors, and their local `onMutate` result through the options builder.
+Use [Defaults and Policies](/effect-api-query/guides/query-defaults/) to reuse typed callbacks while
+preserving that local inference.
+
+## Failures at runtime
+
+Inferred errors describe declared execution and package failures. Execution errors retain the full
+Effect `Cause`. A custom runner rejection or an error thrown by an application callback can pass
+through unchanged; the inferred union does not validate those unknown failures.
+
+Use the package's execution-error guards and refine domain failures before reading their fields.
+See [Handle Failures](/effect-api-query/guides/handle-failures/) and the
+[error reference](/effect-api-query/reference/errors/).
diff --git a/docs/adr/0001-target-effect-4-release-candidate.md b/docs/adr/0001-target-effect-4-release-candidate.md
index 06a6afc..98cef33 100644
--- a/docs/adr/0001-target-effect-4-release-candidate.md
+++ b/docs/adr/0001-target-effect-4-release-candidate.md
@@ -5,29 +5,22 @@ Status: Accepted. Extended by [ADR 0022](0022-add-buffered-http-utilities-with-s
 ## Context
 
 Supporting Effect 3 and Effect 4 together in the first release would require two incompatible
-RPC APIs. The repository initially targeted the Effect 4 release candidate and now targets stable
-Effect 4. Its RPC and HTTP API modules still declare unstable APIs.
+RPC APIs. The repository targets stable Effect 4, whose RPC and HTTP API modules still declare
+unstable APIs.
 
 ## Decision
 
 The first public release targets `effect/rpc` and `effect/http-api` from one exact Effect 4 release.
-Each release declares and tests one exact Effect peer. Internal adapters isolate upstream extraction
-and invocation. Keep the exact pin while the adapters depend on unstable upstream APIs.
-
-Effect diagnostics suppress `unstableApiUsage` in `src/http` and `src/rpc`, the transport tests,
-and the compile-time contract fixtures in `tests/types`. These areas deliberately use the exact
-peer's unstable modules. Directory and filename patterns cover new adapter and contract files;
-mixed-purpose examples retain explicit file exceptions. The warning remains enabled in `src/core`,
-scripts, and all other files. All other diagnostics remain enforced.
-
-The exception suppresses every unstable API warning in the matching files, including warnings
-from newly introduced APIs. Review those dependencies when adding an API or upgrading Effect,
-and run the type, runtime, and packed-consumer checks on each upgrade.
+Each release declares and tests one exact Effect peer. Keep the exact pin while the adapters
+depend on unstable upstream APIs.
+Internal adapters isolate upstream extraction and invocation.
 
 ## Consequences
 
+Review upstream dependencies when adding an API or upgrading Effect. Each coordinated Effect
+upgrade requires public-type, runtime, and native build checks.
+
 Before `1.0`, breaking public changes raise the minor version and compatible changes raise the
-patch. An Effect-only upgrade may raise the patch when the public API remains compatible. The
-project keeps a changelog from its first release. Before publishing `1.0`, it evaluates the stability
-of the upstream RPC and HTTP APIs. The Effect package's stable version alone does not establish
-the stability of those APIs.
+patch. An Effect-only upgrade may raise the patch when the public API remains compatible.
+Before publishing `1.0`, evaluate the stability of the upstream RPC and HTTP APIs.
+The Effect package's stable version alone does not establish the stability of those APIs.
diff --git a/docs/adr/0002-let-call-sites-choose-query-or-mutation.md b/docs/adr/0002-let-call-sites-choose-query-or-mutation.md
index aa139fb..9698eb9 100644
--- a/docs/adr/0002-let-call-sites-choose-query-or-mutation.md
+++ b/docs/adr/0002-let-call-sites-choose-query-or-mutation.md
@@ -14,6 +14,5 @@ semantics. Leaves expose no direct execution helper.
 
 ## Consequences
 
-An optional branded classification may be added later without restricting the base utility tree.
 ADR 0018 adds infinite queries to unary leaves. ADR 0020 supersedes this decision's omission of
 streaming leaves.
diff --git a/docs/adr/0004-build-core-shaped-options-and-certify-react-first.md b/docs/adr/0004-build-core-shaped-options-and-certify-react-first.md
index d56c5d5..11b826c 100644
--- a/docs/adr/0004-build-core-shaped-options-and-certify-react-first.md
+++ b/docs/adr/0004-build-core-shaped-options-and-certify-react-first.md
@@ -13,10 +13,17 @@ Generated options use static TanStack Query Core shapes. They pass unchanged to
 `QueryClient`-driven TanStack Router loaders, and TanStack Start. The package imports no framework
 adapter and certifies React Query and TanStack Start first.
 
-The library owns generated keys, functions, and each query's `queryKeyHashFn`. Callers may provide
-every other applicable Query Core option.
+The library owns generated keys and functions. QueryClient global and prefix defaults own hashing
+so generated fetches, stream publications, and native cache reads and writes share one entry.
+Builders reject per-call hashing overrides because native key-only cache access cannot honor them.
+Callers may provide every other applicable Query Core option.
+
+Package-level policy helpers bind typed native defaults to a leaf's existing options builder.
+They preserve its overloads and apply call-site overrides after defaults. Inputs, selection,
+initial data, pagination mappers, adapter controls, and generated identity remain local to each
+call. Mutation policies leave `onMutate` local; shared callbacks receive an unknown optimistic
+result and are replaced by corresponding call-site callbacks.
 
 ## Consequences
 
-Applications own providers, router context, and SSR integration. A future reactive contract may add
-a dedicated adapter entry point when core-shaped options are insufficient.
+Applications own providers, reactive option rebuilding, router context, and SSR integration.
diff --git a/docs/adr/0007-keep-the-core-factory-lifecycle-neutral.md b/docs/adr/0007-keep-the-core-factory-lifecycle-neutral.md
index cdd8974..b75c49d 100644
--- a/docs/adr/0007-keep-the-core-factory-lifecycle-neutral.md
+++ b/docs/adr/0007-keep-the-core-factory-lifecycle-neutral.md
@@ -17,3 +17,6 @@ an injected runner with the same `effect, { signal? }` shape.
 
 The caller owns protocol, middleware, lifetime, and resources. Queries forward TanStack's abort
 signal, mutations omit it, and runner rejections propagate untouched.
+
+[ADR 0026](0026-keep-rpc-transport-aggregation-in-the-application.md) preserves application ownership
+of transport aggregation.
diff --git a/docs/adr/0008-use-flat-prefix-matchable-key-tuples.md b/docs/adr/0008-use-flat-prefix-matchable-key-tuples.md
index ec22e90..197d12b 100644
--- a/docs/adr/0008-use-flat-prefix-matchable-key-tuples.md
+++ b/docs/adr/0008-use-flat-prefix-matchable-key-tuples.md
@@ -8,13 +8,15 @@ Applications need one key hierarchy for exact cache access and broad TanStack pr
 
 ## Decision
 
-Generated keys concatenate a required readonly, non-empty JSON prefix, the RPC path, an operation
-discriminator, and a canonical query payload when present. Concrete query keys use TanStack's
+Generated keys concatenate a required readonly, non-empty JSON prefix, the adapter namespace,
+the RPC path, an operation discriminator, and a canonical query payload when present. Concrete query keys use TanStack's
 `DataTag`; prefix and mutation keys remain ordinary readonly keys.
 
 ## Consequences
 
 Root, branch, RPC, and operation keys support TanStack's native array-prefix matching. Mutation
-variables remain outside `mutationKey` because they arrive after option construction. Callers
-compose TanStack filters themselves. ADR 0018 and ADR 0020 add operation discriminators without
+variables remain outside `mutationKey` because they arrive after option construction. The
+package-level `viewPrefix(leaf, view)` helper selects a supported query view for every input and
+stream policy of a leaf, preserving its literal prefix without a DataTag. Callers add native
+TanStack filter conditions and encoded partial input themselves. ADR 0018 and ADR 0020 add operation discriminators without
 changing the hierarchy.
diff --git a/docs/adr/0010-reuse-tanstack-query-core-as-a-peer.md b/docs/adr/0010-reuse-tanstack-query-core-as-a-peer.md
index dadd937..de1cb02 100644
--- a/docs/adr/0010-reuse-tanstack-query-core-as-a-peer.md
+++ b/docs/adr/0010-reuse-tanstack-query-core-as-a-peer.md
@@ -8,11 +8,10 @@ Generated objects and declarations expose TanStack Query Core runtime values and
 
 ## Decision
 
-`@tanstack/query-core` is an external peer. The package supports compatible v5 releases and tests
-its declared lower bound and development version. Because the package imports Query Core's
-experimental streamed-query interface, each development update must pass packed-consumer type and
-runtime checks. The package re-exports only primitives required by its own interface, including the
-exact `skipToken` and `SkipToken` bindings.
+`@tanstack/query-core` is an external peer. Its supported v5 range must preserve `null` stream
+data. The package uses Query Core's experimental streamed-query interface, so dependency updates
+require public-type and runtime validation. The package re-exports only primitives required by its
+own interface, including the exact `skipToken` and `SkipToken` bindings.
 
 ## Consequences
 
diff --git a/docs/adr/0012-normalize-undefined-query-success-to-null.md b/docs/adr/0012-normalize-undefined-query-success-to-null.md
index 9ffaa24..b9d3788 100644
--- a/docs/adr/0012-normalize-undefined-query-success-to-null.md
+++ b/docs/adr/0012-normalize-undefined-query-success-to-null.md
@@ -9,10 +9,11 @@ runtime `undefined` for success.
 
 ## Decision
 
-Generated query functions map successful `undefined` to cacheable `null`. Their query-data type also
-replaces `undefined` with `null`. Mutations preserve `undefined`.
+Buffered and live queries map successful `undefined` to cacheable `null` in both values and types.
+Accumulated stream elements and mutation results preserve `undefined`, because neither needs this
+normalization to produce valid query data.
 
 ## Consequences
 
-Every unary RPC remains usable as a query without disguising an upstream failure. This is the
-adapter's only success-value normalization.
+Every unary RPC and live emission remains usable as query data without disguising a failure or an
+empty stream. This is the adapter's only success-value normalization.
diff --git a/docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md b/docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md
index 6a0a011..8ad37d5 100644
--- a/docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md
+++ b/docs/adr/0013-use-a-vite-plus-workspace-with-a-root-package.md
@@ -10,10 +10,10 @@ initial release path.
 ## Decision
 
 Use a Vite+ pnpm workspace with the publishable `effect-api-query` package permanently at the root.
-Keep examples private. Future public packages may live under `packages/`.
+Keep examples private.
 
 ## Consequences
 
-The workspace accepts Vite+'s beta status. Private examples share RPC contracts and hosting code.
+Private examples share RPC contracts and hosting code.
 ADR 0019 supersedes this decision's original requirement that both browser examples use the
 standalone server.
diff --git a/docs/adr/0015-centralize-the-toolchain-in-vite-plus.md b/docs/adr/0015-centralize-the-toolchain-in-vite-plus.md
index abbb4fc..b2292e0 100644
--- a/docs/adr/0015-centralize-the-toolchain-in-vite-plus.md
+++ b/docs/adr/0015-centralize-the-toolchain-in-vite-plus.md
@@ -11,11 +11,10 @@ drift apart.
 
 Centralize those tasks in Vite+'s `vite.config.ts` and integrated tools. Keep separate tools only for
 capabilities Vite+ does not own, such as Astro diagnostics, Effect-aware test helpers, full-process
-browser tests, packed-package checks, and release management.
+browser tests, public compiler fixtures, and release management.
 
 ## Consequences
 
-Library development uses TypeScript 7 with matching Effect diagnostics. Packed declarations are
-also checked with TypeScript 5.9. The private documentation package may use a compatible compiler
-when Astro does not support the repository compiler API. Strict package and dependency checks remain
-release gates; dependency-update automation remains deferred.
+Library development uses TypeScript 7 with matching Effect diagnostics. Public declarations are
+also checked with TypeScript 5.9. The documentation package may use a compiler supported by Astro.
+Native package validation remains part of the build; dependency-update automation remains deferred.
diff --git a/docs/adr/0016-automate-releases-with-changesets.md b/docs/adr/0016-automate-releases-with-changesets.md
index 2747a67..816c8c7 100644
--- a/docs/adr/0016-automate-releases-with-changesets.md
+++ b/docs/adr/0016-automate-releases-with-changesets.md
@@ -14,7 +14,9 @@ commit links. Private examples remain outside versioning, and releases run only
 
 ## Consequences
 
-Changes to published behavior, types, exports, dependency ranges, or installation metadata require
-a non-empty changeset. Documentation, examples, tests, internal tooling, and CI require none. Empty
-changesets do not serve as process markers. Any bootstrap token is removed after trusted publishing
-is configured.
+Before initial publication, changes accumulate without Changesets. Prepare a single initial release
+candidate when publication is authorized.
+
+After initial publication, changes to published behavior, types, exports, dependency ranges, or
+installation metadata require a non-empty changeset. Documentation, examples, tests, internal
+tooling, and CI require none. Any bootstrap token is removed after trusted publishing is configured.
diff --git a/docs/adr/0017-quarantine-new-dependency-releases-for-seven-days.md b/docs/adr/0017-quarantine-new-dependency-releases-for-seven-days.md
index d171663..19d2215 100644
--- a/docs/adr/0017-quarantine-new-dependency-releases-for-seven-days.md
+++ b/docs/adr/0017-quarantine-new-dependency-releases-for-seven-days.md
@@ -9,10 +9,12 @@ Immediate dependency upgrades provide too little time to observe supply-chain in
 ## Decision
 
 pnpm enforces a strict seven-day minimum release age, frozen lockfiles in CI, and explicit
-lifecycle-script permissions.
+lifecycle-script permissions. Missing registry publication times fail closed. The same native
+workspace settings apply to isolated consumers; frozen and cached installs remain subject to
+registry publication metadata.
 
 ## Consequences
 
-A fresh Effect release candidate or another intentionally evaluated tool may receive one reviewed,
-exact-version exception after its release, provenance, scripts, and lockfile changes are checked.
-Package-wide exemptions remain forbidden. Each exception expires with the quarantine.
+Every registry version becomes eligible seven days after publication. Release-age exceptions,
+exclusions, configuration overrides, alternate installers, and missing-time bypasses are forbidden.
+Already-installed dependencies may be reused read-only while an ineligible version remains blocked.
diff --git a/docs/adr/0020-generate-accumulated-and-live-stream-queries.md b/docs/adr/0020-generate-accumulated-and-live-stream-queries.md
index 4c44484..cb06ea3 100644
--- a/docs/adr/0020-generate-accumulated-and-live-stream-queries.md
+++ b/docs/adr/0020-generate-accumulated-and-live-stream-queries.md
@@ -1,16 +1,21 @@
 # Generate accumulated and live stream queries
 
-Status: Accepted. Partially supersedes ADR 0002 and ADR 0003.
+Status: Accepted. Partially supersedes ADR 0002 and ADR 0003. Extended to HTTP SSE views by
+[ADR 0024](0024-project-http-streams-and-buffered-metadata.md).
 
-Streaming RPC leaves expose `streamedKey`/`streamedOptions` for ordered history with `reset`,
-`append`, and `replace` refetch modes, and `liveKey`/`liveOptions` for the latest value. A live stream
-that completes without emitting a value raises `EffectRpcQueryEmptyStreamError`. Separate `streamed`
-and `live` key segments prevent collisions with other query shapes and mutations; generated prefixes
-support invalidation.
+Streams support two cached representations: ordered accumulated history and the latest live value.
+Keep these representations separate, and include retention and refetch policies in accumulated
+cache identity, because incompatible histories cannot safely share an entry. Broad key prefixes
+still support invalidation across views and policies.
 
-The ready RPC client remains the execution seam, including direct execution outside TanStack.
-Client construction and Effect middleware remain interception seams. Stream functions forward
-TanStack's abort signal, close the AsyncIterator on cancellation, and preserve the complete Cause.
-The application owns client/runtime resources, transport, middleware, Scope, QueryClient, and
-framework lifecycle. SSR dehydrates completed data normally; open streams require cancellation
-after the first successful snapshot. Mutations have no cancellation signal.
+The adapter consumes caller-owned ready clients and follows TanStack cancellation while preserving
+complete Effect failures. Applications own transport, reconnection, and resource lifetime; server
+rendering must settle and stop open work before disposing those resources. Live values follow
+[ADR 0012](0012-normalize-undefined-query-success-to-null.md), while accumulated elements retain
+their decoded representation.
+
+Expose a framework-neutral snapshot helper because native query cancellation can settle before
+local iterator finalizers finish. A fresh capture exclusively owns an idle, unobserved exact query;
+explicit cached capture can reuse successful data without acquiring work. Applications retain
+client and runtime ownership and dispose them only after local cleanup settles. Browser
+reconnection uses independently owned resources.
diff --git a/docs/adr/0021-share-utility-construction-through-private-modules.md b/docs/adr/0021-share-utility-construction-through-private-modules.md
index 9e064db..ea37168 100644
--- a/docs/adr/0021-share-utility-construction-through-private-modules.md
+++ b/docs/adr/0021-share-utility-construction-through-private-modules.md
@@ -2,13 +2,10 @@
 
 Status: Accepted. Clarifies ADR 0003, ADR 0005 through ADR 0007, and ADR 0009. Extended by [ADR 0022](0022-add-buffered-http-utilities-with-separate-key-roots.md) and [ADR 0023](0023-expose-buffered-multipart-http-mutations.md).
 
-One root package and artifact expose the public factories; core and adapters remain private.
-The utility-tree module owns atomic validation, canonical keys, options, skipping, and unary
-execution through operation descriptions. Shared Query Core types contain no protocol declarations.
+Share validation, canonical keys, options, and execution through private core modules. Adapters
+own their protocol declarations, request preparation, ready-client invocation, and errors. Shared
+Query Core contracts remain independent of protocol declarations.
 
-Adapters own projection, Schema inspection, request preparation, ready-client invocation, request
-options, mapped types, and errors. Preparation binds input to its key; later RPC pages only
-construct payloads because they reuse the initial key. Streams retain their policy and cleanup.
-This keeps cache behavior in shared modules and protocol-specific behavior in adapters without
-changing public behavior. Tests exercise the public factories; public adapter registration and
-subpath exports stay excluded.
+This boundary gives common cache behavior one implementation while preserving each adapter's
+input and execution semantics. Consumers use public factories from one root package; internal
+modules and adapter registration remain private.
diff --git a/docs/adr/0022-add-buffered-http-utilities-with-separate-key-roots.md b/docs/adr/0022-add-buffered-http-utilities-with-separate-key-roots.md
index d2de168..2048370 100644
--- a/docs/adr/0022-add-buffered-http-utilities-with-separate-key-roots.md
+++ b/docs/adr/0022-add-buffered-http-utilities-with-separate-key-roots.md
@@ -1,28 +1,12 @@
 # Add buffered HTTP utilities with separate key roots
 
-Status: Accepted. Amends ADR 0001, ADR 0003, ADR 0005 through ADR 0008, ADR 0013, and ADR 0021. Multipart omission amended by [ADR 0023](0023-expose-buffered-multipart-http-mutations.md).
+Status: Accepted. Multipart support amended by [ADR 0023](0023-expose-buffered-multipart-http-mutations.md).
+Streaming and metadata views extended by [ADR 0024](0024-project-http-streams-and-buffered-metadata.md).
 
-Publish one `effect-api-query` package at the workspace root. Export `createHttpApiQueryUtils` beside
-`createRpcQueryUtils` through one package root. Private adapters share utility construction but retain
-their distinct request and projection contracts.
-Use `src/core`, `src/http`, and `src/rpc` with direct imports and explicit root exports.
+Expose HTTP and RPC utilities through one package, sharing private construction while preserving
+their distinct declaration and request contracts. HTTP utilities consume caller-owned ready clients
+and project only response shapes they can represent truthfully.
 
-HTTP mirrors literal group/endpoint names, including dots and top-level projection. Omit an entire
-endpoint if any success alternative streams (including header-wrapped streams); omit empty groups.
-The original decision also omitted any multipart payload alternative. ADR 0023 permits buffered
-multipart mutation builders while preserving omission for streaming multipart payloads. This prevents
-falsely buffered result types. Unsafe paths, collisions, and contradictory multipart metadata fail atomically.
-
-Accept decoded request parts and force decoded-only responses. Preserve query normalization and
-mutation data. Applications own ready-client resources and supply runners for encoding, decoding,
-and residual client services; key encoders supply only cache identity. HTTP-specific errors retain
-declaration metadata and untouched failed-Exit Causes, which may contain upstream request, response,
-or Schema issue values. Runner rejections pass through.
-
-Keys append `rpc` plus tag segments, or `http` plus API identifier and projected path, after the
-caller prefix. Operation and canonical query input follow. Factory `key()` includes this generated
-root, preventing cross-adapter collisions while retaining prefix invalidation. Applications own
-safe client-identity partitions and deliberate cross-adapter invalidation through the caller prefix.
-
-See the [HTTP technical reference](../research/http-technical-spine.md) for upstream assumptions and
-executable evidence.
+HTTP cache roots include the adapter and API identity, so HTTP endpoints and RPC tags cannot collide
+under a shared caller prefix. Applications still own identity partitions and deliberate invalidation
+across adapters. Decoded header wrappers and complete Effect failures remain intact at the boundary.
diff --git a/docs/adr/0023-expose-buffered-multipart-http-mutations.md b/docs/adr/0023-expose-buffered-multipart-http-mutations.md
index d56a09f..eed0991 100644
--- a/docs/adr/0023-expose-buffered-multipart-http-mutations.md
+++ b/docs/adr/0023-expose-buffered-multipart-http-mutations.md
@@ -1,6 +1,6 @@
 # Expose buffered multipart HTTP mutations
 
-Status: Accepted. Amends [ADR 0022](0022-add-buffered-http-utilities-with-separate-key-roots.md) and extends [ADR 0021](0021-share-utility-construction-through-private-modules.md).
+Status: Accepted. Amends [ADR 0022](0022-add-buffered-http-utilities-with-separate-key-roots.md) and extends [ADR 0021](0021-share-utility-construction-through-private-modules.md). Extended HTTP views in [ADR 0024](0024-project-http-streams-and-buffered-metadata.md) retain this multipart capability limit.
 
 Buffered multipart uploads need mutation execution without query cache identity for files or
 `FormData`. Expose only `key()`, `mutationKey()`, and `mutationOptions()` when an endpoint has any
diff --git a/docs/adr/0024-project-http-streams-and-buffered-metadata.md b/docs/adr/0024-project-http-streams-and-buffered-metadata.md
new file mode 100644
index 0000000..58f6f4a
--- /dev/null
+++ b/docs/adr/0024-project-http-streams-and-buffered-metadata.md
@@ -0,0 +1,14 @@
+# Project HTTP streams and buffered metadata into separate cached views
+
+Status: Accepted. Amends [ADR 0020](0020-generate-accumulated-and-live-stream-queries.md)
+and [ADR 0022](0022-add-buffered-http-utilities-with-separate-key-roots.md).
+
+Query caches hold decoded application values, while HTTP responses and streams retain transport
+resources. Generate accumulated and live views for unambiguous SSE successes, and an opt-in
+buffered metadata view containing decoded data, status, and a plain header snapshot. Give each
+representation separate cache identity so incompatible data shapes cannot share an entry.
+
+Preserve declared decoded header wrappers. Omit mixed buffered/streamed successes and raw byte
+streams: the former lack one truthful view, and the latter have transport-dependent chunk
+boundaries. Applications own download sinks, reconnection, resume policy, and client lifetime;
+the adapter consumes their ready clients without caching transport resources.
diff --git a/docs/adr/0025-use-public-decoded-message-clients-for-server-local-rpc.md b/docs/adr/0025-use-public-decoded-message-clients-for-server-local-rpc.md
new file mode 100644
index 0000000..458daeb
--- /dev/null
+++ b/docs/adr/0025-use-public-decoded-message-clients-for-server-local-rpc.md
@@ -0,0 +1,14 @@
+# Use public decoded-message clients for server-local RPC
+
+Status: Accepted. Extends [ADR 0007](0007-keep-the-core-factory-lifecycle-neutral.md)
+and [ADR 0019](0019-host-effect-rpc-inside-tanstack-start.md).
+
+Server rendering can execute local handlers without a network round trip. Applications may
+connect Effect's public decoded-message client and server within a request-owned Scope and pass
+the ready client to the adapter. This preserves the lifecycle-neutral boundary without adding a
+package-owned client factory or relying on test constructors.
+
+Server-owned services determine request authority; caller execution services cannot override it.
+Each request owns its connection and QueryClient, and browser execution owns separate resources.
+Decoded-message execution skips transport Schema codecs, so applications requiring wire validation
+or codec effects retain a schema-aware protocol. The exact Effect peer bounds this upstream API.
diff --git a/docs/adr/0026-keep-rpc-transport-aggregation-in-the-application.md b/docs/adr/0026-keep-rpc-transport-aggregation-in-the-application.md
new file mode 100644
index 0000000..43a9f80
--- /dev/null
+++ b/docs/adr/0026-keep-rpc-transport-aggregation-in-the-application.md
@@ -0,0 +1,11 @@
+# Keep RPC transport aggregation in the application
+
+Status: Accepted. Extends [ADR 0007](0007-keep-the-core-factory-lifecycle-neutral.md).
+
+Repeated RPC calls can incur substantial transport overhead. Keep transport selection and
+aggregation in the application because they determine connection lifetime, latency, routing,
+retries, and cancellation. Shared WebSocket transport reduces repeated headers while preserving
+independent calls; explicit bulk RPCs remain a domain choice.
+
+The utility tree adds no automatic transport batching. Backend request batching, transport
+aggregation, and Query publication address different costs and retain separate ownership.
diff --git a/e2e-docs/docs.spec.ts b/e2e-docs/docs.spec.ts
index 3d02297..d12e6ed 100644
--- a/e2e-docs/docs.spec.ts
+++ b/e2e-docs/docs.spec.ts
@@ -7,7 +7,7 @@ const registryUrl = 'https://registry.npmjs.org/effect-api-query/latest'
 const packageUrl = 'https://www.npmjs.com/package/effect-api-query'
 const repositoryUrl = 'https://github.com/ueberBrot/effect-api-query'
 
-test('opens both tutorials and searches the production index under the public base', async ({
+test('opens tutorials and feature guides and searches the production index', async ({
   page,
   baseURL,
 }) => {
@@ -42,24 +42,39 @@ test('opens both tutorials and searches the production index under the public ba
 
   await page.goto(docsBase, { waitUntil: 'networkidle' })
   await expect(page.getByRole('heading', { level: 1 })).toHaveText('effect-api-query')
-  await page.getByRole('link', { name: 'RPC quick start', exact: true }).click()
+  await page.getByRole('main').getByRole('link', { name: 'RPC', exact: true }).first().click()
   await expect(page).toHaveURL(`${docsBase}getting-started/quick-start/`)
   await expect(page.getByRole('heading', { level: 1 })).toHaveText('RPC Quick Start')
   await page.waitForLoadState('networkidle')
 
-  await page
-    .getByRole('navigation', { name: 'Main', exact: true })
-    .getByRole('link', {
-      name: 'HTTP Factory',
-      exact: true,
-    })
-    .click()
-  await expect(page).toHaveURL(`${docsBase}reference/http-factory/`)
-  await expect(page.getByRole('heading', { level: 1 })).toHaveText('HTTP Factory')
-  await page.waitForLoadState('networkidle')
+  /* oxlint-disable eslint/no-await-in-loop */
+  for (const [title, slug] of [
+    ['Queries', 'guides/queries'],
+    ['Pagination', 'guides/pagination'],
+    ['HTTP Metadata', 'guides/http-metadata'],
+    ['HTTP Builders', 'reference/http-builders'],
+    ['Defaults and Policies', 'guides/query-defaults'],
+    ['Type Inference', 'reference/type-inference'],
+    ['React Query', 'guides/react-query'],
+    ['HTTP Factory', 'reference/http-factory'],
+  ] as const) {
+    const link = page
+      .getByRole('navigation', { name: 'Main', exact: true })
+      .locator(`a[href="${docsBase}${slug}/"]`)
+    for (const section of await link.locator('xpath=ancestor::details').all()) {
+      if ((await section.getAttribute('open')) === null) {
+        await section.locator(':scope > summary').click()
+      }
+    }
+    await link.click()
+    await expect(page).toHaveURL(`${docsBase}${slug}/`)
+    await expect(page.getByRole('heading', { level: 1 })).toHaveText(title)
+    await page.waitForLoadState('networkidle')
+  }
+  /* oxlint-enable eslint/no-await-in-loop */
 
   await page.goto(docsBase, { waitUntil: 'networkidle' })
-  await page.getByRole('link', { name: 'HTTP quick start', exact: true }).click()
+  await page.getByRole('main').getByRole('link', { name: 'HTTP API', exact: true }).first().click()
   await expect(page).toHaveURL(`${docsBase}getting-started/http-quick-start/`)
   await expect(page.getByRole('heading', { level: 1 })).toHaveText('HTTP Quick Start')
   await page.waitForLoadState('networkidle')
@@ -90,15 +105,10 @@ test('uses canonical repository links and serves branded icons', async ({ page,
     'href',
     `${repositoryUrl}/edit/main/apps/docs/src/content/docs/getting-started/quick-start.md`,
   )
-  await expect(
-    page.getByRole('link', { name: 'tests/types/docs-rpc-quick-start.ts', exact: true }),
-  ).toHaveAttribute('href', `${repositoryUrl}/blob/main/tests/types/docs-rpc-quick-start.ts`)
-
   const iconUrls = [
     await page.locator('link[rel="shortcut icon"]').getAttribute('href'),
     await page.locator('.site-title img').getAttribute('src'),
   ]
-  // Keep each icon's request and assertions together to identify the failing URL.
   /* oxlint-disable eslint/no-await-in-loop */
   for (const url of iconUrls) {
     expect(url).toMatch(/^\/effect-api-query\//u)
@@ -120,7 +130,6 @@ test('shows the latest published version from the package registry', async ({ pa
   await page.goto(docsBase)
   const links = page.locator(`a[href="${packageUrl}"]`)
   await expect(links.first()).toHaveText('v1.2.3-beta.1')
-  // Check each DOM locator sequentially while this test owns the page.
   /* oxlint-disable eslint/no-await-in-loop */
   for (const link of await links.all()) {
     await expect(link).toHaveText('v1.2.3-beta.1')
@@ -145,7 +154,6 @@ for (const failure of ['unpublished package', 'network failure', 'invalid versio
     await request
     const links = page.locator(`a[href="${packageUrl}"]`)
     await expect(links.first()).toHaveText(`v${packageManifest.version}`)
-    // Check each DOM locator sequentially while this test owns the page.
     /* oxlint-disable eslint/no-await-in-loop */
     for (const link of await links.all()) {
       await expect(link).toHaveText(`v${packageManifest.version}`)
@@ -160,7 +168,6 @@ test('serves generated LLM documentation with the public URLs', async ({ request
   expect(index.ok()).toBe(true)
   const indexText = await index.text()
   expect(indexText).toContain('# effect-api-query')
-  // Fetch and inspect one generated document at a time to attribute broken links.
   /* oxlint-disable eslint/no-await-in-loop */
   for (const filename of ['llms-small.txt', 'llms-full.txt']) {
     expect(indexText).toContain(`https://ueberbrot.github.io${docsBase}${filename}`)
diff --git a/e2e/browser-test-config.ts b/e2e/browser-test-config.ts
index 881e701..d5facdb 100644
--- a/e2e/browser-test-config.ts
+++ b/e2e/browser-test-config.ts
@@ -1,17 +1,26 @@
 import { defineConfig, devices } from '@playwright/test'
 import type { PlaywrightTestConfig } from '@playwright/test'
+import { Config, ConfigProvider, Effect, Option } from 'effect'
+
+const ci = Option.getOrUndefined(
+  Effect.runSync(
+    Config.String('CI')
+      .pipe(Config.option)
+      .parse(ConfigProvider.fromEnv({ preserveEmptyStrings: true })),
+  ),
+)
 
 export const browserTestDefaults = defineConfig({
   expect: { timeout: 10_000 },
-  forbidOnly: Boolean(process.env['CI']),
+  forbidOnly: Boolean(ci),
   fullyParallel: false,
   projects: [
     { name: 'chromium', use: { ...devices['Desktop Chrome'] } },
     { name: 'firefox', use: { ...devices['Desktop Firefox'] } },
     { name: 'webkit', use: { ...devices['Desktop Safari'] } },
   ],
-  reporter: process.env['CI'] === undefined ? 'line' : [['github'], ['line']],
-  retries: process.env['CI'] === undefined ? 0 : 1,
+  reporter: ci === undefined ? 'line' : [['github'], ['line']],
+  retries: ci === undefined ? 0 : 1,
   timeout: 30_000,
   use: {
     screenshot: 'only-on-failure',
diff --git a/e2e/conditional-query.spec.ts b/e2e/conditional-query.spec.ts
index 393ee48..55cd8bf 100644
--- a/e2e/conditional-query.spec.ts
+++ b/e2e/conditional-query.spec.ts
@@ -24,7 +24,6 @@ for (const [name, application] of [
     const lookup = page.getByRole('region', { name: 'Conditional user lookup' })
     const select = lookup.getByLabel('User to inspect')
     await expect(lookup.getByText('Choose a user to start the query.')).toBeVisible()
-    // A completed unrelated interaction gives a mistakenly active lookup time to reach the server.
     await page.getByRole('button', { name: 'Read cached directory' }).click()
     await expect(page.getByText('Cached directory: 12 users')).toBeVisible()
     expect(lookupRequests).toBe(0)
diff --git a/e2e/example-application.ts b/e2e/example-application.ts
index 3c0f8e9..5edd9e0 100644
--- a/e2e/example-application.ts
+++ b/e2e/example-application.ts
@@ -16,7 +16,6 @@ export const viteReactApplication = {
   url: 'http://127.0.0.1:4173',
 } satisfies ExampleApplication
 
-/** Establishes deterministic server state through the same controls a user exercises. */
 export const prepareExampleApplication = async (
   page: Page,
   application: ExampleApplication,
diff --git a/e2e/tanstack-start.spec.ts b/e2e/tanstack-start.spec.ts
index 3eb459a..1a6967b 100644
--- a/e2e/tanstack-start.spec.ts
+++ b/e2e/tanstack-start.spec.ts
@@ -9,7 +9,6 @@ import {
 } from './example-application.ts'
 
 test('Start rejects an oversized upload before the sender ends the request', async () => {
-  // Bridge Node's streaming request callbacks; fetch would buffer/end the upload.
   // oxlint-disable-next-line promise/avoid-new
   const status = await new Promise<number | undefined>((resolve, reject) => {
     const request = nodeRequest(
@@ -38,7 +37,6 @@ test('SSR keeps its RPC destination independent of incoming host headers', async
     redirectedRequests += 1
     response.writeHead(500).end()
   })
-  // Bridge the listener callback so the assertion uses its assigned TCP port.
   // oxlint-disable-next-line promise/avoid-new
   await new Promise<void>((resolve) => {
     destination.listen(0, '127.0.0.1', resolve)
@@ -56,7 +54,6 @@ test('SSR keeps its RPC destination independent of incoming host headers', async
     expect(await response.text()).toContain('Ada Lovelace')
   } finally {
     destination.closeAllConnections()
-    // Wait for Node's close callback before the next test starts another listener.
     // oxlint-disable-next-line promise/avoid-new
     await new Promise<void>((resolve, reject) => {
       destination.close((error) => {
@@ -164,7 +161,7 @@ test.describe('TanStack Start application', () => {
     await expect(page.getByText('8 of 12 loaded')).toBeVisible()
   })
 
-  test('mutates and invalidates the hydrated users query', async ({ page }) => {
+  test('mutates, invalidates and server-renders the shared directory', async ({ page }) => {
     const listResponse = page.waitForResponse(
       (response) => response.ok() && recordsRpc(response.request().postData(), 'users.list'),
     )
@@ -173,6 +170,9 @@ test.describe('TanStack Start application', () => {
 
     await expect(page.getByText('Grace Hopper', { exact: true })).toBeVisible()
     await expect(page.getByText('13 users in one response')).toBeVisible()
+    await page.reload()
+    await expect(page.getByText('Grace Hopper', { exact: true })).toBeVisible()
+    await expect(page.getByText('13 users in one response')).toBeVisible()
   })
 
   test('shows declared failures and externally visible cancellation', async ({ page }) => {
diff --git a/e2e/vite-react.spec.ts b/e2e/vite-react.spec.ts
index 854de30..af31cd3 100644
--- a/e2e/vite-react.spec.ts
+++ b/e2e/vite-react.spec.ts
@@ -29,6 +29,40 @@ test.describe('plain Vite React application', () => {
     await expect(page.getByText('Ada Lovelace', { exact: true })).toBeVisible()
   })
 
+  test('reports failed pagehide persistence without an unhandled cleanup rejection', async ({
+    page,
+  }) => {
+    const pageErrors: Error[] = []
+    const cleanupReports: string[] = []
+    page.on('pageerror', (error) => {
+      pageErrors.push(error)
+    })
+    page.on('console', (message) => {
+      if (message.type() === 'error' && message.text().startsWith('Vite resource cleanup failed')) {
+        cleanupReports.push(message.text())
+      }
+    })
+    await page.evaluate(() => {
+      const setItem = Object.getOwnPropertyDescriptor(Storage.prototype, 'setItem')
+      if (setItem === undefined) {
+        throw new Error('Storage.setItem is missing')
+      }
+      try {
+        Storage.prototype.setItem = () => {
+          throw new Error('Session storage write failed')
+        }
+        globalThis.dispatchEvent(new Event('pagehide'))
+        globalThis.dispatchEvent(new Event('pagehide'))
+      } finally {
+        Object.defineProperty(Storage.prototype, 'setItem', setItem)
+      }
+    })
+    await expect.poll(() => cleanupReports.length + pageErrors.length).toBe(1)
+    expect(pageErrors).toStrictEqual([])
+    expect(cleanupReports).toHaveLength(1)
+    await expect(page.locator('#root')).toBeEmpty()
+  })
+
   test('loads and accumulates infinite-query pages', async ({ page }) => {
     await expect(page.getByText('4 of 12 loaded', { exact: true })).toBeVisible()
     await expect(page.getByText('Page 1: 4 users', { exact: true })).toBeVisible()
diff --git a/examples/contracts/src/client.ts b/examples/contracts/src/client.ts
index bdc9d09..66959bf 100644
--- a/examples/contracts/src/client.ts
+++ b/examples/contracts/src/client.ts
@@ -20,7 +20,6 @@ export interface StartedExampleRpcClient {
   ) => Promise<Exit.Exit<A, E>>
 }
 
-/** Acquires a caller-owned, scoped flat client for the example HTTP server. */
 export const makeExampleRpcClient = Effect.fn('ExampleRpc.makeExampleRpcClient')(function* (
   rpcUrl: string,
 ) {
@@ -45,8 +44,6 @@ export const makeExampleRpcClient = Effect.fn('ExampleRpc.makeExampleRpcClient')
       return forwardClient(tag, payload, options)
     }
 
-    // SAFETY: ExampleRpcClient pairs this checked tag with SlowDiagnosticInput;
-    // Parameters erases that generic relationship inside the forwarding wrapper.
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     const slowPayload = payload as SlowDiagnosticInput
     const suppliedOperationId = slowPayload.operationId
@@ -57,7 +54,6 @@ export const makeExampleRpcClient = Effect.fn('ExampleRpc.makeExampleRpcClient')
       nextSlowOperation += 1
     }
 
-    // The buffered HTTP protocol cannot carry a caller's interruption after sending a request.
     return client('diagnostics.slow', { ...slowPayload, operationId }, options).pipe(
       Effect.onInterrupt(() =>
         client('diagnostics.cancel', { operationId }).pipe(
@@ -67,13 +63,10 @@ export const makeExampleRpcClient = Effect.fn('ExampleRpc.makeExampleRpcClient')
     )
   }
 
-  // SAFETY: Every tag forwards its original payload/options and result unchanged;
-  // the slow tag only adds cancellation while preserving the SDK's generic call signature.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   return cancellationAwareClient as ExampleRpcClient
 })
 
-/** Starts the ready RPC client resource shared by each executable application. */
 export const startExampleRpcClient = async (rpcUrl: string): Promise<StartedExampleRpcClient> => {
   const clientScope = await Effect.runPromise(Scope.make())
   const runtime = ManagedRuntime.make(Layer.empty)
diff --git a/examples/contracts/src/contracts.ts b/examples/contracts/src/contracts.ts
index 7a70712..6bc651b 100644
--- a/examples/contracts/src/contracts.ts
+++ b/examples/contracts/src/contracts.ts
@@ -1,4 +1,3 @@
-// Related Schema classes define one RPC contract family.
 // oxlint-disable eslint/max-classes-per-file
 import { Effect, Schema } from 'effect'
 import { Rpc, RpcGroup, RpcMiddleware } from 'effect/rpc'
@@ -23,7 +22,6 @@ export class UserPage extends Schema.Class<UserPage>('UserPage')({
   users: Schema.Array(User),
 }) {}
 
-// Effect Schema.TaggedError is a curried class factory; only instances use new.
 // oxlint-disable-next-line unicorn/throw-new-error
 export class DiagnosticFailure extends Schema.TaggedError<DiagnosticFailure>()(
   'DiagnosticFailure',
@@ -31,14 +29,12 @@ export class DiagnosticFailure extends Schema.TaggedError<DiagnosticFailure>()(
     reason: Schema.Literal('requested-failure'),
   },
 ) {
-  // Effect Cause.pretty reads Error.message through the base error interface.
   // fallow-ignore-next-line unused-class-member
   override get message(): string {
     return this.reason
   }
 }
 
-// Effect Schema.TaggedError is a curried class factory; only instances use new.
 // oxlint-disable-next-line unicorn/throw-new-error
 export class ExampleAuthorizationError extends Schema.TaggedError<ExampleAuthorizationError>()(
   'ExampleAuthorizationError',
@@ -99,8 +95,8 @@ const UsersList = Rpc.make('users.list', {
 
 const UsersPage = Rpc.make('users.page', {
   payload: {
-    cursor: Schema.Int,
-    pageSize: Schema.Int,
+    cursor: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+    pageSize: Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 100 })),
   },
   success: UserPage,
 })
@@ -146,7 +142,6 @@ const DiagnosticsCancel = Rpc.make('diagnostics.cancel', {
   success: Schema.Void,
 })
 
-// The Schema value and its decoded type deliberately share the domain name.
 // oxlint-disable-next-line eslint/no-redeclare
 export const DiagnosticStatus = Schema.Struct({
   interrupted: Schema.Int,
diff --git a/examples/server/package.json b/examples/server/package.json
index d0ff8af..1db5773 100644
--- a/examples/server/package.json
+++ b/examples/server/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@effect-api-query/contracts": "workspace:*",
-    "@effect/platform-node": "4.0.0",
+    "@effect/platform-node": "catalog:",
     "effect": "catalog:"
   },
   "devDependencies": {
diff --git a/examples/server/src/commands.ts b/examples/server/src/commands.ts
index af01c16..e26dd4e 100644
--- a/examples/server/src/commands.ts
+++ b/examples/server/src/commands.ts
@@ -48,7 +48,6 @@ export const makeCommands = Effect.fn('ExampleRpc.makeCommands')(function* () {
     (effect, command) => effect.pipe(Effect.onInterrupt(() => finish(command, 'cancelled'))),
   )
 
-  // Reserve the ID and attach its worker atomically with respect to interruption.
   const getOrCreate = Effect.fn('ExampleRpc.Commands.getOrCreate')(function* (
     operationId: string,
     steps: number,
@@ -64,13 +63,11 @@ export const makeCommands = Effect.fn('ExampleRpc.makeCommands')(function* () {
         completedSteps: 0,
         totalSteps: steps,
       }),
-      // Void represents a cancellation signal without payload.
       // oxlint-disable-next-line typescript/no-invalid-void-type
       cancellation: Deferred.makeUnsafe<void>(),
       done: Deferred.makeUnsafe<CommandStatus>(),
     }
     commands.set(operationId, command)
-    // A cancel request may arrive before its start request.
     yield* steps === 0
       ? Deferred.succeed(command.done, command.status)
       : Effect.forkIn(work(command), scope, { uninterruptible: false })
diff --git a/examples/server/src/diagnostic-operations.ts b/examples/server/src/diagnostic-operations.ts
index c1a8dfa..c7c9eb1 100644
--- a/examples/server/src/diagnostic-operations.ts
+++ b/examples/server/src/diagnostic-operations.ts
@@ -1,12 +1,12 @@
 import { DiagnosticFailure } from '@effect-api-query/contracts'
 import type { DiagnosticStatus, SlowDiagnosticInput } from '@effect-api-query/contracts'
-import { Deferred, Effect, Ref } from 'effect'
+import { Deferred, Effect, HashMap, Option, Ref } from 'effect'
 
 const initialStatus = (): DiagnosticStatus => ({ interrupted: 0, started: 0 })
 
 const initialState = () => ({
   total: initialStatus(),
-  operations: new Map<string, DiagnosticStatus>(),
+  operations: HashMap.empty<string, DiagnosticStatus>(),
 })
 
 export const makeDiagnosticOperations = Effect.fn('ExampleRpc.makeDiagnosticOperations')(
@@ -17,10 +17,13 @@ export const makeDiagnosticOperations = Effect.fn('ExampleRpc.makeDiagnosticOper
     const record = Effect.fn('ExampleDiagnostics.record')(
       (operationId: string, event: keyof DiagnosticStatus) =>
         Ref.update(state, (current) => {
-          const previous = current.operations.get(operationId) ?? initialStatus()
+          const previous = Option.getOrElse(
+            HashMap.get(current.operations, operationId),
+            initialStatus,
+          )
           return {
             total: { ...current.total, [event]: current.total[event] + 1 },
-            operations: new Map(current.operations).set(operationId, {
+            operations: HashMap.set(current.operations, operationId, {
               ...previous,
               [event]: previous[event] + 1,
             }),
@@ -48,7 +51,6 @@ export const makeDiagnosticOperations = Effect.fn('ExampleRpc.makeDiagnosticOper
         if (operations === undefined) {
           return Effect.void
         }
-        // Effect.forEach accepts the iterable first and its effectful callback second.
         // oxlint-disable-next-line unicorn/no-array-method-this-argument
         return Effect.forEach(operations, (cancellation) =>
           Deferred.succeed(cancellation, undefined),
@@ -59,7 +61,6 @@ export const makeDiagnosticOperations = Effect.fn('ExampleRpc.makeDiagnosticOper
     const reset = Effect.suspend(() => {
       const cancellations = [...active.values()].flatMap((operations) => [...operations])
       active.clear()
-      // Effect.forEach accepts the iterable first and its effectful callback second.
       // oxlint-disable-next-line unicorn/no-array-method-this-argument
       return Effect.forEach(cancellations, (cancellation) =>
         Deferred.succeed(cancellation, undefined),
@@ -71,7 +72,6 @@ export const makeDiagnosticOperations = Effect.fn('ExampleRpc.makeDiagnosticOper
       operationId,
     }: SlowDiagnosticInput) {
       const id = operationId ?? 'anonymous'
-      // Void is the deliberate success channel of this Effect factory.
       // oxlint-disable-next-line typescript/no-invalid-void-type
       const cancellation = yield* Deferred.make<void>()
       const operations = active.get(id) ?? new Set<Deferred.Deferred<void>>()
@@ -99,7 +99,9 @@ export const makeDiagnosticOperations = Effect.fn('ExampleRpc.makeDiagnosticOper
       fail: Effect.fail(new DiagnosticFailure({ reason: 'requested-failure' })),
       operationStatus: Effect.fn('ExampleDiagnostics.operationStatus')((operationId: string) =>
         Ref.get(state).pipe(
-          Effect.map((current) => current.operations.get(operationId) ?? initialStatus()),
+          Effect.map((current) =>
+            Option.getOrElse(HashMap.get(current.operations, operationId), initialStatus),
+          ),
         ),
       ),
       reset,
diff --git a/examples/server/src/server-local-rpc.ts b/examples/server/src/server-local-rpc.ts
new file mode 100644
index 0000000..85d22b6
--- /dev/null
+++ b/examples/server/src/server-local-rpc.ts
@@ -0,0 +1,26 @@
+import { Deferred, Effect } from 'effect'
+import type { Scope } from 'effect'
+import type { Rpc, RpcGroup, RpcMessage } from 'effect/rpc'
+import { RpcClient, RpcServer } from 'effect/rpc'
+
+export const makeServerLocalRpcClient = Effect.fnUntraced(function* <Rpcs extends Rpc.Any>(
+  group: RpcGroup.RpcGroup<Rpcs>,
+) {
+  const serverContext = yield* Effect.context<
+    Rpc.ToHandler<Rpcs> | Rpc.Middleware<Rpcs> | Scope.Scope
+  >()
+  const reply =
+    yield* Deferred.make<(message: RpcMessage.FromServer<Rpcs>) => Effect.Effect<void>>()
+  const server = yield* RpcServer.makeNoSerialization(group, {
+    disableFatalDefects: true,
+    onFromServer: (response) =>
+      Deferred.await(reply).pipe(Effect.flatMap((write) => write(response))),
+  })
+  const { client, write } = yield* RpcClient.makeNoSerialization(group, {
+    flatten: true,
+    supportsAck: true,
+    onFromClient: ({ message }) => Effect.provideContext(server.write(0, message), serverContext),
+  })
+  yield* Deferred.succeed(reply, write)
+  return client
+})
diff --git a/examples/server/src/server.ts b/examples/server/src/server.ts
index 5adeed0..a483bcb 100644
--- a/examples/server/src/server.ts
+++ b/examples/server/src/server.ts
@@ -5,7 +5,6 @@ import { createServer } from 'node:http'
 
 import { makeExampleWebHandler } from './web-handler.ts'
 
-// Effect Schema.TaggedError is a curried class factory; only instances use new.
 // oxlint-disable-next-line unicorn/throw-new-error
 class ExampleRpcServerError extends Schema.TaggedError<ExampleRpcServerError>()(
   'ExampleRpcServerError',
@@ -35,7 +34,6 @@ export interface StartExampleRpcServerOptions {
   readonly port?: number
 }
 
-/** Starts the standalone example server and closes it with the caller's Scope. */
 export const startExampleRpcServer = Effect.fn('ExampleRpc.startExampleRpcServer')(
   (options: StartExampleRpcServerOptions = {}) =>
     Effect.gen(function* () {
@@ -80,7 +78,6 @@ export const startExampleRpcServer = Effect.fn('ExampleRpc.startExampleRpcServer
           return HttpServerResponse.empty({ status: 404 })
         }
 
-        // Cancelling an oversized upload must leave its socket open to send the 413.
         const apiRequest = request.modify({})
         Object.defineProperty(apiRequest, 'stream', {
           value: NodeStream.fromReadable({
@@ -98,7 +95,6 @@ export const startExampleRpcServer = Effect.fn('ExampleRpc.startExampleRpcServer
         return HttpServerResponse.setHeaders(response, corsHeaders(isHttpPath))
       })
       yield* server.serve(app)
-      // Close active sockets before the adapter interrupts their request fibers.
       yield* Effect.addFinalizer(() =>
         Effect.sync(() => {
           nodeServer.closeAllConnections()
@@ -114,8 +110,5 @@ export const startExampleRpcServer = Effect.fn('ExampleRpc.startExampleRpcServer
         rpcUrl: `${url}/rpc`,
         url,
       } satisfies RunningExampleRpcServer
-    }).pipe(
-      // Finish acquisition and cleanup registration before accepting interruption.
-      Effect.uninterruptible,
-    ),
+    }).pipe(Effect.uninterruptible),
 )
diff --git a/examples/server/src/web-handler.ts b/examples/server/src/web-handler.ts
index bd25f05..9c2b89e 100644
--- a/examples/server/src/web-handler.ts
+++ b/examples/server/src/web-handler.ts
@@ -1,5 +1,9 @@
-import { exampleRpcGroup } from '@effect-api-query/contracts'
-import { Effect, Layer, Scope } from 'effect'
+import {
+  exampleRpcGroup,
+  ExampleAuthorization,
+  ExampleAuthorizationError,
+} from '@effect-api-query/contracts'
+import { Context, Effect, Layer, Scope } from 'effect'
 import type { HttpServerRequest } from 'effect/http'
 import { HttpEffect, HttpMiddleware, HttpRouter, HttpServer } from 'effect/http'
 import { RpcSerialization, RpcServer } from 'effect/rpc'
@@ -7,6 +11,7 @@ import { RpcSerialization, RpcServer } from 'effect/rpc'
 import { ExampleDomain } from './domain.ts'
 import { exampleHttpRoutes } from './http-handlers.ts'
 import { exampleRpcHandlersLayer } from './rpc-handlers.ts'
+import { makeServerLocalRpcClient } from './server-local-rpc.ts'
 
 const rpcLayer = Layer.mergeAll(exampleRpcHandlersLayer, RpcSerialization.layerJson)
 const maxRequestBodyBytes = 1024 * 1024
@@ -16,14 +21,12 @@ const readRequestBody = async (request: Request): Promise<Uint8Array<ArrayBuffer
     return new Uint8Array()
   }
   const reader = request.body.getReader()
-  const body = new Uint8Array(maxRequestBodyBytes)
+  let body = new Uint8Array(0)
   let length = 0
   const cancelReader = async () => {
     try {
       await reader.cancel()
-    } catch {
-      // Failed or already closed uploads no longer need cancellation.
-    }
+    } catch {}
   }
   const cancel = () => {
     void cancelReader()
@@ -32,17 +35,23 @@ const readRequestBody = async (request: Request): Promise<Uint8Array<ArrayBuffer
   try {
     while (true) {
       request.signal.throwIfAborted()
-      // Each stream read must complete before the next chunk can be requested.
       // oxlint-disable-next-line eslint/no-await-in-loop
       const chunk = await reader.read()
       request.signal.throwIfAborted()
       if (chunk.done) {
-        return body.subarray(0, length)
+        return length === body.byteLength ? body : body.slice(0, length)
       }
       if (chunk.value.byteLength > maxRequestBodyBytes - length) {
         cancel()
         return new Response(null, { status: 413 })
       }
+      const required = length + chunk.value.byteLength
+      if (required > body.byteLength) {
+        const capacity = Math.min(maxRequestBodyBytes, Math.max(required, body.byteLength * 2))
+        const expanded = new Uint8Array(capacity)
+        expanded.set(body.subarray(0, length))
+        body = expanded
+      }
       body.set(chunk.value, length)
       length += chunk.value.byteLength
     }
@@ -72,7 +81,6 @@ const withRequestBodyLimit =
     )
   }
 
-/** Builds the host-neutral HTTP RPC handler within the caller-owned Scope. */
 const makeRpcWebHandler = Effect.fn('ExampleRpc.makeRpcWebHandler')(function* () {
   const scope = yield* Scope.Scope
   const rpcContext = yield* Layer.buildWithScope(rpcLayer, scope)
@@ -97,13 +105,11 @@ const provideDomain = Effect.fn('ExampleDomain.provide')(function* <A, E, R>(
   return yield* Effect.provide(effect, context)
 })
 
-/** Builds the RPC handler within the caller-owned Scope. */
 export const makeExampleRpcWebHandler = Effect.fn('ExampleRpc.makeExampleRpcWebHandler')(() =>
   provideDomain(makeRpcWebHandler()),
 )
 
-/** Hosts RPC and HTTP contracts over one application state within the caller-owned Scope. */
-export const makeExampleWebHandler = Effect.fn('ExampleServer.makeExampleWebHandler')(function* () {
+const makeHostWebHandler = Effect.fn('ExampleServer.makeHostWebHandler')(function* () {
   const rpc = yield* makeRpcWebHandler()
   const httpEffect = yield* HttpRouter.toHttpEffect(
     exampleHttpRoutes.pipe(Layer.provide(HttpServer.layerServices)),
@@ -125,4 +131,38 @@ export const makeExampleWebHandler = Effect.fn('ExampleServer.makeExampleWebHand
     }
     return new Response(null, { status: 404 })
   }
-}, provideDomain)
+})
+
+export const makeExampleHost = Effect.fn('ExampleServer.makeExampleHost')(function* () {
+  const scope = yield* Scope.Scope
+  const domainContext = yield* Layer.buildWithScope(ExampleDomain.layer, scope)
+  const handlersContext = yield* Layer.buildWithScope(exampleRpcHandlersLayer, scope).pipe(
+    Effect.provide(domainContext),
+  )
+  const handleRequest = yield* makeHostWebHandler().pipe(Effect.provide(domainContext))
+  const makeRpcClient = Effect.fn('ExampleServer.makeRequestRpcClient')(function* (
+    authorization: string | undefined,
+  ) {
+    const requestScope = yield* Scope.Scope
+    const authority = ExampleAuthorization.of((effect) =>
+      authorization === 'allowed'
+        ? effect
+        : Effect.fail(new ExampleAuthorizationError({ reason: 'missing-example-authorization' })),
+    )
+    const serverContext = Context.add(
+      Context.add(handlersContext, ExampleAuthorization, authority),
+      Scope.Scope,
+      requestScope,
+    )
+    return yield* makeServerLocalRpcClient(exampleRpcGroup).pipe(
+      Effect.provideContext(serverContext),
+    )
+  })
+  return { handleRequest, makeRpcClient }
+})
+
+export type ExampleHost = Effect.Success<ReturnType<typeof makeExampleHost>>
+
+export const makeExampleWebHandler = Effect.fn('ExampleServer.makeExampleWebHandler')(() =>
+  makeExampleHost().pipe(Effect.map(({ handleRequest }) => handleRequest)),
+)
diff --git a/examples/server/tests/fixtures/websocket-server.ts b/examples/server/tests/fixtures/websocket-server.ts
new file mode 100644
index 0000000..76283af
--- /dev/null
+++ b/examples/server/tests/fixtures/websocket-server.ts
@@ -0,0 +1,34 @@
+import { NodeHttpServer, NodeSocket } from '@effect/platform-node'
+import { Effect, Layer } from 'effect'
+import type { Scope, Stream } from 'effect'
+import { RpcSerialization, RpcServer } from 'effect/rpc'
+import type { Socket } from 'effect/socket'
+import { createServer } from 'node:http'
+
+import { socketGroup } from '../../../../tests/fixtures/socket-client.ts'
+
+export const serveSocketGroup = Effect.fn('serveSocketGroup')(function* (handlers: {
+  readonly 'values.read': (input: { readonly id: number }) => Effect.Effect<number>
+  readonly 'values.watch': (input: { readonly channel: string }) => Stream.Stream<number>
+}) {
+  const server = yield* NodeHttpServer.make(createServer, {
+    host: '127.0.0.1',
+    port: 0,
+    disablePreemptiveShutdown: true,
+  })
+  if (server.address._tag === 'UnixPathAddress') {
+    return yield* Effect.die(new Error('Expected TCP address'))
+  }
+  const app = yield* RpcServer.toHttpEffectWebsocket(socketGroup).pipe(
+    Effect.provide(Layer.merge(socketGroup.toLayer(handlers), RpcSerialization.layerJson)),
+  )
+  yield* server.serve(app)
+  return `ws://127.0.0.1:${String(server.address.port)}/rpc`
+})
+
+export const runSocketCase = async <A, E>(
+  effect: Effect.Effect<A, E, Scope.Scope | Socket.WebSocketConstructor>,
+) =>
+  await Effect.runPromise(
+    effect.pipe(Effect.provide(NodeSocket.layerWebSocketConstructorWS), Effect.scoped),
+  )
diff --git a/examples/server/tests/http-api.test.ts b/examples/server/tests/http-api.test.ts
index 2af433c..e1c6d8b 100644
--- a/examples/server/tests/http-api.test.ts
+++ b/examples/server/tests/http-api.test.ts
@@ -88,7 +88,6 @@ describe('example HTTP API', () => {
       const server = yield* startExampleRpcServer()
       const rpc = yield* makeExampleRpcClient(server.rpcUrl)
       const context = yield* Effect.context()
-      // This test drives external browser cancellation independently of the surrounding Effect.
       /* oxlint-disable effecttsgo/abort-controller-in-effect */
       // @effect-diagnostics-next-line abortControllerInEffect:off
       const controller = new AbortController()
@@ -231,7 +230,6 @@ describe('example HTTP API', () => {
         durationMs: 60_000,
         operationId: 'rpc-panel',
       }).pipe(Effect.forkChild)
-      // This test drives external browser cancellation independently of the surrounding Effect.
       /* oxlint-disable effecttsgo/abort-controller-in-effect */
       // @effect-diagnostics-next-line abortControllerInEffect:off
       const controller = new AbortController()
diff --git a/examples/server/tests/rpc-transport-overhead.test.ts b/examples/server/tests/rpc-transport-overhead.test.ts
new file mode 100644
index 0000000..e60124b
--- /dev/null
+++ b/examples/server/tests/rpc-transport-overhead.test.ts
@@ -0,0 +1,433 @@
+import { NodeHttpServer, NodeSocket, NodeStdio } from '@effect/platform-node'
+import { describe, expect, it } from '@effect/vitest'
+import {
+  Config,
+  ConfigProvider,
+  Deferred,
+  Effect,
+  Exit,
+  Fiber,
+  Layer,
+  Option,
+  Predicate,
+  Queue,
+  Schema,
+  Scope,
+  Stdio,
+  Stream,
+} from 'effect'
+import { FetchHttpClient, HttpClient } from 'effect/http'
+import { RpcClient, RpcMessage, RpcSerialization, RpcServer } from 'effect/rpc'
+import { Socket } from 'effect/socket'
+import { createServer } from 'node:http'
+import type { IncomingMessage } from 'node:http'
+import type { Socket as TcpSocket } from 'node:net'
+
+import {
+  queryTransportCalls,
+  sharedStreamGroup,
+  startSharedTransportQuery,
+  transportGroup as group,
+} from '../../../tests/fixtures/rpc-transport-queries.ts'
+
+const handlers = group.toLayer({ 'values.read': ({ id }) => Effect.succeed(id) })
+const textEncoder = new TextEncoder()
+
+const headerBytes = (request: IncomingMessage) => {
+  let headers = `${request.method ?? ''} ${request.url ?? ''} HTTP/${request.httpVersion}\r\n`
+  for (let index = 0; index < request.rawHeaders.length; index += 2) {
+    headers += `${request.rawHeaders[index]}: ${request.rawHeaders[index + 1]}\r\n`
+  }
+  return textEncoder.encode(`${headers}\r\n`).byteLength
+}
+
+const measureHttpCalls = Effect.fn('TransportOverhead.measureHttpCalls')(function* (count: number) {
+  let requests = 0
+  let requestBodyBytes = 0
+  let requestHeaderBytes = 0
+  let nextRequestId = 0
+  const connections = new Set<TcpSocket>()
+  const nodeServer = createServer()
+  nodeServer.on('connection', (socket) => {
+    connections.add(socket)
+  })
+  nodeServer.on('request', (request) => {
+    requests += 1
+    requestHeaderBytes += headerBytes(request)
+  })
+  const server = yield* NodeHttpServer.make(() => nodeServer, {
+    host: '127.0.0.1',
+    port: 0,
+    disablePreemptiveShutdown: true,
+  })
+  if (server.address._tag === 'UnixPathAddress') {
+    return yield* Effect.die(new Error('Expected TCP address'))
+  }
+  const app = yield* RpcServer.toHttpEffect(group).pipe(
+    Effect.provide(Layer.merge(handlers, RpcSerialization.layerJson)),
+  )
+  yield* server.serve(app)
+  const client = yield* RpcClient.make(group, {
+    flatten: true,
+    disableTracing: true,
+    generateRequestId: () => {
+      const id = RpcMessage.RequestId(nextRequestId)
+      nextRequestId += 1
+      return id
+    },
+  }).pipe(
+    Effect.provide(
+      RpcClient.layerProtocolHttp({
+        url: `http://127.0.0.1:${String(server.address.port)}/rpc`,
+        transformClient: (httpClient) =>
+          HttpClient.mapRequest(httpClient, (request) => {
+            if (request.body._tag !== 'Uint8Array') {
+              throw new Error('Expected encoded RPC byte body')
+            }
+            requestBodyBytes += request.body.body.byteLength
+            return request
+          }),
+      }).pipe(Layer.provide(RpcSerialization.layerJson), Layer.provide(FetchHttpClient.layer)),
+    ),
+  )
+  yield* Effect.addFinalizer(() =>
+    Effect.sync(() => {
+      nodeServer.closeAllConnections()
+    }),
+  )
+  const queries = yield* queryTransportCalls(client, count)
+  return {
+    ...queries,
+    requests,
+    requestBodyBytes,
+    requestHeaderBytes,
+    connections: connections.size,
+    clientToServerBytes: [...connections].reduce((total, socket) => total + socket.bytesRead, 0),
+  }
+})
+
+const measureWebSocketCalls = Effect.fn('TransportOverhead.measureWebSocketCalls')(function* (
+  count: number,
+) {
+  let writes = 0
+  let requestBodyBytes = 0
+  let connections = 0
+  let nextRequestId = 0
+  let upgradeHeaderBytes = 0
+  let connection: TcpSocket | undefined
+  const nodeServer = createServer()
+  nodeServer.on('upgrade', (request) => {
+    connections += 1
+    upgradeHeaderBytes += headerBytes(request)
+    connection = request.socket
+  })
+  const server = yield* NodeHttpServer.make(() => nodeServer, {
+    host: '127.0.0.1',
+    port: 0,
+    disablePreemptiveShutdown: true,
+  })
+  if (server.address._tag === 'UnixPathAddress') {
+    return yield* Effect.die(new Error('Expected TCP address'))
+  }
+  const app = yield* RpcServer.toHttpEffectWebsocket(group).pipe(
+    Effect.provide(Layer.merge(handlers, RpcSerialization.layerJson)),
+  )
+  yield* server.serve(app)
+  const makeWebSocket = yield* Socket.WebSocketConstructor.pipe(
+    Effect.provide(NodeSocket.layerWebSocketConstructorWS),
+  )
+  const socket = yield* Socket.makeWebSocket(
+    `ws://127.0.0.1:${String(server.address.port)}/rpc`,
+  ).pipe(
+    Effect.provideService(Socket.WebSocketConstructor, (url, options) => {
+      const webSocket = makeWebSocket(url, options)
+      return {
+        get readyState() {
+          return webSocket.readyState
+        },
+        addEventListener: (...args) => {
+          webSocket.addEventListener(...args)
+        },
+        removeEventListener: (...args) => {
+          webSocket.removeEventListener(...args)
+        },
+        close: (...args) => {
+          webSocket.close(...args)
+        },
+        send: (data) => {
+          writes += 1
+          requestBodyBytes += Predicate.isString(data)
+            ? textEncoder.encode(data).byteLength
+            : data.byteLength
+          webSocket.send(data)
+        },
+      }
+    }),
+  )
+  const clientScope = yield* Scope.fork(yield* Effect.scope, 'sequential')
+  const protocolContext = yield* Layer.buildWithScope(
+    RpcClient.layerProtocolSocket().pipe(
+      Layer.provide(RpcSerialization.layerJson),
+      Layer.provide(Layer.succeed(Socket.Socket, socket)),
+    ),
+    clientScope,
+  )
+  const client = yield* RpcClient.make(group, {
+    flatten: true,
+    disableTracing: true,
+    generateRequestId: () => {
+      const id = RpcMessage.RequestId(nextRequestId)
+      nextRequestId += 1
+      return id
+    },
+  }).pipe(Effect.provide(protocolContext), Scope.provide(clientScope))
+  const queries = yield* queryTransportCalls(client, count)
+  const measurement = {
+    ...queries,
+    writes,
+    requestBodyBytes,
+    upgradeHeaderBytes,
+    clientToServerBytes: connection?.bytesRead ?? 0,
+    connections,
+  }
+  yield* Scope.close(clientScope, Exit.void)
+  return measurement
+})
+
+const reportMeasurement = Effect.fn('TransportOverhead.reportMeasurement')(function* (
+  transport: string,
+  count: number,
+  measurement:
+    | Effect.Success<ReturnType<typeof measureHttpCalls>>
+    | Effect.Success<ReturnType<typeof measureWebSocketCalls>>,
+) {
+  const reporting = yield* Config.String('RPC_TRANSPORT_MEASURE')
+    .pipe(Config.option)
+    .parse(ConfigProvider.fromEnv({ preserveEmptyStrings: true }))
+  if (Option.isSome(reporting) && reporting.value === '1') {
+    const stdio = yield* Stdio.Stdio
+    yield* Stream.make(`${JSON.stringify({ transport, count, ...measurement })}\n`).pipe(
+      Stream.run(stdio.stdout({ endOnDone: false })),
+    )
+  }
+}, Effect.provide(NodeStdio.layer))
+
+const decodeBurst = Schema.decodeUnknownOption(
+  Schema.TaggedStruct('Chunk', {
+    values: Schema.NonEmptyArray(Schema.Int),
+  }),
+)
+const decodeUnaryExit = Schema.decodeUnknownOption(
+  Schema.TaggedStruct('Exit', {
+    exit: Schema.TaggedStruct('Success', { value: Schema.Literal(42) }),
+  }),
+)
+const decodeWireData = Schema.decodeUnknownSync(Schema.Union([Schema.String, Schema.Uint8Array]))
+
+const settleSharedStream = Effect.fn('settleSharedStream')(function* (
+  completion: 'cancel' | 'complete',
+) {
+  let clientClosed = false
+  let serverClosed = false
+  let remoteFinalizers = 0
+  const result = yield* Effect.gen(function* () {
+    const unaryStarted = yield* Deferred.make<undefined>()
+    const unaryRelease = yield* Deferred.make<undefined>()
+    const serverFinalized = yield* Deferred.make<number>()
+    const burstOnWire = yield* Deferred.make<readonly number[]>()
+    const serverAcknowledged = yield* Deferred.make<undefined>()
+    const unaryOnWire = yield* Deferred.make<42>()
+    const clientSocketClosed = yield* Deferred.make<undefined>()
+    const cancellationHandlers = sharedStreamGroup.toLayer({
+      burst: () =>
+        (completion === 'cancel'
+          ? Stream.make(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16).pipe(
+              Stream.concat(
+                Stream.fromEffect(
+                  Deferred.succeed(serverAcknowledged, undefined).pipe(
+                    Effect.andThen(Effect.never),
+                  ),
+                ),
+              ),
+            )
+          : Stream.make(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
+        ).pipe(
+          Stream.ensuring(
+            Effect.sync(() => {
+              remoteFinalizers += 1
+              return remoteFinalizers
+            }).pipe(Effect.flatMap((count) => Deferred.succeed(serverFinalized, count))),
+          ),
+        ),
+      read: Effect.fnUntraced(function* () {
+        yield* Deferred.succeed(unaryStarted, undefined)
+        yield* Deferred.await(unaryRelease)
+        return 42
+      }),
+    })
+    const nodeServer = createServer()
+    nodeServer.on('close', () => {
+      serverClosed = true
+    })
+    const server = yield* NodeHttpServer.make(() => nodeServer, {
+      host: '127.0.0.1',
+      port: 0,
+      disablePreemptiveShutdown: true,
+    })
+    if (server.address._tag === 'UnixPathAddress') {
+      return yield* Effect.die(new Error('Expected TCP address'))
+    }
+    const app = yield* RpcServer.toHttpEffectWebsocket(sharedStreamGroup).pipe(
+      Effect.provide(Layer.merge(cancellationHandlers, RpcSerialization.layerJson)),
+    )
+    yield* server.serve(app)
+    const makeWebSocket = yield* Socket.WebSocketConstructor.pipe(
+      Effect.provide(NodeSocket.layerWebSocketConstructorWS),
+    )
+    const runSync = Effect.runSyncWith(yield* Effect.context())
+    const clientScope = yield* Scope.fork(yield* Effect.scope, 'sequential')
+    const socket = yield* Socket.makeWebSocket(
+      `ws://127.0.0.1:${String(server.address.port)}/rpc`,
+    ).pipe(
+      Scope.provide(clientScope),
+      Effect.provideService(Socket.WebSocketConstructor, (url, options) => {
+        const webSocket = makeWebSocket(url, options)
+        const parser = RpcSerialization.json.makeUnsafe()
+        webSocket.addEventListener('close', () => {
+          clientClosed = true
+          runSync(Deferred.succeed(clientSocketClosed, undefined))
+        })
+        webSocket.addEventListener('message', (event) => {
+          for (const message of parser.decode(decodeWireData(event.data))) {
+            const burst = decodeBurst(message)
+            if (Option.isSome(burst)) {
+              runSync(Deferred.succeed(burstOnWire, burst.value.values))
+            }
+            const unaryExit = decodeUnaryExit(message)
+            if (Option.isSome(unaryExit)) {
+              runSync(Deferred.succeed(unaryOnWire, unaryExit.value.exit.value))
+            }
+          }
+        })
+        return webSocket
+      }),
+    )
+    const protocol = yield* Layer.buildWithScope(
+      RpcClient.layerProtocolSocket().pipe(
+        Layer.provide(RpcSerialization.layerJson),
+        Layer.provide(Layer.succeed(Socket.Socket, socket)),
+      ),
+      clientScope,
+    )
+    const client = yield* RpcClient.make(sharedStreamGroup, {
+      flatten: true,
+      disableTracing: true,
+    }).pipe(Effect.provide(protocol), Scope.provide(clientScope))
+    const { queryClient, unary } = yield* startSharedTransportQuery(client, clientScope)
+    yield* Deferred.await(unaryStarted).pipe(Effect.timeout('2 seconds'))
+    const requestScope = yield* Scope.fork(clientScope, 'sequential')
+    const { values, bufferedAtCancellation } = yield* Effect.gen(function* () {
+      if (completion === 'cancel') {
+        const queue = yield* client('burst', undefined, { asQueue: true })
+        yield* Deferred.await(burstOnWire).pipe(Effect.timeout('2 seconds'))
+        yield* Deferred.await(serverAcknowledged).pipe(Effect.timeout('2 seconds'))
+        const buffered = yield* Queue.size(queue)
+        yield* Scope.close(requestScope, Exit.void)
+        return { values: [], bufferedAtCancellation: buffered }
+      }
+      const completedValues = yield* client('burst', undefined).pipe(Stream.runCollect)
+      return { values: completedValues, bufferedAtCancellation: undefined }
+    }).pipe(Scope.provide(requestScope), Effect.timeout('2 seconds'))
+    const chunkOnWire = yield* Deferred.await(burstOnWire).pipe(Effect.timeout('2 seconds'))
+    if (completion === 'complete') {
+      yield* Scope.close(requestScope, Exit.void)
+    }
+    yield* Deferred.await(serverFinalized).pipe(Effect.timeout('2 seconds'))
+    yield* Deferred.succeed(unaryRelease, undefined)
+    const wireValue = yield* Deferred.await(unaryOnWire).pipe(Effect.timeout('2 seconds'))
+    const unaryResult = yield* Fiber.join(unary).pipe(Effect.timeout('1 second'), Effect.exit)
+    const unaryExit = Exit.isSuccess(unaryResult) ? unaryResult.value : unaryResult
+    yield* Scope.close(clientScope, Exit.void)
+    yield* Deferred.await(clientSocketClosed).pipe(Effect.timeout('2 seconds'))
+    return {
+      values,
+      bufferedAtCancellation,
+      chunkOnWire,
+      unaryOnWire: wireValue,
+      clientClosed,
+      cacheEntries: queryClient.getQueryCache().getAll().length,
+      unaryExit,
+    }
+  }).pipe(Effect.scoped)
+  return { ...result, remoteFinalizers, serverClosed }
+})
+
+describe('shared RPC streams over WebSocket', () => {
+  it.live.each(['cancel', 'complete'] as const)(
+    'keeps an active unary query live when a valid stream settles by %s',
+    (completion) =>
+      Effect.gen(function* () {
+        const { unaryExit, ...observations } = yield* settleSharedStream(completion)
+        expect(observations).toStrictEqual({
+          values:
+            completion === 'cancel' ? [] : [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+          bufferedAtCancellation: completion === 'cancel' ? 16 : undefined,
+          remoteFinalizers: 1,
+          chunkOnWire: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
+          unaryOnWire: 42,
+          cacheEntries: 0,
+          clientClosed: true,
+          serverClosed: true,
+        })
+        expect(unaryExit).toStrictEqual(Exit.succeed(42))
+      }),
+  )
+})
+
+describe('independent RPC request overhead', () => {
+  it.live('keeps eight independent queries as eight HTTP requests', () =>
+    Effect.gen(function* () {
+      const measurement = yield* measureHttpCalls(8)
+      expect(measurement.values).toStrictEqual([0, 1, 2, 3, 4, 5, 6, 7])
+      expect(measurement.requests).toBe(8)
+      expect(measurement.cacheEntries).toBe(8)
+      expect(measurement.requestHeaderBytes).toBeGreaterThan(measurement.requestBodyBytes)
+      expect(measurement.clientToServerBytes).toBe(
+        measurement.requestHeaderBytes + measurement.requestBodyBytes,
+      )
+      yield* reportMeasurement('http', 8, measurement)
+    }),
+  )
+
+  it.live(
+    'multiplexes eight queries on one WebSocket without combining their request messages',
+    () =>
+      Effect.gen(function* () {
+        const measurement = yield* measureWebSocketCalls(8)
+        expect(measurement.values).toStrictEqual([0, 1, 2, 3, 4, 5, 6, 7])
+        expect(measurement.writes).toBe(8)
+        expect(measurement.connections).toBe(1)
+        expect(measurement.cacheEntries).toBe(8)
+        expect(measurement.clientToServerBytes).toBe(
+          measurement.upgradeHeaderBytes + measurement.requestBodyBytes + 8 * 6,
+        )
+        yield* reportMeasurement('websocket', 8, measurement)
+      }),
+  )
+
+  it.live.each([1, 32])('measures %i independent calls through both transports', (count) =>
+    Effect.gen(function* () {
+      const http = yield* measureHttpCalls(count).pipe(Effect.scoped)
+      const websocket = yield* measureWebSocketCalls(count).pipe(Effect.scoped)
+      expect(http.requests).toBe(count)
+      expect(websocket.writes).toBe(count)
+      expect(websocket.connections).toBe(1)
+      expect(http.cacheEntries).toBe(count)
+      expect(websocket.cacheEntries).toBe(count)
+      expect(http.values).toStrictEqual(websocket.values)
+      expect(http.requestBodyBytes).toBe(websocket.requestBodyBytes)
+      yield* reportMeasurement('http', count, http)
+      yield* reportMeasurement('websocket', count, websocket)
+    }),
+  )
+})
diff --git a/examples/server/tests/rpc-websocket-consumer.test.ts b/examples/server/tests/rpc-websocket-consumer.test.ts
new file mode 100644
index 0000000..250c763
--- /dev/null
+++ b/examples/server/tests/rpc-websocket-consumer.test.ts
@@ -0,0 +1,44 @@
+import { expect, it } from '@effect/vitest'
+import { Effect } from 'effect'
+
+import {
+  exerciseSocketConcurrency,
+  exerciseSocketInterruption,
+  exerciseSocketReplacement,
+} from '../../../tests/fixtures/websocket-checks.ts'
+
+it.live(
+  'runs concurrent reads and both open stream views through a ready WebSocket client',
+  () =>
+    Effect.gen(function* () {
+      expect(yield* Effect.promise(exerciseSocketConcurrency)).toStrictEqual({
+        reads: [10, 20],
+        history: [1],
+        latest: 1,
+        historyCancelled: true,
+        liveContinued: 2,
+        liveCancelled: true,
+      })
+    }),
+  20_000,
+)
+
+it.live('retires one socket owner before disposal and acquires an independent replacement', () =>
+  Effect.gen(function* () {
+    expect(yield* Effect.promise(exerciseSocketReplacement)).toStrictEqual({
+      oldOwnerCancelled: true,
+      unrelatedOwnerContinued: 2,
+      replacementValue: 1,
+      disconnectsAfterQueryCancellation: true,
+    })
+  }),
+)
+
+it.live('preserves independently interrupted wire Causes while other socket calls continue', () =>
+  Effect.gen(function* () {
+    expect(yield* Effect.promise(exerciseSocketInterruption)).toStrictEqual({
+      comparedWireCauses: 5,
+      unaffectedRead: 30,
+    })
+  }),
+)
diff --git a/examples/server/tests/server.test.ts b/examples/server/tests/server.test.ts
index 5329f87..7cef666 100644
--- a/examples/server/tests/server.test.ts
+++ b/examples/server/tests/server.test.ts
@@ -21,6 +21,8 @@ import { RpcClient } from 'effect/rpc'
 import dns from 'node:dns'
 import { request as nodeRequest } from 'node:http'
 
+import { makeDiagnosticOperations } from '../src/diagnostic-operations.ts'
+
 const waitForStatus = Effect.fn('TestExampleRpc.waitForStatus')(function* (
   client: ExampleRpcClient,
   predicate: (status: DiagnosticStatus) => boolean,
@@ -36,12 +38,41 @@ const waitForStatus = Effect.fn('TestExampleRpc.waitForStatus')(function* (
 })
 
 describe('example RPC server', () => {
+  it.effect('keeps captured diagnostic statuses intact across later operations and reset', () =>
+    Effect.gen(function* () {
+      const diagnostics = yield* makeDiagnosticOperations()
+      const unused = yield* diagnostics.operationStatus('first')
+      yield* diagnostics.slow({ operationId: 'first', durationMs: 0 })
+      const first = yield* diagnostics.operationStatus('first')
+      const total = yield* diagnostics.status
+      yield* diagnostics.slow({ operationId: 'first', durationMs: 0 })
+      yield* diagnostics.slow({ operationId: 'second', durationMs: 0 })
+      expect(yield* diagnostics.operationStatus('first')).toStrictEqual({
+        started: 2,
+        interrupted: 0,
+      })
+      expect(yield* diagnostics.operationStatus('second')).toStrictEqual({
+        started: 1,
+        interrupted: 0,
+      })
+      expect(yield* diagnostics.status).toStrictEqual({ started: 3, interrupted: 0 })
+      yield* diagnostics.reset
+      expect(yield* diagnostics.operationStatus('first')).toStrictEqual({
+        started: 0,
+        interrupted: 0,
+      })
+      expect(yield* diagnostics.status).toStrictEqual({ started: 0, interrupted: 0 })
+      expect(unused).toStrictEqual({ started: 0, interrupted: 0 })
+      expect(first).toStrictEqual({ started: 1, interrupted: 0 })
+      expect(total).toStrictEqual({ started: 1, interrupted: 0 })
+    }),
+  )
+
   it.live('rejects oversized chunked bodies before the client finishes sending', () =>
     Effect.gen(function* () {
       const server = yield* startExampleRpcServer()
       const status = yield* Effect.promise(
         async () =>
-          // The callback/event API needs a Promise bridge in the ES2022 target.
           // oxlint-disable-next-line promise/avoid-new
           new Promise<number | undefined>((resolve, reject) => {
             const request = nodeRequest(server.rpcUrl, { method: 'POST' }, (response) => {
@@ -69,7 +100,6 @@ describe('example RPC server', () => {
       for (const path of ['//[', 'http://user:password@localhost/rpc']) {
         const status = yield* Effect.promise(
           async () =>
-            // The callback/event API needs a Promise bridge in the ES2022 target.
             // oxlint-disable-next-line promise/avoid-new
             new Promise<number | undefined>((resolve, reject) => {
               const request = nodeRequest(server.url, { method: 'POST', path }, (response) => {
@@ -137,7 +167,6 @@ describe('example RPC server', () => {
       readonly annotations: unknown
       readonly message: unknown
     }[] = []
-    // Void is the deliberate success channel of this Effect factory.
     // oxlint-disable-next-line typescript/no-invalid-void-type
     const collectingLogger = Logger.make<unknown, void>((options) => {
       const entry = Logger.formatStructured.log(options)
@@ -153,8 +182,6 @@ describe('example RPC server', () => {
       yield* client('users.list', undefined)
 
       expect(entries).toContainEqual({
-        // Vitest's matcher returns any, widened here because entries are checked by the matcher.
-        // SAFETY: expect.objectContaining is consumed only as an expected test value.
         annotations: expect.objectContaining({
           'http.method': 'POST',
           'http.status': 200,
@@ -383,7 +410,6 @@ describe('example RPC server', () => {
             spy.mockRestore()
           }),
       )
-      // Node's DNS callback is controlled here to pause real server startup.
       /* oxlint-disable promise/prefer-await-to-callbacks */
       lookup.mockImplementationOnce(
         (
diff --git a/examples/server/tests/web-handler.test.ts b/examples/server/tests/web-handler.test.ts
index a50623c..998eaec 100644
--- a/examples/server/tests/web-handler.test.ts
+++ b/examples/server/tests/web-handler.test.ts
@@ -25,7 +25,6 @@ describe('example RPC request body limit', () => {
       )
       expect(failedResponse.status).toBe(400)
 
-      // This test drives external browser cancellation independently of the surrounding Effect.
       /* oxlint-disable effecttsgo/abort-controller-in-effect */
       // @effect-diagnostics-next-line abortControllerInEffect:off
       const controller = new AbortController()
@@ -68,6 +67,42 @@ describe('example RPC request body limit', () => {
     }),
   )
 
+  it.effect('preserves earlier upload bytes when a producer reuses its chunk buffer', () =>
+    Effect.gen(function* () {
+      const handler = yield* makeExampleRpcWebHandler()
+      const bytes = new Uint8Array(1024)
+      let chunks = 0
+      const body = new ReadableStream<Uint8Array>(
+        {
+          pull(controller) {
+            if (chunks === 5) {
+              controller.close()
+              return
+            }
+            bytes.fill(32)
+            if (chunks === 0) {
+              bytes.set(new TextEncoder().encode('[]'))
+            }
+            controller.enqueue(bytes)
+            chunks += 1
+          },
+        },
+        { highWaterMark: 0 },
+      )
+      const response = yield* Effect.promise(async () =>
+        handler(
+          streamingRequest('http://localhost/rpc', {
+            method: 'POST',
+            body,
+            duplex: 'half',
+          }),
+        ),
+      )
+      expect(response.status).toBe(200)
+      yield* Effect.promise(async () => response.arrayBuffer())
+    }),
+  )
+
   it.effect(
     'counts streamed bytes despite missing or misleading lengths and cancels overflow',
     () =>
diff --git a/examples/shared/error-description.ts b/examples/shared/error-description.ts
new file mode 100644
index 0000000..7e5b811
--- /dev/null
+++ b/examples/shared/error-description.ts
@@ -0,0 +1,16 @@
+import { Cause } from 'effect'
+import { isEffectHttpApiQueryError, isEffectRpcQueryError } from 'effect-api-query'
+
+// oxlint-disable-next-line anti-slop/no-unknown-parameters
+export const describeEffectError = (error: unknown) => {
+  if (isEffectRpcQueryError(error) || isEffectHttpApiQueryError(error)) {
+    const operation = isEffectRpcQueryError(error)
+      ? error.rpcTag
+      : `${error.groupId}.${error.endpoint}`
+    return {
+      summary: `${error.name} from ${operation} (${error.operation})`,
+      details: Cause.pretty(error.cause),
+    }
+  }
+  return error instanceof Error ? { summary: `${error.name}: ${error.message}` } : undefined
+}
diff --git a/examples/shared/theme.css b/examples/shared/theme.css
new file mode 100644
index 0000000..0ff3881
--- /dev/null
+++ b/examples/shared/theme.css
@@ -0,0 +1,61 @@
+@theme inline {
+  --tracking-display: -0.04em;
+  --color-destructive-600: var(--color-red-600);
+  --color-background: #000;
+  --color-primary-foreground: #fff;
+  --color-card: #111113;
+  --color-shadow: #000;
+  --color-foreground: var(--color-zinc-50);
+  --color-text-primary: var(--color-zinc-100);
+  --color-text-secondary: var(--color-zinc-200);
+  --color-text-tertiary: var(--color-zinc-300);
+  --color-muted-foreground: var(--color-zinc-400);
+  --color-text-subtle: var(--color-zinc-500);
+  --color-placeholder: var(--color-zinc-600);
+  --color-border-strong: var(--color-zinc-700);
+  --color-border: var(--color-zinc-800);
+  --color-border-subtle: var(--color-zinc-900);
+  --color-muted: var(--color-zinc-900);
+  --color-brand-200: var(--color-violet-200);
+  --color-brand-300: var(--color-violet-300);
+  --color-brand-400: var(--color-violet-400);
+  --color-brand-500: var(--color-violet-500);
+  --color-brand-600: var(--color-violet-600);
+  --color-brand-800: var(--color-violet-800);
+  --color-brand-900: var(--color-violet-900);
+  --color-brand-950: var(--color-violet-950);
+  --color-destructive-200: var(--color-red-200);
+  --color-destructive-800: var(--color-red-800);
+  --color-destructive-900: var(--color-red-900);
+  --color-destructive-950: var(--color-red-950);
+}
+
+@layer base {
+  :root {
+    --app-black: #050505;
+    --app-purple: #7c3aed;
+    --app-text: #fafafa;
+    color-scheme: dark;
+    font-family: 'Avenir Next', Avenir, 'Segoe UI Variable', 'Segoe UI', sans-serif;
+  }
+
+  body {
+    background: var(--app-black);
+  }
+
+  ::selection {
+    background: var(--app-purple);
+    color: var(--app-text);
+  }
+}
+
+@layer components {
+  .app-backdrop {
+    background: var(--app-black);
+  }
+
+  .display-heading {
+    font-family: 'Avenir Next', Avenir, 'Segoe UI Variable', 'Segoe UI', sans-serif;
+    text-wrap: balance;
+  }
+}
diff --git a/examples/tanstack-start/src/hooks/use-slow-query-cancellation.ts b/examples/shared/use-slow-query-cancellation.ts
similarity index 74%
rename from examples/tanstack-start/src/hooks/use-slow-query-cancellation.ts
rename to examples/shared/use-slow-query-cancellation.ts
index d82c56a..ee13d30 100644
--- a/examples/tanstack-start/src/hooks/use-slow-query-cancellation.ts
+++ b/examples/shared/use-slow-query-cancellation.ts
@@ -1,9 +1,40 @@
 import type { DiagnosticStatus } from '@effect-api-query/contracts'
+import type { QueryClient, QueryFunction, QueryKey, SkipToken } from '@tanstack/react-query'
 import { useEffect, useMemo, useRef, useState } from 'react'
 
-import type { TanStackStartApplication } from '../lib/application.ts'
+export interface DiagnosticQuery<Input, Data> {
+  readonly queryKey: (input: Input) => QueryKey
+  readonly queryOptions: (options: { readonly input: Input }) => {
+    readonly queryKey: QueryKey
+    readonly queryFn: QueryFunction<Data> | SkipToken
+  }
+}
+
+export interface SlowInput {
+  readonly durationMs: number
+  readonly operationId: string
+}
+export interface StatusInput {
+  readonly operationId: string
+}
+
+export interface SlowQueryApplication {
+  readonly queryClient: QueryClient
+  readonly rpcQuery: {
+    readonly diagnostics: {
+      readonly slow: DiagnosticQuery<SlowInput, string>
+      readonly operationStatus: DiagnosticQuery<StatusInput, DiagnosticStatus>
+    }
+  }
+  readonly httpQuery: {
+    readonly diagnostics: {
+      readonly slow: DiagnosticQuery<{ readonly query: SlowInput }, string>
+      readonly operationStatus: DiagnosticQuery<{ readonly params: StatusInput }, DiagnosticStatus>
+    }
+  }
+  readonly isActive?: () => boolean
+}
 
-// Browser workflow shared by both transports.
 export type SlowQueryCancellationState =
   | { readonly _tag: 'Idle' }
   | { readonly _tag: 'Starting' }
@@ -41,20 +72,19 @@ export const describeSlowQueryCancellation = (
 }
 
 const delay = async (milliseconds: number) =>
-  // Timers expose callbacks rather than an awaitable API in the ES2022 browser target.
   // oxlint-disable-next-line promise/avoid-new
   new Promise<void>((resolve) => {
     globalThis.setTimeout(resolve, milliseconds)
   })
 
-/** Coordinates typed diagnostic operations as one cancellation demonstration. */
+const alwaysActive = () => true
+
 export const useSlowQueryCancellation = (
-  { queryClient, rpcQuery, httpQuery }: TanStackStartApplication,
+  { queryClient, rpcQuery, httpQuery, isActive = alwaysActive }: SlowQueryApplication,
   transport: 'rpc' | 'http' = 'rpc',
 ) => {
   const [state, setState] = useState<SlowQueryCancellationState>({ _tag: 'Idle' })
   const baseline = useRef<DiagnosticStatus | undefined>(undefined)
-  // The operation input stays fixed for this mounted cancellation workflow.
   // oxlint-disable-next-line react/hook-use-state
   const [slowInput] = useState(() => ({
     durationMs: 60_000,
@@ -102,6 +132,7 @@ export const useSlowQueryCancellation = (
   useEffect(() => {
     const controller = new AbortController()
     lifetime.current = controller
+    baseline.current = undefined
     return () => {
       controller.abort()
       void queryClient.cancelQueries({ queryKey: adapter.key, exact: true })
@@ -109,20 +140,25 @@ export const useSlowQueryCancellation = (
     }
   }, [adapter, queryClient])
 
+  const assertActive = (signal: AbortSignal) => {
+    signal.throwIfAborted()
+    if (!isActive()) {
+      throw new Error('Owner is inactive')
+    }
+  }
+
   const waitForStatus = async (
     predicate: (status: DiagnosticStatus) => boolean,
     signal: AbortSignal,
   ): Promise<DiagnosticStatus> => {
     for (let attempt = 0; attempt < 100; attempt += 1) {
-      signal.throwIfAborted()
-      // Each poll depends on the preceding result and must finish before the next attempt.
+      assertActive(signal)
       // oxlint-disable-next-line eslint/no-await-in-loop
       const status = await adapter.readStatus()
-      signal.throwIfAborted()
+      assertActive(signal)
       if (predicate(status)) {
         return status
       }
-      // Polls deliberately wait between sequential status reads.
       // oxlint-disable-next-line eslint/no-await-in-loop
       await delay(10)
     }
@@ -132,26 +168,25 @@ export const useSlowQueryCancellation = (
   const runQuery = async () => {
     try {
       await adapter.run()
-    } catch {
-      // Query state retains failures; interruption is expected after cancellation.
-    }
+    } catch {}
   }
 
   const start = async () => {
     const signal = lifetime.current?.signal
-    if (signal === undefined || signal.aborted) {
+    if (signal === undefined || signal.aborted || !isActive()) {
       return
     }
     setState({ _tag: 'Starting' })
     try {
       const before = await adapter.readStatus()
-      signal.throwIfAborted()
+      assertActive(signal)
       baseline.current = before
       void runQuery()
       await waitForStatus(({ started }) => started > before.started, signal)
+      assertActive(signal)
       setState({ _tag: 'Ready' })
     } catch (error) {
-      if (!signal.aborted) {
+      if (!signal.aborted && isActive()) {
         setState({ _tag: 'Failed', error })
       }
     }
@@ -160,23 +195,22 @@ export const useSlowQueryCancellation = (
   const cancel = async () => {
     const before = baseline.current
     const signal = lifetime.current?.signal
-    if (before === undefined || signal === undefined || signal.aborted) {
+    if (before === undefined || signal === undefined || signal.aborted || !isActive()) {
       return
     }
 
     setState({ _tag: 'Cancelling' })
     try {
-      // TanStack aborts the query signal; the ready client interrupts the server operation.
-      await queryClient.cancelQueries({
-        queryKey: adapter.key,
-      })
+      await queryClient.cancelQueries({ queryKey: adapter.key, exact: true })
+      assertActive(signal)
       const status = await waitForStatus(
         ({ interrupted }) => interrupted > before.interrupted,
         signal,
       )
+      assertActive(signal)
       setState({ _tag: 'Cancelled', interruptions: status.interrupted })
     } catch (error) {
-      if (!signal.aborted) {
+      if (!signal.aborted && isActive()) {
         setState({ _tag: 'Failed', error })
       }
     }
diff --git a/examples/tanstack-start/src/components/action-button.tsx b/examples/tanstack-start/src/components/action-button.tsx
index d0e5105..6ffcb6f 100644
--- a/examples/tanstack-start/src/components/action-button.tsx
+++ b/examples/tanstack-start/src/components/action-button.tsx
@@ -18,7 +18,6 @@ export const ActionButton = ({
   ...props
 }: ActionButtonProps) => (
   <button
-    // ComponentProps restricts type to button, submit, or reset, and defaults to button.
     // oxlint-disable-next-line react/button-has-type
     type={type}
     className={[
diff --git a/examples/tanstack-start/src/components/effect-error-details.tsx b/examples/tanstack-start/src/components/effect-error-details.tsx
index 5633fa0..eb3b6af 100644
--- a/examples/tanstack-start/src/components/effect-error-details.tsx
+++ b/examples/tanstack-start/src/components/effect-error-details.tsx
@@ -1,25 +1,14 @@
-import { Cause } from 'effect'
-import { isEffectHttpApiQueryError, isEffectRpcQueryError } from 'effect-api-query'
+import { describeEffectError } from '../../../shared/error-description.ts'
 
 const alertClassName =
   'mt-4 border border-destructive-900/80 border-l-4 border-l-destructive-600 bg-destructive-950/50 p-3 text-sm whitespace-pre-wrap text-destructive-200'
 
 export const EffectErrorDetails = ({ error }: { readonly error: unknown }) => {
-  if (isEffectRpcQueryError(error) || isEffectHttpApiQueryError(error)) {
-    const operation = isEffectRpcQueryError(error)
-      ? error.rpcTag
-      : `${error.groupId}.${error.endpoint}`
-    return (
-      <p className={alertClassName} role="alert">
-        {error.name} from {operation} ({error.operation}){'\n'}
-        {Cause.pretty(error.cause)}
-      </p>
-    )
-  }
-
-  return error instanceof Error ? (
+  const description = describeEffectError(error)
+  return description === undefined ? null : (
     <p className={alertClassName} role="alert">
-      {error.name}: {error.message}
+      {description.summary}
+      {description.details === undefined ? undefined : `\n${description.details}`}
     </p>
-  ) : null
+  )
 }
diff --git a/examples/tanstack-start/src/components/navigation-link.tsx b/examples/tanstack-start/src/components/navigation-link.tsx
index 320b46c..710f98b 100644
--- a/examples/tanstack-start/src/components/navigation-link.tsx
+++ b/examples/tanstack-start/src/components/navigation-link.tsx
@@ -33,5 +33,4 @@ const NavigationAnchor = forwardRef<HTMLAnchorElement, NavigationAnchorProps>(
 
 NavigationAnchor.displayName = 'NavigationAnchor'
 
-/** A design-system anchor with TanStack Router's typed navigation interface. */
 export const NavigationLink = createLink(NavigationAnchor)
diff --git a/examples/tanstack-start/src/components/router-status.tsx b/examples/tanstack-start/src/components/router-status.tsx
index a2af24b..43c502f 100644
--- a/examples/tanstack-start/src/components/router-status.tsx
+++ b/examples/tanstack-start/src/components/router-status.tsx
@@ -20,7 +20,7 @@ const StatusPage = ({
 
 export const PendingPage = () => (
   <StatusPage title="Loading route">
-    <p className="text-muted-foreground">Loading generated RPC queries…</p>
+    <p className="text-muted-foreground">Loading queries…</p>
   </StatusPage>
 )
 
diff --git a/examples/tanstack-start/src/lib/api-server.ts b/examples/tanstack-start/src/lib/api-server.ts
index 99533dd..0b2a31f 100644
--- a/examples/tanstack-start/src/lib/api-server.ts
+++ b/examples/tanstack-start/src/lib/api-server.ts
@@ -1,31 +1,14 @@
 import '@tanstack/react-start/server-only'
-import { makeExampleWebHandler } from '@effect-api-query/server/web-handler'
 import { getRouterInstance } from '@tanstack/react-start'
-import { Effect, Exit, Scope } from 'effect'
 
-const serverScope = Scope.makeUnsafe()
-const serverHandler = Effect.runPromise(makeExampleWebHandler().pipe(Scope.provide(serverScope)))
-let disposal: Promise<void> | undefined
+import { getExampleHost } from './server-host.ts'
 
-const disposeServerHandler = async (): Promise<void> => {
-  disposal ??= Effect.runPromise(Scope.close(serverScope, Exit.void))
-  return disposal
-}
-
-if (import.meta.hot !== undefined) {
-  import.meta.hot.dispose(() => {
-    void disposeServerHandler()
-  })
-}
-
-/** Serves HTTP and RPC for the lifetime of this TanStack Start server module. */
 export const handleApiRequest = async (request: Request): Promise<Response> => {
   const router = await getRouterInstance()
   try {
-    const handler = await serverHandler
-    return await handler(request)
+    const host = await getExampleHost()
+    return await host.handleRequest(request)
   } finally {
-    // Server routes bypass SSR cleanup. Release the ready clients created with the router.
     await router.options.context.dispose()
   }
 }
diff --git a/examples/tanstack-start/src/lib/application.ts b/examples/tanstack-start/src/lib/application.ts
index 3986c93..3e13ddb 100644
--- a/examples/tanstack-start/src/lib/application.ts
+++ b/examples/tanstack-start/src/lib/application.ts
@@ -1,9 +1,9 @@
 import { exampleHttpApi, exampleRpcGroup } from '@effect-api-query/contracts'
 import { startExampleRpcClient } from '@effect-api-query/contracts/client'
-import type { ExampleRpcClient } from '@effect-api-query/contracts/client'
+import type { ExampleRpcClient, StartedExampleRpcClient } from '@effect-api-query/contracts/client'
 import { QueryClient } from '@tanstack/react-query'
-import { ManagedRuntime } from 'effect'
-import { createHttpApiQueryUtils, createRpcQueryUtils } from 'effect-api-query'
+import { Effect, Layer, ManagedRuntime } from 'effect'
+import { createHttpApiQueryUtils, createRpcQueryUtils, fetchStreamSnapshot } from 'effect-api-query'
 import type { RunPromiseExit } from 'effect-api-query'
 import { FetchHttpClient, HttpClient, HttpClientRequest } from 'effect/http'
 import { HttpApiClient } from 'effect/http-api'
@@ -33,6 +33,8 @@ const makeExampleHttpQueryUtils = (
   })
 
 export interface TanStackStartApplication {
+  readonly runPreparation: <A, E>(effect: Effect.Effect<A, E>) => Promise<A>
+  readonly captureSnapshot: typeof fetchStreamSnapshot
   readonly httpQuery: ReturnType<typeof makeExampleHttpQueryUtils>
   readonly invalidateUsers: () => Promise<void>
   readonly dispose: () => Promise<void>
@@ -42,32 +44,78 @@ export interface TanStackStartApplication {
 
 export interface StartTanStackStartApplicationOptions {
   readonly rpcUrl: string
+  readonly rpcClient?: StartedExampleRpcClient
+  readonly fetch?: typeof globalThis.fetch
   readonly httpBaseUrl?: string
   readonly identity?: string
   readonly httpAuthorization?: string
 }
 
-/** Creates clients, query utilities, and cleanup together so the example can be copied as a whole. */
 export const startTanStackStartApplication = async ({
   rpcUrl,
+  rpcClient: readyRpcClient,
+  fetch: applicationFetch,
   identity = 'example',
   httpAuthorization = 'allowed',
   httpBaseUrl = new URL(rpcUrl, globalThis.location?.href).origin,
 }: StartTanStackStartApplicationOptions): Promise<TanStackStartApplication> => {
-  const rpcClient = await startExampleRpcClient(rpcUrl)
-  const httpRuntime = ManagedRuntime.make(FetchHttpClient.layer)
+  const rpcClient = readyRpcClient ?? (await startExampleRpcClient(rpcUrl))
+  const httpRuntime = ManagedRuntime.make(
+    applicationFetch === undefined
+      ? FetchHttpClient.layer
+      : FetchHttpClient.layer.pipe(
+          Layer.provide(Layer.succeed(FetchHttpClient.Fetch, applicationFetch)),
+        ),
+  )
+  const abort = new AbortController()
+  const pendingWork = new Set<Promise<unknown>>()
+  const trackWork = async <A>(execute: () => A | Promise<A>): Promise<A> => {
+    abort.signal.throwIfAborted()
+    const execution = Promise.resolve(execute())
+    pendingWork.add(execution)
+    try {
+      return await execution
+    } finally {
+      pendingWork.delete(execution)
+    }
+  }
+  const ownRunner =
+    (runner: RunPromiseExit): RunPromiseExit =>
+    async (effect, options) =>
+      trackWork(async () => runner(effect, options))
   const queryClient = new QueryClient({
     defaultOptions: {
       mutations: { retry: false },
-      queries: { retry: false, staleTime: 60_000 },
+      queries: {
+        retry: false,
+        staleTime: 60_000,
+        persister: async (queryFn, context) => trackWork(() => queryFn(context)),
+      },
     },
   })
+  const runPreparation: TanStackStartApplication['runPreparation'] = async (effect) =>
+    trackWork(async () => Effect.runPromise(effect, { signal: abort.signal }))
+  const captureSnapshot: typeof fetchStreamSnapshot = async (owner, options, controls = {}) => {
+    if (owner !== queryClient) {
+      throw new Error('Snapshot belongs to another request')
+    }
+    return await trackWork(async () =>
+      fetchStreamSnapshot(owner, options, {
+        ...controls,
+        signal:
+          controls.signal === undefined
+            ? abort.signal
+            : AbortSignal.any([abort.signal, controls.signal]),
+      }),
+    )
+  }
   let disposal: Promise<void> | undefined
   const dispose = async () => {
-    // Stop queries before releasing the ready clients they execute through.
     disposal ??= (async () => {
       try {
+        abort.abort()
         await queryClient.cancelQueries()
+        await Promise.allSettled(pendingWork)
       } finally {
         queryClient.clear()
         try {
@@ -89,9 +137,19 @@ export const startTanStackStartApplication = async ({
         ),
       }),
     )
-    const httpQuery = makeExampleHttpQueryUtils(httpClient, httpRuntime.runPromiseExit, identity)
-    const rpcQuery = makeExampleRpcQueryUtils(rpcClient.client, rpcClient.runPromiseExit, identity)
+    const httpQuery = makeExampleHttpQueryUtils(
+      httpClient,
+      ownRunner(httpRuntime.runPromiseExit),
+      identity,
+    )
+    const rpcQuery = makeExampleRpcQueryUtils(
+      rpcClient.client,
+      ownRunner(rpcClient.runPromiseExit),
+      identity,
+    )
     return {
+      captureSnapshot,
+      runPreparation,
       httpQuery,
       invalidateUsers: async () => {
         await Promise.all([
@@ -114,3 +172,11 @@ export const startTanStackStartApplication = async ({
     throw error
   }
 }
+
+export const reportCleanupFailure = async (cleanup: Promise<void>): Promise<void> => {
+  try {
+    await cleanup
+  } catch (error) {
+    console.error('Start resource cleanup failed', error)
+  }
+}
diff --git a/examples/tanstack-start/src/lib/query-ssr.ts b/examples/tanstack-start/src/lib/query-ssr.ts
index fc3b5de..739f66a 100644
--- a/examples/tanstack-start/src/lib/query-ssr.ts
+++ b/examples/tanstack-start/src/lib/query-ssr.ts
@@ -1,51 +1,79 @@
 import { defaultShouldDehydrateQuery } from '@tanstack/react-query'
-import type { QueryExecuteOptions, QueryClient, QueryKey } from '@tanstack/react-query'
+import type { DehydratedState } from '@tanstack/react-query'
 import type { AnyRouter } from '@tanstack/react-router'
 import { setupRouterSsrQueryIntegration } from '@tanstack/react-router-ssr-query'
+import { Effect } from 'effect'
 
-/**
- * Captures the first successful cache snapshot from an open stream, then interrupts its server
- * subscription so route loading and dehydration can finish.
- */
-export const fetchStreamSnapshot = async <TQueryFnData, TError, TData, TQueryKey extends QueryKey>(
-  queryClient: QueryClient,
-  options: QueryExecuteOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>,
-): Promise<TData> => {
-  // Start first so an earlier cached error or reset snapshot cannot settle this request.
-  const fetching = queryClient.query(options)
-  let stopWatching: (() => void) | undefined
-  // The callback/event API needs a Promise bridge in the ES2022 target.
-  // oxlint-disable-next-line promise/avoid-new
-  const snapshotReady = new Promise<void>((resolve) => {
-    const inspect = () => {
-      const state = queryClient.getQueryState<TData, TError, TQueryKey>(options.queryKey)
-      if (state?.status === 'success') {
-        resolve()
-      }
-    }
-    stopWatching = queryClient.getQueryCache().subscribe(inspect)
-    inspect()
-  })
+import type { TanStackStartApplication } from './application.ts'
+import { makeSnapshotPreparation } from './snapshot-preparation.ts'
+import type { SnapshotPreparation } from './snapshot-preparation.ts'
+
+type SnapshotQueries = DehydratedState['queries']
+interface RouterSnapshot {
+  readonly query?: {
+    initial?: DehydratedState['queries']
+    readonly stream: ReadableStream<DehydratedState['queries']>
+  }
+}
+const defaultPreparation: SnapshotPreparation = {
+  beforeEncode: Effect.yieldNow,
+  beforeDecode: Effect.yieldNow,
+}
+
+const prepareSnapshot = async (
+  snapshot: RouterSnapshot,
+  prepare: (queries: SnapshotQueries) => Promise<SnapshotQueries>,
+): Promise<RouterSnapshot> => {
+  if (snapshot.query === undefined) {
+    return snapshot
+  }
+  let initial: SnapshotQueries | undefined
   try {
-    // Cancellation can restore pending state; the fetch promise owns terminal failures.
-    await Promise.race([snapshotReady, fetching])
-    await queryClient.cancelQueries({ exact: true, queryKey: options.queryKey })
-    return await fetching
-  } finally {
-    stopWatching?.()
+    initial =
+      snapshot.query.initial === undefined ? undefined : await prepare(snapshot.query.initial)
+  } catch (error) {
+    await snapshot.query.stream.cancel(error)
+    throw error
+  }
+  const query: NonNullable<RouterSnapshot['query']> = {
+    stream: snapshot.query.stream.pipeThrough(
+      new TransformStream({
+        transform: async (queries, controller) => {
+          controller.enqueue(await prepare(queries))
+        },
+      }),
+    ),
   }
+  if (initial !== undefined) {
+    query.initial = initial
+  }
+  return { ...snapshot, query }
 }
 
-/** Configures QueryClient hydration, including Effect Schema class serialization. */
-export const setupQuerySsr = (router: AnyRouter, queryClient: QueryClient): void => {
+export const setupQuerySsr = (
+  router: AnyRouter,
+  application: TanStackStartApplication,
+  preparation: SnapshotPreparation = defaultPreparation,
+): void => {
+  const codecs = makeSnapshotPreparation(application, preparation)
   setupRouterSsrQueryIntegration({
-    dehydrateOptions: {
-      // Query cache data is opaque; structuredClone preserves the serialization boundary.
-      // oxlint-disable-next-line anti-slop/no-unknown-parameters
-      serializeData: (data: unknown) => structuredClone(data),
-      shouldDehydrateQuery: defaultShouldDehydrateQuery,
-    },
-    queryClient,
+    dehydrateOptions: { shouldDehydrateQuery: defaultShouldDehydrateQuery },
+    queryClient: application.queryClient,
     router,
   })
+  const nativeDehydrate:
+    | (() => RouterSnapshot | undefined | Promise<RouterSnapshot | undefined>)
+    | undefined = router.options.dehydrate
+  if (nativeDehydrate !== undefined) {
+    router.options.dehydrate = async () => {
+      const snapshot = await nativeDehydrate()
+      return snapshot === undefined ? undefined : await prepareSnapshot(snapshot, codecs.encode)
+    }
+  }
+  const nativeHydrate = router.options.hydrate
+  if (nativeHydrate !== undefined) {
+    router.options.hydrate = async (snapshot: RouterSnapshot) => {
+      await nativeHydrate(await prepareSnapshot(snapshot, codecs.decode))
+    }
+  }
 }
diff --git a/examples/tanstack-start/src/lib/server-application.ts b/examples/tanstack-start/src/lib/server-application.ts
new file mode 100644
index 0000000..40cda34
--- /dev/null
+++ b/examples/tanstack-start/src/lib/server-application.ts
@@ -0,0 +1,53 @@
+import type { ExampleHost } from '@effect-api-query/server/web-handler'
+import { Effect, Exit, Scope } from 'effect'
+
+import { reportCleanupFailure, startTanStackStartApplication } from './application.ts'
+
+export const startServerApplication = async ({
+  host,
+  identity = 'example',
+  authorization,
+  signal,
+}: {
+  readonly host: ExampleHost
+  readonly identity?: string
+  readonly authorization: string | undefined
+  readonly signal?: AbortSignal
+}) => {
+  signal?.throwIfAborted()
+  const scope = Scope.makeUnsafe()
+  try {
+    const client = await Effect.runPromise(
+      host.makeRpcClient(authorization).pipe(Scope.provide(scope)),
+    )
+    const application = await startTanStackStartApplication({
+      rpcUrl: 'http://example.local/rpc',
+      identity,
+      httpAuthorization: authorization ?? '',
+      fetch: async (input, init) => host.handleRequest(new Request(input, init)),
+      rpcClient: {
+        client,
+        runPromiseExit: Effect.runPromiseExit,
+        dispose: async () => Effect.runPromise(Scope.close(scope, Exit.void)),
+      },
+    })
+    const dispose = () => {
+      void reportCleanupFailure(application.dispose())
+    }
+    signal?.addEventListener('abort', dispose, { once: true })
+    if (signal?.aborted === true) {
+      await application.dispose()
+      signal.throwIfAborted()
+    }
+    return {
+      ...application,
+      dispose: async () => {
+        signal?.removeEventListener('abort', dispose)
+        await application.dispose()
+      },
+    }
+  } catch (error) {
+    await Effect.runPromise(Scope.close(scope, Exit.void))
+    throw error
+  }
+}
diff --git a/examples/tanstack-start/src/lib/server-host.ts b/examples/tanstack-start/src/lib/server-host.ts
new file mode 100644
index 0000000..4ab812c
--- /dev/null
+++ b/examples/tanstack-start/src/lib/server-host.ts
@@ -0,0 +1,26 @@
+import '@tanstack/react-start/server-only'
+import { makeExampleHost } from '@effect-api-query/server/web-handler'
+import { Effect, Exit, Scope } from 'effect'
+
+import { reportCleanupFailure } from './application.ts'
+import { startServerApplication } from './server-application.ts'
+
+const scope = Scope.makeUnsafe()
+const host = Effect.runPromise(makeExampleHost().pipe(Scope.provide(scope)))
+let disposal: Promise<void> | undefined
+
+if (import.meta.hot !== undefined) {
+  import.meta.hot.dispose(() => {
+    disposal ??= Effect.runPromise(Scope.close(scope, Exit.void))
+    void reportCleanupFailure(disposal)
+  })
+}
+
+export const getExampleHost = async () => host
+
+export const startRequestApplication = async (request: Request) =>
+  startServerApplication({
+    host: await host,
+    authorization: request.headers.get('x-example-authorization') ?? 'allowed',
+    signal: request.signal,
+  })
diff --git a/examples/tanstack-start/src/lib/snapshot-preparation.ts b/examples/tanstack-start/src/lib/snapshot-preparation.ts
new file mode 100644
index 0000000..2c2b6f2
--- /dev/null
+++ b/examples/tanstack-start/src/lib/snapshot-preparation.ts
@@ -0,0 +1,122 @@
+import { CommandStatus, DiagnosticStatus, User, UserPage } from '@effect-api-query/contracts'
+import { hashKey } from '@tanstack/react-query'
+import type { DehydratedState, QueryKey } from '@tanstack/react-query'
+import { Context, Effect, Schema } from 'effect'
+
+import type { TanStackStartApplication } from './application.ts'
+
+export interface SnapshotPreparation {
+  readonly beforeEncode: Effect.Effect<void>
+  readonly beforeDecode: Effect.Effect<void>
+}
+
+type SnapshotEncodingService = Pick<SnapshotPreparation, 'beforeEncode'>
+const SnapshotEncoding = Context.Service<SnapshotEncodingService>('Start/SnapshotEncoding')
+type SnapshotDecodingService = Pick<SnapshotPreparation, 'beforeDecode'>
+const SnapshotDecoding = Context.Service<SnapshotDecodingService>('Start/SnapshotDecoding')
+
+const prepared = <S extends Schema.Codec<unknown, unknown>>(schema: S) =>
+  schema.pipe(
+    Schema.middlewareEncoding<S, SnapshotEncodingService>((encoding) =>
+      SnapshotEncoding.pipe(
+        Effect.flatMap(({ beforeEncode }) => beforeEncode.pipe(Effect.andThen(encoding))),
+      ),
+    ),
+    Schema.middlewareDecoding((decoding) =>
+      SnapshotDecoding.pipe(
+        Effect.flatMap(({ beforeDecode }) => beforeDecode.pipe(Effect.andThen(decoding))),
+      ),
+    ),
+  )
+
+const Users = prepared(Schema.Array(User))
+const SingleUser = prepared(User)
+const Pages = prepared(
+  Schema.Struct({ pages: Schema.Array(UserPage), pageParams: Schema.Array(Schema.Int) }),
+)
+const Status = prepared(DiagnosticStatus)
+const Command = prepared(Schema.NullOr(CommandStatus))
+const Text = prepared(Schema.String)
+const History = prepared(Schema.Array(Schema.String))
+
+export interface SnapshotCodecs {
+  readonly encode: (queries: DehydratedState['queries']) => Promise<DehydratedState['queries']>
+  readonly decode: (queries: DehydratedState['queries']) => Promise<DehydratedState['queries']>
+}
+
+export const makeSnapshotPreparation = (
+  { rpcQuery, httpQuery, runPreparation }: TanStackStartApplication,
+  services: SnapshotPreparation,
+): SnapshotCodecs => {
+  const codecs = [
+    { prefix: rpcQuery.users.list.queryKey(), codec: Users },
+    { prefix: httpQuery.users.list.queryKey(), codec: Users },
+    { prefix: [...rpcQuery.users.get.key(), 'query'], codec: SingleUser },
+    { prefix: [...httpQuery.users.get.key(), 'query'], codec: SingleUser },
+    { prefix: [...rpcQuery.users.page.key(), 'infinite'], codec: Pages },
+    { prefix: [...httpQuery.users.page.key(), 'infinite'], codec: Pages },
+    { prefix: rpcQuery.diagnostics.status.queryKey(), codec: Status },
+    { prefix: httpQuery.diagnostics.status.queryKey(), codec: Status },
+    { prefix: [...rpcQuery.diagnostics.operationStatus.key(), 'query'], codec: Status },
+    { prefix: [...httpQuery.diagnostics.operationStatus.key(), 'query'], codec: Status },
+    { prefix: [...rpcQuery.commands.status.key(), 'query'], codec: Command },
+    { prefix: [...rpcQuery.diagnostics.slow.key(), 'query'], codec: Text },
+    { prefix: [...httpQuery.diagnostics.slow.key(), 'query'], codec: Text },
+    { prefix: [...rpcQuery.diagnostics.stream.key(), 'live'], codec: Text },
+    { prefix: [...rpcQuery.diagnostics.stream.key(), 'streamed'], codec: History },
+  ].map(({ prefix, codec }) => ({
+    length: prefix.length,
+    hash: hashKey(prefix),
+    encode: Schema.encodeUnknownEffect(codec),
+    decode: Schema.decodeUnknownEffect(codec),
+  }))
+  type ViewCodec = (typeof codecs)[number]
+  const codecsByLength = new Map<number, Map<string, ViewCodec>>()
+  for (const codec of codecs) {
+    const lengthCodecs = codecsByLength.get(codec.length) ?? new Map<string, ViewCodec>()
+    lengthCodecs.set(codec.hash, codec)
+    codecsByLength.set(codec.length, lengthCodecs)
+  }
+  const codecFor = (key: QueryKey) => {
+    let codec: ViewCodec | undefined
+    for (const [length, lengthCodecs] of codecsByLength) {
+      codec = lengthCodecs.get(hashKey(key.slice(0, length)))
+      if (codec !== undefined) {
+        break
+      }
+    }
+    return codec
+  }
+  type SnapshotData = DehydratedState['queries'][number]['state']['data']
+  const transform = <R>(
+    queries: DehydratedState['queries'],
+    convert: (
+      codec: ViewCodec,
+      data: SnapshotData,
+    ) => Effect.Effect<SnapshotData, Schema.SchemaError, R>,
+  ) =>
+    Effect.forEach(
+      Effect.fnUntraced(function* (query: DehydratedState['queries'][number]) {
+        const codec = codecFor(query.queryKey)
+        if (codec === undefined) {
+          return yield* Effect.die(new TypeError('No Start snapshot codec for query'))
+        }
+        const data = yield* convert(codec, query.state.data)
+        return { ...query, state: { ...query.state, data } }
+      }),
+    )(queries)
+  return {
+    encode: async (queries: DehydratedState['queries']) =>
+      runPreparation(
+        transform(queries, (codec, data) => codec.encode(data)).pipe(
+          Effect.provideService(SnapshotEncoding, services),
+        ),
+      ),
+    decode: async (queries: DehydratedState['queries']) =>
+      runPreparation(
+        transform(queries, (codec, data) => codec.decode(data)).pipe(
+          Effect.provideService(SnapshotDecoding, services),
+        ),
+      ),
+  }
+}
diff --git a/examples/tanstack-start/src/router.tsx b/examples/tanstack-start/src/router.tsx
index d4cdad2..ed0f7ec 100644
--- a/examples/tanstack-start/src/router.tsx
+++ b/examples/tanstack-start/src/router.tsx
@@ -1,15 +1,19 @@
 import { createRouter } from '@tanstack/react-router'
 import type { RouterHistory } from '@tanstack/react-router'
 import { createIsomorphicFn } from '@tanstack/react-start'
+import { getRequest } from '@tanstack/react-start/server'
 
 import { ErrorPage, NotFoundPage, PendingPage } from './components/router-status.tsx'
-import { startTanStackStartApplication } from './lib/application.ts'
+import { reportCleanupFailure, startTanStackStartApplication } from './lib/application.ts'
 import type { TanStackStartApplication } from './lib/application.ts'
 import { setupQuerySsr } from './lib/query-ssr.ts'
+import { startRequestApplication } from './lib/server-host.ts'
+import type { SnapshotPreparation } from './lib/snapshot-preparation.ts'
 import { routeTree } from './routeTree.gen.ts'
 
 export interface RouterOptions {
   readonly history?: RouterHistory
+  readonly preparation?: SnapshotPreparation
   readonly isServer?: boolean
   readonly scrollRestoration?: boolean
 }
@@ -25,7 +29,7 @@ const registerBrowserDisposal = (application: TanStackStartApplication): void =>
     return
   }
   const dispose = () => {
-    void application.dispose()
+    void reportCleanupFailure(application.dispose())
   }
   window.addEventListener('pagehide', dispose, { once: true })
 }
@@ -54,7 +58,7 @@ export const createTanStackStartRouter = async (options: CreateTanStackStartRout
     scrollRestoration,
   })
 
-  setupQuerySsr(router, application.queryClient)
+  setupQuerySsr(router, application, options.preparation)
 
   if (router.isServer) {
     router.serverSsrLifecycle = {
@@ -63,7 +67,7 @@ export const createTanStackStartRouter = async (options: CreateTanStackStartRout
         ...(router.serverSsrLifecycle?.onServerSsrAttach ?? []),
         (serverSsr) => {
           serverSsr.onCleanup(() => {
-            void application.dispose()
+            void reportCleanupFailure(application.dispose())
           })
         },
       ],
@@ -75,24 +79,12 @@ export const createTanStackStartRouter = async (options: CreateTanStackStartRout
   return router
 }
 
-const rpcUrl = createIsomorphicFn()
-  .server(() => {
-    const origin = new URL(process.env['EXAMPLE_API_ORIGIN'] ?? 'http://127.0.0.1:3000')
-    if (
-      !['http:', 'https:'].includes(origin.protocol) ||
-      origin.username !== '' ||
-      origin.password !== '' ||
-      origin.pathname !== '/' ||
-      origin.search !== '' ||
-      origin.hash !== ''
-    ) {
-      throw new Error('EXAMPLE_API_ORIGIN must be an HTTP(S) origin without credentials')
-    }
-    return new URL('/rpc', origin).href
-  })
-  .client(() => '/rpc')
+const startApplication = createIsomorphicFn()
+  .server(async () => startRequestApplication(getRequest()))
+  .client(async () => startTanStackStartApplication({ rpcUrl: '/rpc' }))
 
-export const getRouter = async () => createTanStackStartRouter({ rpcUrl: rpcUrl() })
+export const getRouter = async () =>
+  createTanStackStartRouter({ application: await startApplication() })
 
 declare module '@tanstack/react-router' {
   interface Register {
diff --git a/examples/tanstack-start/src/routes/diagnostics.tsx b/examples/tanstack-start/src/routes/diagnostics.tsx
index 2773ed8..bdb76d2 100644
--- a/examples/tanstack-start/src/routes/diagnostics.tsx
+++ b/examples/tanstack-start/src/routes/diagnostics.tsx
@@ -1,13 +1,13 @@
 import { useMutation } from '@tanstack/react-query'
 import { createFileRoute } from '@tanstack/react-router'
 
-import { ActionButton } from '../components/action-button.tsx'
-import { EffectErrorDetails } from '../components/effect-error-details.tsx'
-import { PageLayout, Panel } from '../components/page-layout.tsx'
 import {
   describeSlowQueryCancellation,
   useSlowQueryCancellation,
-} from '../hooks/use-slow-query-cancellation.ts'
+} from '../../../shared/use-slow-query-cancellation.ts'
+import { ActionButton } from '../components/action-button.tsx'
+import { EffectErrorDetails } from '../components/effect-error-details.tsx'
+import { PageLayout, Panel } from '../components/page-layout.tsx'
 
 const DiagnosticsPage = () => {
   const application = Route.useRouteContext()
diff --git a/examples/tanstack-start/src/routes/failure.tsx b/examples/tanstack-start/src/routes/failure.tsx
index 763b5ea..42f57e0 100644
--- a/examples/tanstack-start/src/routes/failure.tsx
+++ b/examples/tanstack-start/src/routes/failure.tsx
@@ -30,8 +30,6 @@ export const Route = createFileRoute('/failure')({
   loader: async ({ context }) => {
     try {
       await context.queryClient.query(context.rpcQuery.diagnostics.fail.queryOptions())
-    } catch {
-      // Query state retains the error for rendering.
-    }
+    } catch {}
   },
 })
diff --git a/examples/tanstack-start/src/routes/http-failure.tsx b/examples/tanstack-start/src/routes/http-failure.tsx
index c1b4468..1650b57 100644
--- a/examples/tanstack-start/src/routes/http-failure.tsx
+++ b/examples/tanstack-start/src/routes/http-failure.tsx
@@ -30,8 +30,6 @@ export const Route = createFileRoute('/http-failure')({
   loader: async ({ context }) => {
     try {
       await context.queryClient.query(context.httpQuery.diagnostics.fail.queryOptions())
-    } catch {
-      // Query state retains the error for rendering.
-    }
+    } catch {}
   },
 })
diff --git a/examples/tanstack-start/src/routes/http.tsx b/examples/tanstack-start/src/routes/http.tsx
index fb0b11d..09ec8a2 100644
--- a/examples/tanstack-start/src/routes/http.tsx
+++ b/examples/tanstack-start/src/routes/http.tsx
@@ -3,13 +3,13 @@ import { createFileRoute } from '@tanstack/react-router'
 import { useState } from 'react'
 import type { SubmitEvent } from 'react'
 
-import { ActionButton } from '../components/action-button.tsx'
-import { EffectErrorDetails } from '../components/effect-error-details.tsx'
-import { PageLayout } from '../components/page-layout.tsx'
 import {
   describeSlowQueryCancellation,
   useSlowQueryCancellation,
-} from '../hooks/use-slow-query-cancellation.ts'
+} from '../../../shared/use-slow-query-cancellation.ts'
+import { ActionButton } from '../components/action-button.tsx'
+import { EffectErrorDetails } from '../components/effect-error-details.tsx'
+import { PageLayout } from '../components/page-layout.tsx'
 import type { TanStackStartApplication } from '../lib/application.ts'
 
 const userPagesOptions = (httpQuery: TanStackStartApplication['httpQuery']) =>
@@ -211,13 +211,13 @@ const HttpPagination = ({
   readonly httpQuery: TanStackStartApplication['httpQuery']
 }) => {
   const pages = useInfiniteQuery(userPagesOptions(httpQuery))
-  const loaded = pages.data?.pages.flatMap((page) => page.users) ?? []
+  const loaded = pages.data?.pages.reduce((count, page) => count + page.users.length, 0) ?? 0
 
   return (
     <div className="space-y-4 border border-border bg-background p-5">
       <h2 className="text-xl font-bold">HTTP pagination</h2>
       <p>
-        HTTP: {String(loaded.length)} of {String(pages.data?.pages[0]?.total ?? 0)} loaded
+        HTTP: {String(loaded)} of {String(pages.data?.pages[0]?.total ?? 0)} loaded
       </p>
       <ol className="grid gap-3">
         {pages.data?.pages.map((page, index) => (
diff --git a/examples/tanstack-start/src/routes/index.tsx b/examples/tanstack-start/src/routes/index.tsx
index b2efaf9..5a42890 100644
--- a/examples/tanstack-start/src/routes/index.tsx
+++ b/examples/tanstack-start/src/routes/index.tsx
@@ -6,7 +6,6 @@ import { ActionButton } from '../components/action-button.tsx'
 import { ConditionalUserQuery } from '../components/conditional-user-query.tsx'
 import { PageLayout, Panel } from '../components/page-layout.tsx'
 import type { TanStackStartApplication } from '../lib/application.ts'
-import { fetchStreamSnapshot } from '../lib/query-ssr.ts'
 
 const PAGE_SIZE = 4
 
@@ -43,16 +42,14 @@ const UsersPage = () => {
     setBoundedHistory(bounded)
     try {
       await queryClient.query(streamedDiagnosticsOptions(rpcQuery, bounded))
-    } catch {
-      // Query state retains the error for rendering.
-    }
+    } catch {}
   }
   const liveDiagnostic = useSuspenseQuery(liveDiagnosticOptions(rpcQuery))
   const userPages = useInfiniteQuery(userPagesOptions(rpcQuery))
-  const loadedUsers = userPages.data?.pages.flatMap((page) => page.users) ?? []
+  const loaded = userPages.data?.pages.reduce((count, page) => count + page.users.length, 0) ?? 0
   const totalUsers = userPages.data?.pages[0]?.total ?? 0
   const pageCount = userPages.data?.pages.length ?? 0
-  const remainingUsers = Math.max(0, totalUsers - loadedUsers.length)
+  const remainingUsers = Math.max(0, totalUsers - loaded)
   const nextPageSize = Math.min(PAGE_SIZE, remainingUsers)
   let nextPageLabel = 'All users loaded'
   if (userPages.hasNextPage) {
@@ -148,7 +145,7 @@ const UsersPage = () => {
               replacing the pages already in the cache.
             </p>
             <span className="border border-brand-800 bg-brand-950/80 px-3 py-1 text-sm font-bold text-brand-200">
-              {String(loadedUsers.length)} of {String(totalUsers)} loaded
+              {String(loaded)} of {String(totalUsers)} loaded
             </span>
           </div>
           <ol className="mt-4 grid gap-3 p-0">
@@ -281,8 +278,8 @@ export const Route = createFileRoute('/')({
         ...userPagesOptions(context.rpcQuery),
         staleTime: 'static',
       }),
-      fetchStreamSnapshot(context.queryClient, streamedDiagnosticsOptions(context.rpcQuery)),
-      fetchStreamSnapshot(context.queryClient, liveDiagnosticOptions(context.rpcQuery)),
+      context.captureSnapshot(context.queryClient, streamedDiagnosticsOptions(context.rpcQuery)),
+      context.captureSnapshot(context.queryClient, liveDiagnosticOptions(context.rpcQuery)),
     ])
   },
 })
diff --git a/examples/tanstack-start/src/styles.css b/examples/tanstack-start/src/styles.css
index 11f85ee..9da6004 100644
--- a/examples/tanstack-start/src/styles.css
+++ b/examples/tanstack-start/src/styles.css
@@ -1,64 +1,2 @@
 @import 'tailwindcss';
-
-/* Semantic aliases preserve the examples' existing dark palette. */
-@theme inline {
-  --tracking-display: -0.04em;
-  --color-destructive-600: var(--color-red-600);
-  --color-background: #000;
-  --color-primary-foreground: #fff;
-  --color-card: #111113;
-  --color-shadow: #000;
-  --color-foreground: var(--color-zinc-50);
-  --color-text-primary: var(--color-zinc-100);
-  --color-text-secondary: var(--color-zinc-200);
-  --color-text-tertiary: var(--color-zinc-300);
-  --color-muted-foreground: var(--color-zinc-400);
-  --color-text-subtle: var(--color-zinc-500);
-  --color-placeholder: var(--color-zinc-600);
-  --color-border-strong: var(--color-zinc-700);
-  --color-border: var(--color-zinc-800);
-  --color-border-subtle: var(--color-zinc-900);
-  --color-muted: var(--color-zinc-900);
-  --color-brand-200: var(--color-violet-200);
-  --color-brand-300: var(--color-violet-300);
-  --color-brand-400: var(--color-violet-400);
-  --color-brand-500: var(--color-violet-500);
-  --color-brand-600: var(--color-violet-600);
-  --color-brand-800: var(--color-violet-800);
-  --color-brand-900: var(--color-violet-900);
-  --color-brand-950: var(--color-violet-950);
-  --color-destructive-200: var(--color-red-200);
-  --color-destructive-800: var(--color-red-800);
-  --color-destructive-900: var(--color-red-900);
-  --color-destructive-950: var(--color-red-950);
-}
-
-@layer base {
-  :root {
-    --app-black: #050505;
-    --app-purple: #7c3aed;
-    --app-text: #fafafa;
-    color-scheme: dark;
-    font-family: 'Avenir Next', Avenir, 'Segoe UI Variable', 'Segoe UI', sans-serif;
-  }
-
-  body {
-    background: var(--app-black);
-  }
-
-  ::selection {
-    background: var(--app-purple);
-    color: var(--app-text);
-  }
-}
-
-@layer components {
-  .app-backdrop {
-    background: var(--app-black);
-  }
-
-  .display-heading {
-    font-family: 'Avenir Next', Avenir, 'Segoe UI Variable', 'Segoe UI', sans-serif;
-    text-wrap: balance;
-  }
-}
+@import '../../shared/theme.css';
diff --git a/examples/tanstack-start/tests/application.test.ts b/examples/tanstack-start/tests/application.test.ts
index b70ca41..8766b71 100644
--- a/examples/tanstack-start/tests/application.test.ts
+++ b/examples/tanstack-start/tests/application.test.ts
@@ -1,5 +1,8 @@
+import { User } from '@effect-api-query/contracts'
+import type { ExampleRpcClient } from '@effect-api-query/contracts/client'
 import { startExampleRpcServer } from '@effect-api-query/server'
-import { Effect, Exit, Scope } from 'effect'
+import { MutationObserver } from '@tanstack/react-query'
+import { Deferred, Effect, Exit, Scope, Stream } from 'effect'
 import { afterEach, beforeEach, describe, expect, it } from 'vite-plus/test'
 
 import { startTanStackStartApplication } from '../src/lib/application.ts'
@@ -113,3 +116,149 @@ describe('TanStack Start HTTP request ownership', () => {
     }
   })
 })
+
+describe('TanStack Start execution settlement', () => {
+  it.each(['unary', 'stream'] as const)(
+    'drains ordinary %s query finalizers before disposing ready clients',
+    async (view) => {
+      const entered = Deferred.makeUnsafe<undefined>()
+      const closing = Deferred.makeUnsafe<undefined>()
+      const release = Deferred.makeUnsafe<undefined>()
+      const events: string[] = []
+      const cleanup = Deferred.succeed(closing, undefined).pipe(
+        Effect.andThen(Deferred.await(release)),
+        Effect.andThen(Effect.sync(() => events.push('finalized'))),
+      )
+      const source =
+        view === 'unary'
+          ? Deferred.succeed(entered, undefined).pipe(
+              Effect.andThen(Effect.never),
+              Effect.ensuring(cleanup),
+            )
+          : Stream.fromEffect(Deferred.succeed(entered, undefined).pipe(Effect.as('ready'))).pipe(
+              Stream.concat(Stream.never),
+              Stream.ensuring(cleanup),
+            )
+      const application = await startTanStackStartApplication({
+        rpcUrl: 'http://example.test/rpc',
+        rpcClient: {
+          // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+          client: (() => source) as ExampleRpcClient,
+          runPromiseExit: Effect.runPromiseExit,
+          dispose: async () => {
+            events.push('disposed')
+            await Promise.resolve()
+          },
+        },
+      })
+      const options =
+        view === 'unary'
+          ? application.rpcQuery.diagnostics.slow.queryOptions({
+              input: { durationMs: 60_000, operationId: 'disposal' },
+            })
+          : application.rpcQuery.diagnostics.stream.streamedOptions()
+      const pending =
+        view === 'unary'
+          ? application.queryClient.query(
+              application.rpcQuery.diagnostics.slow.queryOptions({
+                input: { durationMs: 60_000, operationId: 'disposal' },
+              }),
+            )
+          : application.queryClient.query(application.rpcQuery.diagnostics.stream.streamedOptions())
+      const outcome = Promise.allSettled([pending])
+      try {
+        await Effect.runPromise(Deferred.await(entered))
+        const disposal = application.dispose()
+        await Effect.runPromise(Deferred.await(closing))
+        await Effect.runPromise(Effect.sleep('20 millis'))
+        expect(events).toStrictEqual([])
+        await Effect.runPromise(Deferred.succeed(release, undefined))
+        await disposal
+        await outcome
+        expect(events).toStrictEqual(['finalized', 'disposed'])
+        await expect(
+          application.queryClient.query({
+            queryKey: options.queryKey,
+            queryFn: async () => await Promise.resolve('late'),
+          }),
+        ).rejects.toMatchObject({ name: 'AbortError' })
+        expect(events).toStrictEqual(['finalized', 'disposed'])
+      } finally {
+        await Effect.runPromise(Deferred.succeed(release, undefined))
+        await application.dispose()
+        await outcome
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'drains an accepted %s mutation without cancelling its work',
+    async (adapter) => {
+      const entered = Deferred.makeUnsafe<undefined>()
+      const release = Deferred.makeUnsafe<User>()
+      const events: string[] = []
+      const mutation = Deferred.succeed(entered, undefined).pipe(
+        Effect.andThen(Deferred.await(release)),
+        Effect.tap(() => Effect.sync(() => events.push('completed'))),
+      )
+      const application = await startTanStackStartApplication({
+        rpcUrl: 'http://example.test/rpc',
+        rpcClient: {
+          // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+          client: (() => mutation) as ExampleRpcClient,
+          runPromiseExit: Effect.runPromiseExit,
+          dispose: async () => {
+            events.push('disposed')
+            await Promise.resolve()
+          },
+        },
+        fetch: async () => {
+          await Effect.runPromise(Deferred.succeed(entered, undefined))
+          const user = await Effect.runPromise(Deferred.await(release))
+          events.push('completed')
+          return Response.json(user)
+        },
+      })
+      const pending =
+        adapter === 'rpc'
+          ? new MutationObserver(
+              application.queryClient,
+              application.rpcQuery.users.create.mutationOptions(),
+            ).mutate({ name: 'Ada' })
+          : new MutationObserver(
+              application.queryClient,
+              application.httpQuery.users.create.mutationOptions(),
+            ).mutate({ payload: { name: 'Ada' } })
+      const outcome = Promise.allSettled([pending])
+      try {
+        await Effect.runPromise(Deferred.await(entered))
+        const disposal = application.dispose()
+        await Effect.runPromise(Effect.sleep('20 millis'))
+        expect(events).toStrictEqual([])
+        const user = new User({ id: 1, name: 'Ada', locale: 'en' })
+        await Effect.runPromise(Deferred.succeed(release, user))
+        await expect(pending).resolves.toStrictEqual(user)
+        await disposal
+        expect(events).toStrictEqual(['completed', 'disposed'])
+        const late =
+          adapter === 'rpc'
+            ? new MutationObserver(
+                application.queryClient,
+                application.rpcQuery.users.create.mutationOptions(),
+              ).mutate({ name: 'late' })
+            : new MutationObserver(
+                application.queryClient,
+                application.httpQuery.users.create.mutationOptions(),
+              ).mutate({ payload: { name: 'late' } })
+        await expect(late).rejects.toMatchObject({ name: 'AbortError' })
+        expect(events).toStrictEqual(['completed', 'disposed'])
+      } finally {
+        await Effect.runPromise(
+          Deferred.succeed(release, new User({ id: 1, name: 'Ada', locale: 'en' })),
+        )
+        await application.dispose()
+        await outcome
+      }
+    },
+  )
+})
diff --git a/examples/tanstack-start/tests/async-hydration.test.ts b/examples/tanstack-start/tests/async-hydration.test.ts
new file mode 100644
index 0000000..a752165
--- /dev/null
+++ b/examples/tanstack-start/tests/async-hydration.test.ts
@@ -0,0 +1,208 @@
+import { User } from '@effect-api-query/contracts'
+import type { DehydratedState } from '@tanstack/react-query'
+import { createMemoryHistory } from '@tanstack/react-router'
+import { attachRouterServerSsrUtils } from '@tanstack/react-start/server'
+import { Deferred, Effect, Exit, Schema, Scope } from 'effect'
+import { describe, expect, it, vi } from 'vite-plus/test'
+
+import { makeExampleHost } from '../../server/src/web-handler.ts'
+import { startServerApplication } from '../src/lib/server-application.ts'
+import { createTanStackStartRouter } from '../src/router.tsx'
+
+interface RouterSnapshot {
+  readonly query?: {
+    readonly initial?: DehydratedState['queries']
+    readonly stream: ReadableStream<DehydratedState['queries']>
+  }
+}
+
+describe('Start snapshot preparation', () => {
+  it('finishes application encoding before publication and decoding before native hydration', async () => {
+    const scope = Scope.makeUnsafe()
+    const encodingStarted = Deferred.makeUnsafe<undefined>()
+    const decodingStarted = Deferred.makeUnsafe<undefined>()
+    const encode = Deferred.makeUnsafe<undefined>()
+    const decode = Deferred.makeUnsafe<undefined>()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(scope)))
+    const server = await startServerApplication({ host, authorization: 'allowed' })
+    const browser = await startServerApplication({ host, authorization: 'allowed' })
+    try {
+      const serverRouter = await createTanStackStartRouter({
+        application: server,
+        scrollRestoration: false,
+        preparation: {
+          beforeEncode: Deferred.succeed(encodingStarted, undefined).pipe(
+            Effect.andThen(Deferred.await(encode)),
+          ),
+          beforeDecode: Effect.void,
+        },
+        history: createMemoryHistory({ initialEntries: ['/'] }),
+      })
+      attachRouterServerSsrUtils({ manifest: undefined, router: serverRouter })
+      await serverRouter.load()
+      let published = false
+      const dehydrate:
+        | (() => RouterSnapshot | undefined | Promise<RouterSnapshot | undefined>)
+        | undefined = serverRouter.options.dehydrate
+      const publication = Promise.resolve(dehydrate?.()).then((value) => {
+        published = true
+        return value
+      })
+      await Effect.runPromise(Deferred.await(encodingStarted))
+      expect(published).toBe(false)
+      await Effect.runPromise(Deferred.succeed(encode, undefined))
+      const snapshot = await publication
+      if (snapshot?.query?.initial === undefined) {
+        throw new Error('Snapshot was not published')
+      }
+      serverRouter.serverSsr?.setRenderFinished()
+      vi.stubGlobal('window', Object.assign(new EventTarget(), { origin: 'http://localhost' }))
+      const browserRouter = await createTanStackStartRouter({
+        application: browser,
+        scrollRestoration: false,
+        preparation: {
+          beforeEncode: Effect.void,
+          beforeDecode: Deferred.succeed(decodingStarted, undefined).pipe(
+            Effect.andThen(Deferred.await(decode)),
+          ),
+        },
+        isServer: false,
+        history: createMemoryHistory({ initialEntries: ['/'] }),
+      })
+      const json = JSON.stringify(snapshot.query.initial)
+      const initial = Schema.decodeUnknownSync(Schema.Array(Schema.Unknown))(JSON.parse(json))
+      const hydration = browserRouter.options.hydrate?.({
+        ...snapshot,
+        query: {
+          ...snapshot.query,
+          initial,
+        },
+      })
+      await Effect.runPromise(Deferred.await(decodingStarted))
+      expect(
+        browser.queryClient.getQueryData(browser.rpcQuery.users.list.queryKey()),
+      ).toBeUndefined()
+      await Effect.runPromise(Deferred.succeed(decode, undefined))
+      await hydration
+      const users = browser.queryClient.getQueryData(browser.rpcQuery.users.list.queryKey())
+      expect(users?.[0]).toBeInstanceOf(User)
+      expect(users?.[0]?.name).toBe('Ada Lovelace')
+      expect(
+        browser.queryClient.getQueryData(
+          browser.rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 }),
+        ),
+      ).toMatchObject({ pageParams: [0], pages: [{ total: 12 }] })
+      serverRouter.serverSsr?.cleanup()
+    } finally {
+      vi.unstubAllGlobals()
+      await Promise.all([server.dispose(), browser.dispose()])
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+
+  it('rejects malformed later data before hydrating any earlier query', async () => {
+    const scope = Scope.makeUnsafe()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(scope)))
+    const server = await startServerApplication({ host, authorization: 'allowed' })
+    const browser = await startServerApplication({ host, authorization: 'allowed' })
+    try {
+      const serverRouter = await createTanStackStartRouter({
+        application: server,
+        history: createMemoryHistory({ initialEntries: ['/'] }),
+        scrollRestoration: false,
+      })
+      attachRouterServerSsrUtils({ manifest: undefined, router: serverRouter })
+      await serverRouter.load()
+      const dehydrate:
+        | (() => RouterSnapshot | undefined | Promise<RouterSnapshot | undefined>)
+        | undefined = serverRouter.options.dehydrate
+      const snapshot = await dehydrate?.()
+      if (snapshot?.query?.initial === undefined) {
+        throw new Error('Snapshot was not published')
+      }
+      serverRouter.serverSsr?.setRenderFinished()
+      const lastIndex = snapshot.query.initial.length - 1
+      const initial = snapshot.query.initial.map((query, index) =>
+        index === lastIndex
+          ? { ...query, state: { ...query.state, data: { malformed: true } } }
+          : query,
+      )
+      vi.stubGlobal('window', Object.assign(new EventTarget(), { origin: 'http://localhost' }))
+      const browserRouter = await createTanStackStartRouter({
+        application: browser,
+        isServer: false,
+        history: createMemoryHistory({ initialEntries: ['/'] }),
+        scrollRestoration: false,
+      })
+      await expect(
+        browserRouter.options.hydrate?.({ ...snapshot, query: { ...snapshot.query, initial } }),
+      ).rejects.toMatchObject({ name: 'SchemaError' })
+      expect(browser.queryClient.getQueryCache().getAll()).toHaveLength(0)
+      serverRouter.serverSsr?.cleanup()
+    } finally {
+      vi.unstubAllGlobals()
+      await Promise.all([server.dispose(), browser.dispose()])
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+
+  it('interrupts codec preparation and finishes its finalizers before releasing request clients', async () => {
+    const scope = Scope.makeUnsafe()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(scope)))
+    const started = Deferred.makeUnsafe<undefined>()
+    const permit = Deferred.makeUnsafe<undefined>()
+    const events: string[] = []
+    const application = await startServerApplication({
+      host: {
+        ...host,
+        makeRpcClient: Effect.fnUntraced(function* (authorization: string | undefined) {
+          yield* Effect.addFinalizer(() =>
+            Effect.sync(() => {
+              events.push('clients-released')
+            }),
+          )
+          return yield* host.makeRpcClient(authorization)
+        }),
+      },
+      authorization: 'allowed',
+    })
+    let publishing: Promise<unknown> | undefined
+    try {
+      const router = await createTanStackStartRouter({
+        application,
+        history: createMemoryHistory({ initialEntries: ['/'] }),
+        scrollRestoration: false,
+        preparation: {
+          beforeEncode: Effect.scoped(
+            Effect.acquireRelease(Deferred.succeed(started, undefined), () =>
+              Effect.sync(() => {
+                events.push('codec-released')
+              }),
+            ).pipe(Effect.andThen(Deferred.await(permit))),
+          ),
+          beforeDecode: Effect.void,
+        },
+      })
+      attachRouterServerSsrUtils({ manifest: undefined, router })
+      await router.load()
+      publishing = (async () => {
+        try {
+          await router.options.dehydrate?.()
+          return null
+        } catch (error) {
+          return error
+        }
+      })()
+      await Effect.runPromise(Deferred.await(started))
+      await application.dispose()
+      expect(events).toStrictEqual(['codec-released', 'clients-released'])
+      await expect(publishing).resolves.not.toBeNull()
+      router.serverSsr?.cleanup()
+    } finally {
+      await Effect.runPromise(Deferred.succeed(permit, undefined))
+      await publishing
+      await application.dispose()
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+})
diff --git a/examples/tanstack-start/tests/client-navigation.test.tsx b/examples/tanstack-start/tests/client-navigation.test.tsx
index 525de56..f991f75 100644
--- a/examples/tanstack-start/tests/client-navigation.test.tsx
+++ b/examples/tanstack-start/tests/client-navigation.test.tsx
@@ -30,7 +30,6 @@ describe('TanStack Start hydration and client navigation', () => {
     }
   })
 
-  // Hydration, streaming, two navigations, and a mutation share the test deadline.
   it('hydrates without a duplicate query, navigates, mutates, and invalidates', async () => {
     if (serverScope === undefined) {
       throw new Error('Server scope was not initialized')
diff --git a/examples/tanstack-start/tests/server-local.test.ts b/examples/tanstack-start/tests/server-local.test.ts
new file mode 100644
index 0000000..56828ca
--- /dev/null
+++ b/examples/tanstack-start/tests/server-local.test.ts
@@ -0,0 +1,233 @@
+import { createMemoryHistory } from '@tanstack/react-router'
+import { Effect, Exit, Scope } from 'effect'
+import { afterEach, describe, expect, it, vi } from 'vite-plus/test'
+
+import { makeExampleHost } from '../../server/src/web-handler.ts'
+import type { TanStackStartApplication } from '../src/lib/application.ts'
+import { startServerApplication } from '../src/lib/server-application.ts'
+import { createTanStackStartRouter } from '../src/router.tsx'
+
+describe('Start request-local execution', () => {
+  const applications: TanStackStartApplication[] = []
+  const scope = Scope.makeUnsafe()
+
+  afterEach(async () => {
+    await Promise.all(applications.splice(0).map(async ({ dispose }) => dispose()))
+    vi.unstubAllGlobals()
+  })
+
+  it('rejects RPC page inputs that cannot advance through the directory', async () => {
+    const ownerScope = Scope.makeUnsafe()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(ownerScope)))
+    const application = await startServerApplication({ host, authorization: 'allowed' })
+    try {
+      for (const input of [
+        { cursor: -1, pageSize: 4 },
+        { cursor: 0, pageSize: 0 },
+        { cursor: 0, pageSize: 101 },
+      ]) {
+        expect(() => application.rpcQuery.users.page.queryOptions({ input })).toThrow(
+          'Could not construct the payload for RPC users.page',
+        )
+      }
+      await expect(
+        application.queryClient.query(
+          application.rpcQuery.users.page.queryOptions({ input: { cursor: 0, pageSize: 1 } }),
+        ),
+      ).resolves.toMatchObject({ nextCursor: 1, total: 12, users: [{ id: 1 }] })
+      await expect(
+        application.queryClient.query(
+          application.rpcQuery.users.page.queryOptions({ input: { cursor: 0, pageSize: 100 } }),
+        ),
+      ).resolves.toMatchObject({ nextCursor: null, total: 12 })
+      expect(application.queryClient.getQueryCache().getAll()).toHaveLength(2)
+    } finally {
+      await application.dispose()
+      await Effect.runPromise(Scope.close(ownerScope, Exit.void))
+    }
+  })
+
+  it('renders shared host state without network calls and isolates request authority', async () => {
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async () => {
+        await Effect.runPromise(Effect.yieldNow)
+        throw new Error('Unexpected network request')
+      }),
+    )
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(scope)))
+    try {
+      const allowed = await startServerApplication({
+        host,
+        identity: 'reader',
+        authorization: 'allowed',
+      })
+      const denied = await startServerApplication({
+        host,
+        identity: 'restricted',
+        authorization: 'denied',
+      })
+      applications.push(allowed, denied)
+      const create = allowed.rpcQuery.users.create.mutationOptions().mutationFn
+      if (create === undefined) {
+        throw new Error('Mutation function is missing')
+      }
+      await create({ name: 'Shared SSR user' })
+      const router = await createTanStackStartRouter({
+        application: allowed,
+        history: createMemoryHistory({ initialEntries: ['/'] }),
+      })
+      await router.load()
+      expect(allowed.queryClient.getQueryData(allowed.rpcQuery.users.list.queryKey())).toHaveLength(
+        13,
+      )
+      expect(denied.queryClient.getQueryData(denied.rpcQuery.users.list.queryKey())).toBeUndefined()
+      expect(allowed.rpcQuery.users.list.queryKey()).not.toStrictEqual(
+        denied.rpcQuery.users.list.queryKey(),
+      )
+      const remove = denied.rpcQuery.users.delete.mutationOptions({
+        rpcOptions: { headers: { 'x-example-authorization': 'allowed' } },
+      }).mutationFn
+      if (remove === undefined) {
+        throw new Error('Mutation function is missing')
+      }
+      await expect(remove({ id: 1 })).rejects.toMatchObject({ name: 'EffectRpcQueryError' })
+      expect(globalThis.fetch).not.toHaveBeenCalled()
+      await allowed.dispose()
+      await expect(
+        denied.queryClient.query(denied.rpcQuery.users.list.queryOptions()),
+      ).resolves.toHaveLength(13)
+    } finally {
+      await Promise.all(applications.splice(0).map(async ({ dispose }) => dispose()))
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+
+  it('settles an aborted capture before releasing its request clients', async () => {
+    const ownerScope = Scope.makeUnsafe()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(ownerScope)))
+    const events: string[] = []
+    const application = await startServerApplication({
+      host: {
+        ...host,
+        makeRpcClient: Effect.fnUntraced(function* (authorization: string | undefined) {
+          yield* Effect.addFinalizer(() =>
+            Effect.sync(() => {
+              events.push('released')
+            }),
+          )
+          return yield* host.makeRpcClient(authorization)
+        }),
+      },
+      authorization: 'allowed',
+    })
+    try {
+      const capture = application.captureSnapshot(
+        application.queryClient,
+        application.rpcQuery.diagnostics.stream.streamedOptions(),
+      )
+      const failure = (async () => {
+        try {
+          await capture
+          return null
+        } catch (error) {
+          return error
+        } finally {
+          events.push('settled')
+        }
+      })()
+      expect(application.queryClient.isFetching()).toBe(1)
+      await application.dispose()
+      await expect(failure).resolves.toMatchObject({ name: 'AbortError' })
+      expect(events).toStrictEqual(['settled', 'released'])
+      expect(application.queryClient.getQueryCache().hasListeners()).toBe(false)
+      expect(application.queryClient.getQueryCache().getAll()).toHaveLength(0)
+    } finally {
+      await application.dispose()
+      await Effect.runPromise(Scope.close(ownerScope, Exit.void))
+    }
+  })
+
+  it('finishes interrupted local work while another request remains usable', async () => {
+    const ownerScope = Scope.makeUnsafe()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(ownerScope)))
+    const abort = new AbortController()
+    const first = await startServerApplication({
+      host,
+      authorization: 'allowed',
+      signal: abort.signal,
+    })
+    const second = await startServerApplication({ host, authorization: 'allowed' })
+    try {
+      const read = first.queryClient.query(
+        first.rpcQuery.diagnostics.slow.queryOptions({
+          input: {
+            operationId: 'retired-request',
+            durationMs: 60_000,
+          },
+        }),
+      )
+      const rejected = (async () => {
+        await expect(read).rejects.toMatchObject({ message: 'CancelledError' })
+      })()
+      await expect
+        .poll(async () =>
+          second.queryClient.query({
+            ...second.rpcQuery.diagnostics.operationStatus.queryOptions({
+              input: {
+                operationId: 'retired-request',
+              },
+            }),
+            staleTime: 0,
+          }),
+        )
+        .toMatchObject({ started: 1, interrupted: 0 })
+      abort.abort()
+      await first.dispose()
+      await rejected
+      await expect(
+        second.queryClient.query({
+          ...second.rpcQuery.diagnostics.operationStatus.queryOptions({
+            input: {
+              operationId: 'retired-request',
+            },
+          }),
+          staleTime: 0,
+        }),
+      ).resolves.toStrictEqual({ started: 1, interrupted: 1 })
+      await expect(
+        second.queryClient.query(second.httpQuery.users.list.queryOptions()),
+      ).resolves.toHaveLength(12)
+    } finally {
+      await Promise.all([first.dispose(), second.dispose()])
+      await Effect.runPromise(Scope.close(ownerScope, Exit.void))
+    }
+  })
+
+  it('reports aborted request cleanup failures and preserves explicit disposal rejection', async () => {
+    const ownerScope = Scope.makeUnsafe()
+    const host = await Effect.runPromise(makeExampleHost().pipe(Scope.provide(ownerScope)))
+    const abort = new AbortController()
+    const failure = new Error('Request resource finalizer failed')
+    const log = vi.spyOn(console, 'error').mockReturnValue(undefined)
+    const application = await startServerApplication({
+      host: {
+        ...host,
+        makeRpcClient: Effect.fnUntraced(function* (authorization: string | undefined) {
+          yield* Effect.addFinalizer(() => Effect.die(failure))
+          return yield* host.makeRpcClient(authorization)
+        }),
+      },
+      authorization: 'allowed',
+      signal: abort.signal,
+    })
+    try {
+      abort.abort()
+      await expect(application.dispose()).rejects.toBe(failure)
+      expect(log).toHaveBeenCalledWith('Start resource cleanup failed', failure)
+    } finally {
+      log.mockRestore()
+      await Effect.runPromise(Scope.close(ownerScope, Exit.void))
+    }
+  })
+})
diff --git a/examples/tanstack-start/tests/server-render.test.tsx b/examples/tanstack-start/tests/server-render.test.tsx
index 9f6c180..94d1cd5 100644
--- a/examples/tanstack-start/tests/server-render.test.tsx
+++ b/examples/tanstack-start/tests/server-render.test.tsx
@@ -2,13 +2,14 @@ import { startExampleRpcServer } from '@effect-api-query/server'
 import { QueryClient } from '@tanstack/react-query'
 import { createMemoryHistory, RouterProvider } from '@tanstack/react-router'
 import { Deferred, Effect, Exit, Schema, Scope, Stream } from 'effect'
-import { createRpcQueryUtils } from 'effect-api-query'
+import { createRpcQueryUtils, fetchStreamSnapshot } from 'effect-api-query'
 import { Rpc, RpcGroup } from 'effect/rpc'
 import type { RpcClient } from 'effect/rpc'
 import { renderToString } from 'react-dom/server'
 import { afterEach, beforeEach, describe, expect, it } from 'vite-plus/test'
 
-import { fetchStreamSnapshot } from '../src/lib/query-ssr.ts'
+import { fetchStreamSnapshot as captureStreamSnapshot } from '../../../src/index.ts'
+import type { StreamSnapshotOptions } from '../../../src/index.ts'
 import { createTanStackStartRouter } from '../src/router.tsx'
 
 describe('TanStack Start server rendering', () => {
@@ -121,14 +122,12 @@ describe('TanStack Start server rendering', () => {
     async (cached) => {
       const Watch = Rpc.make('diagnostics.watch', { success: Schema.String, stream: true })
       const group = RpcGroup.make(Watch)
-      // Void is the deliberate success channel of this Effect factory.
       // oxlint-disable-next-line typescript/no-invalid-void-type
       const finalized = Deferred.makeUnsafe<void>()
       const source = Stream.make('snapshot').pipe(
         Stream.concat(Stream.fromEffect(Effect.never)),
         Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)),
       )
-      // SAFETY: This group contains only the watch RPC, whose handler always returns the typed source.
       // oxlint-disable-next-line typescript/no-unsafe-type-assertion
       const client = (() => source) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>
       const queryClient = new QueryClient()
@@ -140,7 +139,8 @@ describe('TanStack Start server rendering', () => {
         queryClient.setQueryData(options.queryKey, ['previous'])
       }
 
-      const snapshot = await fetchStreamSnapshot(queryClient, options)
+      const controls: StreamSnapshotOptions = { mode: 'fresh', timeoutMs: 1000 }
+      const snapshot = await captureStreamSnapshot(queryClient, options, controls)
 
       expect(snapshot).toStrictEqual(['snapshot'])
       expect(queryClient.getQueryState(options.queryKey)?.fetchStatus).toBe('idle')
@@ -151,16 +151,13 @@ describe('TanStack Start server rendering', () => {
   it('settles and releases its listener when cancelled before the first streamed value', async () => {
     const Watch = Rpc.make('watch', { success: Schema.String, stream: true })
     const group = RpcGroup.make(Watch)
-    // Void is the deliberate success channel of this Effect factory.
     // oxlint-disable-next-line typescript/no-invalid-void-type
     const started = Deferred.makeUnsafe<void>()
-    // Void is the deliberate success channel of this Effect factory.
     // oxlint-disable-next-line typescript/no-invalid-void-type
     const finalized = Deferred.makeUnsafe<void>()
     const source = Stream.fromEffect(
       Deferred.succeed(started, undefined).pipe(Effect.andThen(Effect.never)),
     ).pipe(Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)))
-    // SAFETY: This group contains only the watch RPC, whose handler always returns the typed source.
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     const client = (() => source) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>
     const queryClient = new QueryClient()
@@ -188,14 +185,12 @@ describe('TanStack Start server rendering', () => {
   it('releases its listener on failure and can take a fresh snapshot after a cached error', async () => {
     const Watch = Rpc.make('watch', { success: Schema.String, stream: true })
     const group = RpcGroup.make(Watch)
-    // Void is the deliberate success channel of this Effect factory.
     // oxlint-disable-next-line typescript/no-invalid-void-type
     const finalized = Deferred.makeUnsafe<void>()
     const source = Stream.make('recovered').pipe(
       Stream.concat(Stream.fromEffect(Effect.never)),
       Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)),
     )
-    // SAFETY: This group contains only the watch RPC, whose handler always returns the typed source.
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     const client = (() => source) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>
     const queryClient = new QueryClient()
diff --git a/examples/tanstack-start/vite.config.ts b/examples/tanstack-start/vite.config.ts
index fb49480..bf20abd 100644
--- a/examples/tanstack-start/vite.config.ts
+++ b/examples/tanstack-start/vite.config.ts
@@ -10,8 +10,6 @@ export default defineConfig({
       configurePreviewServer(server) {
         server.middlewares.use((request, _response, next) => {
           const path = request.url?.split('?')[0] ?? ''
-          // Vite preview compression delays response close listeners until the first write.
-          // Keep disconnect signals live while buffered HTTP and RPC requests are pending.
           if (path.startsWith('/api/') || path === '/rpc' || path === '/rpc/') {
             request.headers['accept-encoding'] = 'identity'
           }
diff --git a/examples/vite-react/src/app.tsx b/examples/vite-react/src/app.tsx
index 243fa1b..a51a393 100644
--- a/examples/vite-react/src/app.tsx
+++ b/examples/vite-react/src/app.tsx
@@ -1,4 +1,5 @@
 import { QueryClientProvider } from '@tanstack/react-query'
+import { useMemo } from 'react'
 
 import { CommandsSection } from './components/sections/commands-section.tsx'
 import { DiagnosticsSection } from './components/sections/diagnostics-section.tsx'
@@ -33,8 +34,14 @@ export const ViteReactExample = ({
   application,
 }: {
   readonly application: ViteReactApplication
-}) => (
-  <QueryClientProvider client={application.queryClient}>
-    <ExampleContent application={application} />
-  </QueryClientProvider>
-)
+}) => {
+  const boundary = useMemo(
+    () => ({ client: application.queryClient, key: globalThis.crypto.randomUUID() }),
+    [application.queryClient],
+  )
+  return (
+    <QueryClientProvider key={boundary.key} client={boundary.client}>
+      <ExampleContent application={application} />
+    </QueryClientProvider>
+  )
+}
diff --git a/examples/vite-react/src/components/sections/commands-section.tsx b/examples/vite-react/src/components/sections/commands-section.tsx
index 05afc20..67eae47 100644
--- a/examples/vite-react/src/components/sections/commands-section.tsx
+++ b/examples/vite-react/src/components/sections/commands-section.tsx
@@ -12,24 +12,31 @@ const Command = ({
   readonly application: ViteReactApplication
   readonly number: number
 }) => {
-  // This command keeps its idempotency key for the component lifetime.
   // oxlint-disable-next-line react/hook-use-state
   const [operationId] = useState(() => globalThis.crypto.randomUUID())
-  const { rpcQuery, queryClient } = application
+  const { rpcQuery, queryClient, trackMutationOptions } = application
   const input = { operationId }
   const reconcile = async () => {
+    if (!application.isActive()) {
+      return
+    }
     await queryClient.invalidateQueries({ queryKey: rpcQuery.commands.status.queryKey(input) })
   }
-  const start = useMutation(rpcQuery.commands.start.mutationOptions({ onSettled: reconcile }))
-  const cancel = useMutation(rpcQuery.commands.cancel.mutationOptions({ onSettled: reconcile }))
+  const start = useMutation(
+    trackMutationOptions(rpcQuery.commands.start.mutationOptions({ onSettled: reconcile })),
+  )
+  const cancel = useMutation(
+    trackMutationOptions(rpcQuery.commands.cancel.mutationOptions({ onSettled: reconcile })),
+  )
   const status = useQuery(
     rpcQuery.commands.status.queryOptions({
       input,
       enabled: start.status !== 'idle',
       refetchInterval: (query) =>
         query.state.data?.state === 'running' ||
-        query.state.data === null ||
-        query.state.data === undefined
+        query.state.status === 'error' ||
+        query.state.data === undefined ||
+        (query.state.data === null && start.isPending)
           ? 100
           : false,
     }),
@@ -45,7 +52,9 @@ const Command = ({
       <div className="flex flex-wrap gap-3">
         <ActionButton
           type="button"
-          disabled={start.status !== 'idle'}
+          disabled={
+            start.isPending || start.isSuccess || (command !== undefined && command !== null)
+          }
           onClick={() => {
             start.mutate(input)
           }}
diff --git a/examples/vite-react/src/components/sections/diagnostics-section.tsx b/examples/vite-react/src/components/sections/diagnostics-section.tsx
index c7e3e08..7ddca47 100644
--- a/examples/vite-react/src/components/sections/diagnostics-section.tsx
+++ b/examples/vite-react/src/components/sections/diagnostics-section.tsx
@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'
 import {
   describeSlowQueryCancellation,
   useSlowQueryCancellation,
-} from '../../hooks/use-slow-query-cancellation.ts'
+} from '../../../../shared/use-slow-query-cancellation.ts'
 import type { ViteReactApplication } from '../../lib/application.ts'
 import { ActionButton } from '../ui/action-button.tsx'
 import { EffectErrorDetails } from '../ui/effect-error-details.tsx'
@@ -14,9 +14,11 @@ export const DiagnosticsSection = ({
   readonly application: ViteReactApplication
 }) => {
   const declaredFailure = useMutation(
-    application.rpcQuery.diagnostics.fail.mutationOptions({
-      rpcOptions: { headers: { 'x-request-source': 'diagnostics-panel' } },
-    }),
+    application.trackMutationOptions(
+      application.rpcQuery.diagnostics.fail.mutationOptions({
+        rpcOptions: { headers: { 'x-request-source': 'diagnostics-panel' } },
+      }),
+    ),
   )
   const slowQuery = useSlowQueryCancellation(application)
   const message = describeSlowQueryCancellation(slowQuery.state)
diff --git a/examples/vite-react/src/components/sections/http-section.tsx b/examples/vite-react/src/components/sections/http-section.tsx
index 4c4ac5b..315dca0 100644
--- a/examples/vite-react/src/components/sections/http-section.tsx
+++ b/examples/vite-react/src/components/sections/http-section.tsx
@@ -6,7 +6,7 @@ import type { SubmitEvent } from 'react'
 import {
   describeSlowQueryCancellation,
   useSlowQueryCancellation,
-} from '../../hooks/use-slow-query-cancellation.ts'
+} from '../../../../shared/use-slow-query-cancellation.ts'
 import type { ViteReactApplication } from '../../lib/application.ts'
 import { ActionButton } from '../ui/action-button.tsx'
 import { EffectErrorDetails } from '../ui/effect-error-details.tsx'
@@ -32,7 +32,7 @@ const HttpSelectionResult = ({
 }
 
 export const HttpSection = ({ application }: { readonly application: ViteReactApplication }) => {
-  const { httpQuery, invalidateUsers, queryClient } = application
+  const { httpQuery, invalidateUsers, queryClient, userWrites } = application
   const users = useQuery(httpQuery.users.list.queryOptions())
   const [selectedId, setSelectedId] = useState<number>()
   const selectedUser = useQuery(
@@ -54,20 +54,11 @@ export const HttpSection = ({ application }: { readonly application: ViteReactAp
   const [name, setName] = useState('')
   const [locale, setLocale] = useState('')
   const [cacheMessage, setCacheMessage] = useState<string>()
-  const createUser = useMutation(
-    httpQuery.users.create.mutationOptions({ onSuccess: invalidateUsers }),
+  const createUser = useMutation(userWrites.httpCreate())
+  const deleteUser = useMutation(userWrites.httpDelete())
+  const failure = useMutation(
+    application.trackMutationOptions(httpQuery.diagnostics.fail.mutationOptions()),
   )
-  const deleteUser = useMutation(
-    httpQuery.users.delete.mutationOptions({
-      onSuccess: async (_, input) => {
-        if (selectedId === input.params.id) {
-          setSelectedId(undefined)
-        }
-        await invalidateUsers()
-      },
-    }),
-  )
-  const failure = useMutation(httpQuery.diagnostics.fail.mutationOptions())
   const slowQuery = useSlowQueryCancellation(application, 'http')
   const slowMessage = describeSlowQueryCancellation(slowQuery.state)
   const submit = (event: SubmitEvent<HTMLFormElement>) => {
@@ -99,7 +90,7 @@ export const HttpSection = ({ application }: { readonly application: ViteReactAp
     await invalidateUsers()
     setCacheMessage('HTTP and RPC user queries invalidated and refetched')
   }
-  const loaded = pages.data?.pages.flatMap((page) => page.users) ?? []
+  const loaded = pages.data?.pages.reduce((count, page) => count + page.users.length, 0) ?? 0
 
   return (
     <section
@@ -123,9 +114,18 @@ export const HttpSection = ({ application }: { readonly application: ViteReactAp
                 <span>HTTP: {user.name}</span>
                 <ActionButton
                   aria-label={`Delete HTTP ${user.name}`}
-                  disabled={deleteUser.isPending}
+                  disabled={user.id < 0 || deleteUser.isPending}
                   onClick={() => {
-                    deleteUser.mutate({ params: { id: user.id } })
+                    deleteUser.mutate(
+                      { params: { id: user.id } },
+                      {
+                        onSuccess: () => {
+                          if (selectedId === user.id) {
+                            setSelectedId(undefined)
+                          }
+                        },
+                      },
+                    )
                   }}
                   type="button"
                   variant="danger"
@@ -214,7 +214,7 @@ export const HttpSection = ({ application }: { readonly application: ViteReactAp
         <div className="space-y-4 border border-border bg-background p-5">
           <h3 className="text-xl font-bold">HTTP pagination</h3>
           <p>
-            HTTP: {String(loaded.length)} of {String(pages.data?.pages[0]?.total ?? 0)} loaded
+            HTTP: {String(loaded)} of {String(pages.data?.pages[0]?.total ?? 0)} loaded
           </p>
           <ol className="grid gap-3">
             {pages.data?.pages.map((page, index) => (
diff --git a/examples/vite-react/src/components/sections/mutations-section.tsx b/examples/vite-react/src/components/sections/mutations-section.tsx
index 26ea833..122617a 100644
--- a/examples/vite-react/src/components/sections/mutations-section.tsx
+++ b/examples/vite-react/src/components/sections/mutations-section.tsx
@@ -10,7 +10,7 @@ export const MutationsSection = ({
 }: {
   readonly application: ViteReactApplication
 }) => {
-  const { invalidateUsers, rpcQuery } = application
+  const { invalidateUsers, rpcQuery, trackMutationOptions } = application
   const voidQuery = useQuery(
     rpcQuery.diagnostics.cancel.queryOptions({
       enabled: false,
@@ -18,10 +18,10 @@ export const MutationsSection = ({
     }),
   )
   const resetUsers = useMutation(
-    rpcQuery.testing.reset.mutationOptions({ onSuccess: invalidateUsers }),
+    trackMutationOptions(rpcQuery.testing.reset.mutationOptions({ onSuccess: invalidateUsers })),
   )
   const seedUsers = useMutation(
-    rpcQuery.testing.seed.mutationOptions({ onSuccess: invalidateUsers }),
+    trackMutationOptions(rpcQuery.testing.seed.mutationOptions({ onSuccess: invalidateUsers })),
   )
 
   return (
diff --git a/examples/vite-react/src/components/sections/queries-section.tsx b/examples/vite-react/src/components/sections/queries-section.tsx
index a13446a..7afe399 100644
--- a/examples/vite-react/src/components/sections/queries-section.tsx
+++ b/examples/vite-react/src/components/sections/queries-section.tsx
@@ -31,10 +31,10 @@ const InfiniteUserQueries = ({
       input: (cursor: number) => ({ cursor, pageSize: PAGE_SIZE }),
     }),
   )
-  const loadedUsers = userPages.data?.pages.flatMap((page) => page.users) ?? []
+  const loaded = userPages.data?.pages.reduce((count, page) => count + page.users.length, 0) ?? 0
   const totalUsers = userPages.data?.pages[0]?.total ?? 0
   const pageCount = userPages.data?.pages.length ?? 0
-  const remainingUsers = Math.max(0, totalUsers - loadedUsers.length)
+  const remainingUsers = Math.max(0, totalUsers - loaded)
   const nextPageSize = Math.min(PAGE_SIZE, remainingUsers)
   let nextPageLabel = 'All users loaded'
   if (userPages.hasNextPage) {
@@ -49,7 +49,7 @@ const InfiniteUserQueries = ({
       <div className="flex flex-wrap items-baseline justify-between gap-2">
         <h3 className="display-heading text-xl font-bold text-text-primary">Infinite query</h3>
         <span className="border border-brand-800 bg-brand-950/80 px-3 py-1 text-sm font-bold text-brand-200">
-          {String(loadedUsers.length)} of {String(totalUsers)} loaded
+          {String(loaded)} of {String(totalUsers)} loaded
         </span>
       </div>
       <p className="mt-2 text-sm leading-6 text-muted-foreground">
@@ -105,9 +105,7 @@ export const QueriesSection = ({ application }: { readonly application: ViteReac
     setBoundedHistory(bounded)
     try {
       await queryClient.query(streamedDiagnosticsOptions(rpcQuery, bounded))
-    } catch {
-      // Query state retains the error for rendering.
-    }
+    } catch {}
   }
   const liveDiagnostic = useQuery(rpcQuery.diagnostics.stream.liveOptions())
   const [cacheMessage, setCacheMessage] = useState<string>()
diff --git a/examples/vite-react/src/components/ui/action-button.tsx b/examples/vite-react/src/components/ui/action-button.tsx
index 41b26f7..0acaab2 100644
--- a/examples/vite-react/src/components/ui/action-button.tsx
+++ b/examples/vite-react/src/components/ui/action-button.tsx
@@ -18,7 +18,6 @@ export const ActionButton = ({
   ...props
 }: ActionButtonProps) => (
   <button
-    // ComponentProps restricts type to button, submit, or reset, and defaults to button.
     // oxlint-disable-next-line react/button-has-type
     type={type}
     className={[
diff --git a/examples/vite-react/src/components/ui/effect-error-details.tsx b/examples/vite-react/src/components/ui/effect-error-details.tsx
index ba46dfc..ac78f3d 100644
--- a/examples/vite-react/src/components/ui/effect-error-details.tsx
+++ b/examples/vite-react/src/components/ui/effect-error-details.tsx
@@ -1,29 +1,19 @@
-import { Cause } from 'effect'
-import { isEffectHttpApiQueryError, isEffectRpcQueryError } from 'effect-api-query'
+import { describeEffectError } from '../../../../shared/error-description.ts'
 
-export const EffectErrorDetails = ({ error }: { readonly error: unknown }) => {
-  if (isEffectRpcQueryError(error) || isEffectHttpApiQueryError(error)) {
-    const operation = isEffectRpcQueryError(error)
-      ? error.rpcTag
-      : `${error.groupId}.${error.endpoint}`
-    return (
-      <p
-        className="border border-l-4 border-destructive-900/80 border-l-destructive-600 bg-destructive-950/50 p-3 text-sm whitespace-pre-wrap text-destructive-200"
-        role="alert"
-      >
-        {error.name} from {operation} ({error.operation})
-        <br />
-        {Cause.pretty(error.cause)}
-      </p>
-    )
-  }
+const alertClassName =
+  'border border-l-4 border-destructive-900/80 border-l-destructive-600 bg-destructive-950/50 p-3 text-sm whitespace-pre-wrap text-destructive-200'
 
-  return error instanceof Error ? (
-    <p
-      className="border border-l-4 border-destructive-900/80 border-l-destructive-600 bg-destructive-950/50 p-3 text-sm whitespace-pre-wrap text-destructive-200"
-      role="alert"
-    >
-      {error.name}: {error.message}
+export const EffectErrorDetails = ({ error }: { readonly error: unknown }) => {
+  const description = describeEffectError(error)
+  return description === undefined ? null : (
+    <p className={alertClassName} role="alert">
+      {description.summary}
+      {description.details === undefined ? null : (
+        <>
+          <br />
+          {description.details}
+        </>
+      )}
     </p>
-  ) : null
+  )
 }
diff --git a/examples/vite-react/src/components/users/create-user-form.tsx b/examples/vite-react/src/components/users/create-user-form.tsx
index 8b25170..2e682bb 100644
--- a/examples/vite-react/src/components/users/create-user-form.tsx
+++ b/examples/vite-react/src/components/users/create-user-form.tsx
@@ -7,14 +7,10 @@ import { ActionButton } from '../ui/action-button.tsx'
 import { EffectErrorDetails } from '../ui/effect-error-details.tsx'
 
 export const CreateUserForm = ({ application }: { readonly application: ViteReactApplication }) => {
-  const { invalidateUsers, rpcQuery } = application
+  const { userWrites } = application
   const [locale, setLocale] = useState('')
   const [name, setName] = useState('')
-  const createUser = useMutation(
-    rpcQuery.users.create.mutationOptions({
-      onSuccess: invalidateUsers,
-    }),
-  )
+  const createUser = useMutation(userWrites.rpcCreate())
 
   const submitUser = (event: SubmitEvent<HTMLFormElement>) => {
     event.preventDefault()
diff --git a/examples/vite-react/src/components/users/user-list.tsx b/examples/vite-react/src/components/users/user-list.tsx
index 60e1d53..543ccaf 100644
--- a/examples/vite-react/src/components/users/user-list.tsx
+++ b/examples/vite-react/src/components/users/user-list.tsx
@@ -12,12 +12,8 @@ export const UserList = ({
   readonly application: ViteReactApplication
   readonly users: readonly User[] | undefined
 }) => {
-  const { invalidateUsers, rpcQuery } = application
-  const deleteUser = useMutation(
-    rpcQuery.users.delete.mutationOptions({
-      onSuccess: invalidateUsers,
-    }),
-  )
+  const { userWrites } = application
+  const deleteUser = useMutation(userWrites.rpcDelete())
 
   return (
     <>
@@ -30,12 +26,14 @@ export const UserList = ({
             <span className="grid gap-0.5">
               <strong className="text-text-primary">{user.name}</strong>
               <span className="text-sm text-text-subtle">
-                User {user.id}, locale {user.locale}
+                {user.id < 0 ? 'Adding user' : `User ${String(user.id)}`}, locale {user.locale}
               </span>
             </span>
             <ActionButton
               aria-label={`Delete ${user.name}`}
-              disabled={deleteUser.isPending && deleteUser.variables.id === user.id}
+              disabled={
+                user.id < 0 || (deleteUser.isPending && deleteUser.variables.id === user.id)
+              }
               onClick={() => {
                 deleteUser.mutate({ id: user.id })
               }}
diff --git a/examples/vite-react/src/hooks/use-slow-query-cancellation.ts b/examples/vite-react/src/hooks/use-slow-query-cancellation.ts
deleted file mode 100644
index 2da308e..0000000
--- a/examples/vite-react/src/hooks/use-slow-query-cancellation.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import type { DiagnosticStatus } from '@effect-api-query/contracts'
-import { useRef, useState } from 'react'
-
-import type { ViteReactApplication } from '../lib/application.ts'
-
-// Browser workflow shared by both transports.
-export type SlowQueryCancellationState =
-  | { readonly _tag: 'Idle' }
-  | { readonly _tag: 'Starting' }
-  | { readonly _tag: 'Ready' }
-  | { readonly _tag: 'Cancelling' }
-  | { readonly _tag: 'Cancelled'; readonly interruptions: number }
-  | { readonly _tag: 'Failed'; readonly error: unknown }
-
-export const describeSlowQueryCancellation = (
-  state: SlowQueryCancellationState,
-): string | undefined => {
-  switch (state._tag) {
-    case 'Idle': {
-      return undefined
-    }
-    case 'Starting': {
-      return 'Starting query…'
-    }
-    case 'Ready': {
-      return 'Ready to cancel'
-    }
-    case 'Cancelling': {
-      return 'Cancelling query…'
-    }
-    case 'Cancelled': {
-      return `Server interruptions: ${String(state.interruptions)}`
-    }
-    case 'Failed': {
-      return 'Slow query failed'
-    }
-    default: {
-      throw new Error('Unknown slow query cancellation state')
-    }
-  }
-}
-
-const delay = async (milliseconds: number) =>
-  // Timers expose callbacks rather than an awaitable API in the ES2022 browser target.
-  // oxlint-disable-next-line promise/avoid-new
-  new Promise<void>((resolve) => {
-    globalThis.setTimeout(resolve, milliseconds)
-  })
-
-/** Coordinates typed diagnostic operations as one cancellation demonstration. */
-export const useSlowQueryCancellation = (
-  { queryClient, rpcQuery, httpQuery }: ViteReactApplication,
-  transport: 'rpc' | 'http' = 'rpc',
-) => {
-  const [state, setState] = useState<SlowQueryCancellationState>({ _tag: 'Idle' })
-  const baseline = useRef<DiagnosticStatus | undefined>(undefined)
-  // The operation input stays fixed for this mounted cancellation workflow.
-  // oxlint-disable-next-line react/hook-use-state
-  const [slowInput] = useState(() => ({
-    durationMs: 60_000,
-    operationId: globalThis.crypto.randomUUID(),
-  }))
-  const adapter =
-    transport === 'http'
-      ? {
-          key: httpQuery.diagnostics.slow.queryKey({ query: slowInput }),
-          run: async () =>
-            queryClient.query(
-              httpQuery.diagnostics.slow.queryOptions({ input: { query: slowInput } }),
-            ),
-          readStatus: async () =>
-            queryClient.query({
-              ...httpQuery.diagnostics.operationStatus.queryOptions({
-                input: { params: { operationId: slowInput.operationId } },
-              }),
-              staleTime: 0,
-            }),
-        }
-      : {
-          key: rpcQuery.diagnostics.slow.queryKey(slowInput),
-          run: async () =>
-            queryClient.query(rpcQuery.diagnostics.slow.queryOptions({ input: slowInput })),
-          readStatus: async () =>
-            queryClient.query({
-              ...rpcQuery.diagnostics.operationStatus.queryOptions({
-                input: { operationId: slowInput.operationId },
-              }),
-              staleTime: 0,
-            }),
-        }
-
-  const waitForStatus = async (
-    predicate: (status: DiagnosticStatus) => boolean,
-  ): Promise<DiagnosticStatus> => {
-    for (let attempt = 0; attempt < 100; attempt += 1) {
-      // Each poll depends on the preceding result and must finish before the next attempt.
-      // oxlint-disable-next-line eslint/no-await-in-loop
-      const status = await adapter.readStatus()
-      if (predicate(status)) {
-        return status
-      }
-      // Polls deliberately wait between sequential status reads.
-      // oxlint-disable-next-line eslint/no-await-in-loop
-      await delay(10)
-    }
-    throw new Error('Timed out waiting for diagnostic status')
-  }
-
-  const runQuery = async () => {
-    try {
-      await adapter.run()
-    } catch {
-      // Query state retains failures; interruption is expected after cancellation.
-    }
-  }
-
-  const start = async () => {
-    setState({ _tag: 'Starting' })
-    try {
-      const before = await adapter.readStatus()
-      baseline.current = before
-      void runQuery()
-      await waitForStatus(({ started }) => started > before.started)
-      setState({ _tag: 'Ready' })
-    } catch (error) {
-      setState({ _tag: 'Failed', error })
-    }
-  }
-
-  const cancel = async () => {
-    const before = baseline.current
-    if (before === undefined) {
-      return
-    }
-
-    setState({ _tag: 'Cancelling' })
-    try {
-      // TanStack aborts the query signal; the ready client interrupts the server operation.
-      await queryClient.cancelQueries({
-        queryKey: adapter.key,
-      })
-      const status = await waitForStatus(({ interrupted }) => interrupted > before.interrupted)
-      setState({ _tag: 'Cancelled', interruptions: status.interrupted })
-    } catch (error) {
-      setState({ _tag: 'Failed', error })
-    }
-  }
-
-  return {
-    cancel,
-    canCancel: state._tag === 'Ready',
-    canStart: !['Cancelling', 'Ready', 'Starting'].includes(state._tag),
-    start,
-    state,
-  } as const
-}
diff --git a/examples/vite-react/src/lib/application.ts b/examples/vite-react/src/lib/application.ts
index 6cd4ddb..43748b6 100644
--- a/examples/vite-react/src/lib/application.ts
+++ b/examples/vite-react/src/lib/application.ts
@@ -7,11 +7,24 @@ import { createHttpApiQueryUtils, createRpcQueryUtils } from 'effect-api-query'
 import type { RunPromiseExit } from 'effect-api-query'
 import { FetchHttpClient, HttpClient, HttpClientRequest } from 'effect/http'
 import { HttpApiClient } from 'effect/http-api'
+import type { RpcClientError } from 'effect/rpc'
 
-const makeExampleRpcQueryUtils = (client: ExampleRpcClient, runPromiseExit: RunPromiseExit) =>
-  createRpcQueryUtils(exampleRpcGroup, {
+import { makeOwnerCache, ownerKeyPrefix } from './owner-cache.ts'
+import type { ApplicationOwnerIdentity, DirectoryStorage } from './owner-cache.ts'
+import { makeUsersInvalidator, makeUserWrites } from './user-writes.ts'
+
+const makeExampleRpcQueryUtils = (
+  client: ExampleRpcClient,
+  runPromiseExit: RunPromiseExit,
+  keyPrefix: ReturnType<typeof ownerKeyPrefix>,
+) =>
+  createRpcQueryUtils<
+    typeof exampleRpcGroup,
+    ReturnType<typeof ownerKeyPrefix>,
+    RpcClientError.RpcClientError
+  >(exampleRpcGroup, {
     client,
-    keyPrefix: ['vite-react'] as const,
+    keyPrefix,
     runPromiseExit,
   })
 
@@ -20,12 +33,21 @@ export type ExampleRpcQueryUtils = ReturnType<typeof makeExampleRpcQueryUtils>
 const makeExampleHttpQueryUtils = (
   client: HttpApiClient.ForApi<typeof exampleHttpApi>,
   runPromiseExit: RunPromiseExit,
-) => createHttpApiQueryUtils(exampleHttpApi, { client, keyPrefix: ['vite-react'], runPromiseExit })
+  keyPrefix: ReturnType<typeof ownerKeyPrefix>,
+) => createHttpApiQueryUtils(exampleHttpApi, { client, keyPrefix, runPromiseExit })
+
+export type ExampleHttpQueryUtils = ReturnType<typeof makeExampleHttpQueryUtils>
 
 export interface ViteReactApplication {
-  readonly httpQuery: ReturnType<typeof makeExampleHttpQueryUtils>
+  readonly httpQuery: ExampleHttpQueryUtils
+  readonly userWrites: ReturnType<typeof makeUserWrites>
   readonly invalidateUsers: () => Promise<void>
-  readonly dispose: () => Promise<void>
+  readonly dispose: (options?: { readonly discardPersistence?: boolean }) => Promise<void>
+  readonly identity: ApplicationOwnerIdentity
+  readonly isActive: () => boolean
+  readonly persistDirectory: () => void
+  readonly runMutation: <T>(execute: () => Promise<T>) => Promise<T>
+  readonly trackMutationOptions: ReturnType<typeof makeOwnerCache>['trackMutationOptions']
   readonly queryClient: QueryClient
   readonly rpcQuery: ExampleRpcQueryUtils
 }
@@ -33,27 +55,51 @@ export interface ViteReactApplication {
 export interface StartViteReactApplicationOptions {
   readonly rpcUrl: string
   readonly httpBaseUrl?: string
+  readonly identity?: ApplicationOwnerIdentity
+  readonly directoryStorage?: DirectoryStorage
 }
 
-/** Creates clients, query utilities, and cleanup together so the example can be copied as a whole. */
 export const startViteReactApplication = async ({
   rpcUrl,
   httpBaseUrl = new URL(rpcUrl, globalThis.location?.href).origin,
+  identity = {
+    tenantId: 'example-team',
+    userId: 'example-user',
+    sessionGeneration: 1,
+    permissionGeneration: 1,
+  },
+  directoryStorage,
 }: StartViteReactApplicationOptions): Promise<ViteReactApplication> => {
+  const keyPrefix = ownerKeyPrefix(identity)
+  const capturedIdentity = Object.freeze({
+    tenantId: keyPrefix[1],
+    userId: keyPrefix[2],
+    sessionGeneration: keyPrefix[3],
+    permissionGeneration: keyPrefix[4],
+  })
   const rpcClient = await startExampleRpcClient(rpcUrl)
   const httpRuntime = ManagedRuntime.make(FetchHttpClient.layer)
   const queryClient = new QueryClient({
     defaultOptions: {
-      mutations: { retry: false },
+      mutations: { retry: false, networkMode: 'always' },
       queries: { retry: false },
     },
   })
+  let owner: ReturnType<typeof makeOwnerCache> | undefined
   let disposal: Promise<void> | undefined
-  const dispose = async () => {
-    // Stop queries before releasing the ready clients they execute through.
-    disposal ??= (async () => {
+  const dispose = async (options?: { readonly discardPersistence?: boolean }) => {
+    const retirement = owner === undefined ? queryClient.cancelQueries() : owner.retire(options)
+    if (disposal !== undefined) {
+      try {
+        await retirement
+      } finally {
+        await disposal
+      }
+      return
+    }
+    disposal = (async () => {
       try {
-        await queryClient.cancelQueries()
+        await retirement
       } finally {
         queryClient.clear()
         try {
@@ -75,16 +121,41 @@ export const startViteReactApplication = async ({
         ),
       }),
     )
-    const httpQuery = makeExampleHttpQueryUtils(httpClient, httpRuntime.runPromiseExit)
-    const rpcQuery = makeExampleRpcQueryUtils(rpcClient.client, rpcClient.runPromiseExit)
+    const httpQuery = makeExampleHttpQueryUtils(httpClient, httpRuntime.runPromiseExit, keyPrefix)
+    const rpcQuery = makeExampleRpcQueryUtils(rpcClient.client, rpcClient.runPromiseExit, keyPrefix)
+    owner = makeOwnerCache({
+      identity: capturedIdentity,
+      queryClient,
+      directoryKeys: {
+        rpc: rpcQuery.users.list.queryKey(),
+        http: httpQuery.users.list.queryKey(),
+      },
+      storage: directoryStorage,
+    })
+    owner.restoreDirectory()
+    const capturedOwner = owner
+    const invalidateUsers = makeUsersInvalidator({
+      queryClient,
+      rpcQuery,
+      httpQuery,
+      isActive: capturedOwner.isActive,
+    })
     return {
       httpQuery,
-      invalidateUsers: async () => {
-        await Promise.all([
-          queryClient.invalidateQueries({ queryKey: rpcQuery.users.key() }),
-          queryClient.invalidateQueries({ queryKey: httpQuery.users.key() }),
-        ])
-      },
+      identity: capturedOwner.identity,
+      isActive: capturedOwner.isActive,
+      persistDirectory: capturedOwner.persistDirectory,
+      runMutation: capturedOwner.runMutation,
+      trackMutationOptions: capturedOwner.trackMutationOptions,
+      userWrites: makeUserWrites({
+        queryClient,
+        rpcQuery,
+        httpQuery,
+        isActive: capturedOwner.isActive,
+        invalidateUsers,
+        trackMutationOptions: capturedOwner.trackMutationOptions,
+      }),
+      invalidateUsers,
       dispose,
       queryClient,
       rpcQuery,
diff --git a/examples/vite-react/src/lib/owner-cache.ts b/examples/vite-react/src/lib/owner-cache.ts
new file mode 100644
index 0000000..1bd22b2
--- /dev/null
+++ b/examples/vite-react/src/lib/owner-cache.ts
@@ -0,0 +1,170 @@
+import type { QueryClient, QueryKey } from '@tanstack/react-query'
+import { Schema } from 'effect'
+
+const OwnerIdentity = Schema.Struct({
+  tenantId: Schema.NonEmptyString,
+  userId: Schema.NonEmptyString,
+  sessionGeneration: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+  permissionGeneration: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+})
+
+export type ApplicationOwnerIdentity = typeof OwnerIdentity.Type
+export type DirectoryStorage = Pick<Storage, 'getItem' | 'removeItem' | 'setItem'>
+const Directory = Schema.Array(
+  Schema.Struct({ id: Schema.Int, name: Schema.String, locale: Schema.String }),
+)
+
+const PersistedDirectory = Schema.fromJsonString(
+  Schema.Struct({
+    identity: OwnerIdentity,
+    schemaVersion: Schema.Literal(1),
+    keyVersion: Schema.Literal(1),
+    directories: Schema.Array(
+      Schema.Struct({ adapter: Schema.Literals(['rpc', 'http']), data: Directory }),
+    ),
+  }),
+)
+
+export const ownerKeyPrefix = (identity: ApplicationOwnerIdentity) => {
+  const owner = Schema.decodeSync(OwnerIdentity)(identity)
+  return [
+    'vite-react',
+    owner.tenantId,
+    owner.userId,
+    owner.sessionGeneration,
+    owner.permissionGeneration,
+  ] as const
+}
+
+export const makeOwnerCache = ({
+  identity,
+  queryClient,
+  directoryKeys,
+  storage,
+}: {
+  readonly identity: ApplicationOwnerIdentity
+  readonly queryClient: QueryClient
+  readonly directoryKeys: Readonly<Record<'rpc' | 'http', QueryKey>>
+  readonly storage?: DirectoryStorage | undefined
+}) => {
+  const owner = Object.freeze(Schema.decodeSync(OwnerIdentity)(identity))
+  const storageKey = `effect-api-query:directory:${JSON.stringify(ownerKeyPrefix(owner))}`
+  const pendingMutations = new Set<Promise<unknown>>()
+  let active = true
+  let retirement: Promise<void> | undefined
+  const isActive = () => active
+  const runMutation = async <T>(execute: () => Promise<T>): Promise<T> => {
+    if (!active) {
+      throw new Error('Owner is inactive')
+    }
+    const result = (async () => {
+      await Promise.resolve()
+      return execute()
+    })()
+    pendingMutations.add(result)
+    try {
+      return await result
+    } finally {
+      pendingMutations.delete(result)
+    }
+  }
+  const trackMutationOptions = <Args extends unknown[], Data, Options extends object>(
+    options: Options & { readonly mutationFn: (...args: Args) => Promise<Data> },
+  ): Omit<Options, 'mutationFn' | 'networkMode' | 'retry'> & {
+    readonly mutationFn: (...args: Args) => Promise<Data>
+    readonly networkMode: 'always'
+    readonly retry: false
+  } => ({
+    ...options,
+    networkMode: 'always' as const,
+    retry: false as const,
+    mutationFn: async (...args: Args) => runMutation(async () => options.mutationFn(...args)),
+  })
+  const saveDirectory = () => {
+    if (storage === undefined) {
+      return
+    }
+    if (pendingMutations.size > 0 || queryClient.isMutating() > 0) {
+      storage.removeItem(storageKey)
+      return
+    }
+    const directories = (['rpc', 'http'] as const).flatMap((adapter) => {
+      const data = queryClient.getQueryData(directoryKeys[adapter])
+      return data === undefined
+        ? []
+        : [{ adapter, data: Schema.decodeUnknownSync(Directory)(data) }]
+    })
+    storage.setItem(
+      storageKey,
+      JSON.stringify({ identity: owner, schemaVersion: 1, keyVersion: 1, directories }),
+    )
+  }
+  const persistDirectory = () => {
+    if (active) {
+      saveDirectory()
+    }
+  }
+  const restoreDirectory = () => {
+    if (!active || storage === undefined) {
+      return false
+    }
+    const json = storage.getItem(storageKey)
+    if (json === null) {
+      return false
+    }
+    try {
+      const snapshot = Schema.decodeSync(PersistedDirectory)(json)
+      if (
+        JSON.stringify(ownerKeyPrefix(snapshot.identity)) !== JSON.stringify(ownerKeyPrefix(owner))
+      ) {
+        storage.removeItem(storageKey)
+        return false
+      }
+      for (const { adapter, data } of snapshot.directories) {
+        queryClient.setQueryData(directoryKeys[adapter], data, { updatedAt: 0 })
+      }
+      return true
+    } catch {
+      storage.removeItem(storageKey)
+      return false
+    }
+  }
+  const retire = async ({
+    discardPersistence = true,
+  }: { readonly discardPersistence?: boolean } = {}) => {
+    const wasActive = active
+    active = false
+    if (retirement !== undefined) {
+      if (discardPersistence) {
+        storage?.removeItem(storageKey)
+      }
+      return retirement
+    }
+    retirement = (async () => {
+      try {
+        if (discardPersistence) {
+          storage?.removeItem(storageKey)
+        } else if (wasActive) {
+          saveDirectory()
+        }
+      } finally {
+        try {
+          await queryClient.cancelQueries()
+        } finally {
+          queryClient.clear()
+          await Promise.allSettled(pendingMutations)
+        }
+      }
+    })()
+    return retirement
+  }
+  return {
+    identity: owner,
+    isActive,
+    runMutation,
+    trackMutationOptions,
+    persistDirectory,
+    restoreDirectory,
+    retire,
+  }
+}
diff --git a/examples/vite-react/src/lib/user-writes.ts b/examples/vite-react/src/lib/user-writes.ts
new file mode 100644
index 0000000..2c23eeb
--- /dev/null
+++ b/examples/vite-react/src/lib/user-writes.ts
@@ -0,0 +1,502 @@
+import { User, UserPage } from '@effect-api-query/contracts'
+import type {
+  InfiniteData,
+  MutationObserverOptions,
+  QueryClient,
+  QueryKey,
+} from '@tanstack/react-query'
+
+import type { ExampleHttpQueryUtils, ExampleRpcQueryUtils } from './application.ts'
+import type { makeOwnerCache } from './owner-cache.ts'
+
+export interface UserWriteOwner {
+  readonly queryClient: QueryClient
+  readonly rpcQuery: Pick<ExampleRpcQueryUtils, 'users'>
+  readonly httpQuery: Pick<ExampleHttpQueryUtils, 'users'>
+  readonly isActive: () => boolean
+  readonly invalidateUsers: () => Promise<void>
+  readonly trackMutationOptions: ReturnType<typeof makeOwnerCache>['trackMutationOptions']
+}
+
+export const makeUsersInvalidator =
+  ({
+    queryClient,
+    rpcQuery,
+    httpQuery,
+    isActive,
+  }: Pick<UserWriteOwner, 'queryClient' | 'rpcQuery' | 'httpQuery' | 'isActive'>) =>
+  async () => {
+    if (!isActive()) {
+      return
+    }
+    await Promise.all([
+      queryClient.invalidateQueries({ queryKey: rpcQuery.users.key() }),
+      queryClient.invalidateQueries({ queryKey: httpQuery.users.key() }),
+    ])
+  }
+
+interface DirectorySnapshot {
+  readonly rpcList: readonly User[] | undefined
+  readonly httpList: readonly User[] | undefined
+  readonly rpcPages: InfiniteData<UserPage> | undefined
+  readonly httpPages: InfiniteData<UserPage> | undefined
+}
+const restoreList = (
+  current: readonly User[] | undefined,
+  snapshot: readonly User[] | undefined,
+  id: number,
+) => {
+  const index = snapshot?.findIndex((user) => user.id === id) ?? -1
+  const user = snapshot?.[index]
+  if (
+    current === undefined ||
+    user === undefined ||
+    current.some((existing) => existing.id === id)
+  ) {
+    return current
+  }
+  const positions = new Map<number, number>()
+  for (const [currentIndex, existing] of current.entries()) {
+    if (!positions.has(existing.id)) {
+      positions.set(existing.id, currentIndex)
+    }
+  }
+  const following = snapshot?.slice(index + 1).find((candidate) => positions.has(candidate.id))
+  let position = 0
+  for (const candidate of snapshot?.slice(0, index) ?? []) {
+    const precedingIndex = positions.get(candidate.id)
+    if (precedingIndex !== undefined) {
+      position = precedingIndex + 1
+    }
+  }
+  if (following !== undefined) {
+    position = positions.get(following.id) ?? position
+  }
+  return [...current.slice(0, position), user, ...current.slice(position)]
+}
+
+export const makeUserWrites = ({
+  queryClient,
+  rpcQuery,
+  httpQuery,
+  isActive,
+  invalidateUsers,
+  trackMutationOptions,
+}: UserWriteOwner) => {
+  let nextWrite = 0
+  const pending = new Set<number>()
+  const pageWrites = new WeakMap<UserPage, Set<number>>()
+  const rpcList = rpcQuery.users.list.queryKey()
+  const httpList = httpQuery.users.list.queryKey()
+  const listKeys = [rpcList, httpList]
+  const listWrites = new WeakMap<
+    object,
+    { readonly dataUpdateCount: number; readonly writes: Set<number> }
+  >()
+  const listQuery = (queryKey: QueryKey) =>
+    queryClient.getQueryCache().get(queryClient.defaultQueryOptions({ queryKey }).queryHash)
+  const ownedList = (query: ReturnType<typeof listQuery>) => {
+    const ownership = query === undefined ? undefined : listWrites.get(query)
+    return query !== undefined && ownership?.dataUpdateCount === query.state.dataUpdateCount
+      ? ownership
+      : undefined
+  }
+  const rpcPages = rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 })
+  const httpPages = httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } })
+  const cancel = async () => {
+    await Promise.all([
+      queryClient.cancelQueries({ queryKey: rpcQuery.users.key() }),
+      queryClient.cancelQueries({ queryKey: httpQuery.users.key() }),
+    ])
+  }
+  const begin = async () => {
+    if (!isActive()) {
+      throw new Error('The application owner has retired')
+    }
+    nextWrite += 1
+    const write = nextWrite
+    pending.add(write)
+    try {
+      await cancel()
+      if (!isActive()) {
+        throw new Error('The application owner has retired')
+      }
+      return write
+    } catch (error) {
+      pending.delete(write)
+      throw error
+    }
+  }
+  const settle = async (write: number | undefined) => {
+    if (write === undefined) {
+      return
+    }
+    pending.delete(write)
+    if (!isActive() || pending.size !== 0) {
+      return
+    }
+    await invalidateUsers()
+  }
+  const editList = (
+    key: QueryKey,
+    edit: (users: readonly User[]) => readonly User[],
+    write: number,
+    phase: 'optimistic' | 'settled',
+  ) => {
+    const query = listQuery(key)
+    if (query?.state.data === undefined) {
+      return
+    }
+    const writes = new Set(ownedList(query)?.writes)
+    if (phase === 'optimistic') {
+      writes.add(write)
+    } else {
+      writes.delete(write)
+    }
+    const dataUpdateCount = query.state.dataUpdateCount + 1
+    queryClient.setQueryData<readonly User[]>(key, (users) =>
+      users === undefined ? undefined : edit(users),
+    )
+    listWrites.set(query, { dataUpdateCount, writes })
+  }
+  const editPages = (edit: (data: InfiniteData<UserPage>) => InfiniteData<UserPage>) => {
+    queryClient.setQueryData(rpcPages, (data) => (data === undefined ? undefined : edit(data)))
+    queryClient.setQueryData(httpPages, (data) => (data === undefined ? undefined : edit(data)))
+  }
+  const releaseWrite = (write: number) => {
+    for (const key of listKeys) {
+      const query = listQuery(key)
+      if (query !== undefined) {
+        listWrites.get(query)?.writes.delete(write)
+      }
+    }
+    for (const key of [rpcPages, httpPages]) {
+      for (const page of queryClient.getQueryData(key)?.pages ?? []) {
+        pageWrites.get(page)?.delete(write)
+      }
+    }
+  }
+  const patchPage = (
+    page: UserPage,
+    users: readonly User[],
+    write: number,
+    totalChange: number,
+    phase: 'optimistic' | 'settled',
+  ) => {
+    const writes = new Set(pageWrites.get(page))
+    const applied = phase === 'optimistic' || writes.delete(write)
+    if (phase === 'optimistic') {
+      writes.add(write)
+    }
+    const patched = new UserPage({
+      users,
+      total: page.total + (applied ? totalChange : 0),
+      nextCursor: page.nextCursor,
+    })
+    if (writes.size !== 0) {
+      pageWrites.set(patched, writes)
+    }
+    return patched
+  }
+  const restorePages = (
+    current: InfiniteData<UserPage> | undefined,
+    snapshot: InfiniteData<UserPage> | undefined,
+    id: number,
+    write: number,
+  ) => {
+    if (current === undefined || snapshot === undefined) {
+      return current
+    }
+    return {
+      ...current,
+      pages: current.pages.map((page, pageIndex) =>
+        pageWrites.get(page)?.has(write) === true
+          ? patchPage(
+              page,
+              restoreList(page.users, snapshot.pages[pageIndex]?.users, id) ?? page.users,
+              write,
+              1,
+              'settled',
+            )
+          : page,
+      ),
+    }
+  }
+  const replaceUser = (
+    id: number,
+    replacement: User | undefined,
+    write: number,
+    totalChange: number,
+    phase: 'optimistic' | 'settled',
+  ) => {
+    for (const key of listKeys) {
+      editList(
+        key,
+        (users) => {
+          const retained = users.filter((user) => user.id !== id && user.id !== replacement?.id)
+          if (replacement === undefined) {
+            return retained
+          }
+          const index = users.findIndex((user) => user.id === id)
+          return index === -1
+            ? [...retained, replacement]
+            : [...retained.slice(0, index), replacement, ...retained.slice(index)]
+        },
+        write,
+        phase,
+      )
+    }
+    editPages((data) => ({
+      ...data,
+      pages: data.pages.map((page, pageIndex) => {
+        const index = page.users.findIndex((user) => user.id === id)
+        const retained = page.users.filter((user) => user.id !== id && user.id !== replacement?.id)
+        const append =
+          replacement !== undefined &&
+          pageIndex === data.pages.length - 1 &&
+          page.nextCursor === null
+        let users = retained
+        if (replacement !== undefined && index !== -1) {
+          users = [...retained.slice(0, index), replacement, ...retained.slice(index)]
+        } else if (append) {
+          users = [...retained, replacement]
+        }
+        return patchPage(page, users, write, totalChange, phase)
+      }),
+    }))
+  }
+  const created = async (user: User, write: number) => {
+    if (!isActive()) {
+      return
+    }
+    await cancel()
+    if (!isActive()) {
+      return
+    }
+    replaceUser(-write, user, write, 0, 'settled')
+    queryClient.setQueryData(
+      rpcQuery.users.get.queryKey({ id: user.id, locale: user.locale }),
+      user,
+    )
+    queryClient.setQueryData(
+      httpQuery.users.get.queryKey({ params: { id: user.id }, query: { locale: user.locale } }),
+      user,
+    )
+  }
+  const createFailed = (write: number | undefined) => {
+    if (isActive() && write !== undefined) {
+      replaceUser(-write, undefined, write, -1, 'settled')
+    }
+  }
+  const startCreate = async (input: {
+    readonly name: string
+    readonly locale?: string | undefined
+  }) => {
+    const write = await begin()
+    if (!isActive()) {
+      pending.delete(write)
+      throw new Error('The application owner has retired')
+    }
+    const temporaryId = -write
+    replaceUser(
+      temporaryId,
+      new User({ id: temporaryId, name: input.name, locale: input.locale ?? 'en' }),
+      write,
+      1,
+      'optimistic',
+    )
+    return {
+      commit: async (user: User) => created(user, write),
+      rollback: () => {
+        createFailed(write)
+      },
+      settle: async () => settle(write),
+    }
+  }
+  const createCallbacks: Pick<
+    MutationObserverOptions<User, Error, object, Awaited<ReturnType<typeof startCreate>>>,
+    'onSuccess' | 'onError' | 'onSettled'
+  > = {
+    onSuccess: async (user, _input, transaction) => transaction.commit(user),
+    onError: (_error, _input, transaction) => transaction?.rollback(),
+    onSettled: async (_data, _error, _input, transaction) => transaction?.settle(),
+  }
+  let deletionBaseline: DirectorySnapshot | undefined
+  const deletionGroups = new Map<
+    number,
+    DirectorySnapshot & {
+      readonly pending: Set<number>
+      readonly applied: boolean
+      readonly write: number
+      succeeded: boolean
+    }
+  >()
+  const finishDelete = (id: number, write: number | undefined, succeeded: boolean) => {
+    if (write === undefined) {
+      return
+    }
+    const group = deletionGroups.get(id)
+    if (group === undefined) {
+      return
+    }
+    group.succeeded ||= succeeded
+    group.pending.delete(write)
+    if (group.pending.size !== 0) {
+      return
+    }
+    deletionGroups.delete(id)
+    if (deletionGroups.size === 0) {
+      deletionBaseline = undefined
+    }
+    if (group.succeeded) {
+      releaseWrite(group.write)
+      return
+    }
+    if (!isActive() || !group.applied) {
+      return
+    }
+    for (const [key, snapshot] of [
+      [rpcList, group.rpcList],
+      [httpList, group.httpList],
+    ] as const) {
+      if (ownedList(listQuery(key))?.writes.has(group.write) === true) {
+        editList(
+          key,
+          (current) => restoreList(current, snapshot, id) ?? current,
+          group.write,
+          'settled',
+        )
+      }
+    }
+    queryClient.setQueryData(rpcPages, (current) =>
+      restorePages(current, group.rpcPages, id, group.write),
+    )
+    queryClient.setQueryData(httpPages, (current) =>
+      restorePages(current, group.httpPages, id, group.write),
+    )
+  }
+  const deleted = async (id: number, write: number) => {
+    if (isActive()) {
+      await cancel()
+    }
+    finishDelete(id, write, true)
+  }
+  const startDelete = async (id: number) => {
+    const write = await begin()
+    if (!isActive()) {
+      pending.delete(write)
+      throw new Error('The application owner has retired')
+    }
+    let group = deletionGroups.get(id)
+    if (group === undefined) {
+      const lists = [queryClient.getQueryData(rpcList), queryClient.getQueryData(httpList)]
+      const pages = [queryClient.getQueryData(rpcPages), queryClient.getQueryData(httpPages)]
+      const listSnapshot = (
+        baseline: readonly User[] | undefined,
+        current: readonly User[] | undefined,
+        owned: boolean,
+      ) => {
+        const target = current?.find((user) => user.id === id)
+        return owned && baseline !== undefined && baseline.some((user) => user.id === id)
+          ? baseline.map((user) => (user.id === id ? (target ?? user) : user))
+          : current
+      }
+      const pageSnapshot = (
+        baseline: InfiniteData<UserPage> | undefined,
+        current: InfiniteData<UserPage> | undefined,
+      ) =>
+        current === undefined
+          ? undefined
+          : {
+              ...current,
+              pages: current.pages.map((page, index) => {
+                const users = listSnapshot(
+                  baseline?.pages[index]?.users,
+                  page.users,
+                  (pageWrites.get(page)?.size ?? 0) !== 0,
+                )
+                return users === page.users
+                  ? page
+                  : new UserPage({
+                      users: users ?? page.users,
+                      total: page.total,
+                      nextCursor: page.nextCursor,
+                    })
+              }),
+            }
+      deletionBaseline = {
+        rpcList: listSnapshot(
+          deletionBaseline?.rpcList,
+          lists[0],
+          (ownedList(listQuery(rpcList))?.writes.size ?? 0) !== 0,
+        ),
+        httpList: listSnapshot(
+          deletionBaseline?.httpList,
+          lists[1],
+          (ownedList(listQuery(httpList))?.writes.size ?? 0) !== 0,
+        ),
+        rpcPages: pageSnapshot(deletionBaseline?.rpcPages, pages[0]),
+        httpPages: pageSnapshot(deletionBaseline?.httpPages, pages[1]),
+      }
+      const applied =
+        lists.some((users) => users?.some((user) => user.id === id) ?? false) ||
+        pages.some(
+          (data) => data?.pages.some((page) => page.users.some((user) => user.id === id)) ?? false,
+        )
+      group = {
+        ...deletionBaseline,
+        pending: new Set(),
+        succeeded: false,
+        applied,
+        write,
+      }
+      deletionGroups.set(id, group)
+      if (applied) {
+        replaceUser(id, undefined, write, -1, 'optimistic')
+      }
+    }
+    group.pending.add(write)
+    return {
+      commit: async () => deleted(id, write),
+      rollback: () => {
+        finishDelete(id, write, false)
+      },
+      settle: async () => settle(write),
+    }
+  }
+  const deleteCallbacks: Pick<
+    MutationObserverOptions<void, Error, object, Awaited<ReturnType<typeof startDelete>>>,
+    'onSuccess' | 'onError' | 'onSettled'
+  > = {
+    onSuccess: async (_data, _input, transaction) => transaction.commit(),
+    onError: (_error, _input, transaction) => transaction?.rollback(),
+    onSettled: async (_data, _error, _input, transaction) => transaction?.settle(),
+  }
+  return {
+    rpcCreate: () =>
+      trackMutationOptions(
+        rpcQuery.users.create.mutationOptions({ ...createCallbacks, onMutate: startCreate }),
+      ),
+    httpCreate: () =>
+      trackMutationOptions(
+        httpQuery.users.create.mutationOptions({
+          ...createCallbacks,
+          onMutate: async ({ payload }) => startCreate(payload),
+        }),
+      ),
+    rpcDelete: () =>
+      trackMutationOptions(
+        rpcQuery.users.delete.mutationOptions({
+          ...deleteCallbacks,
+          onMutate: async ({ id }) => startDelete(id),
+        }),
+      ),
+    httpDelete: () =>
+      trackMutationOptions(
+        httpQuery.users.delete.mutationOptions({
+          ...deleteCallbacks,
+          onMutate: async ({ params }) => startDelete(params.id),
+        }),
+      ),
+  }
+}
diff --git a/examples/vite-react/src/main.tsx b/examples/vite-react/src/main.tsx
index 5a3073b..f4b8b58 100644
--- a/examples/vite-react/src/main.tsx
+++ b/examples/vite-react/src/main.tsx
@@ -16,6 +16,7 @@ if (container === null) {
 const application = await startViteReactApplication({
   rpcUrl,
   httpBaseUrl: import.meta.env.VITE_HTTP_BASE_URL ?? globalThis.location.origin,
+  directoryStorage: globalThis.sessionStorage,
 })
 const root = createRoot(container)
 root.render(
@@ -31,7 +32,13 @@ const dispose = () => {
   }
   disposed = true
   root.unmount()
-  void application.dispose()
+  void (async () => {
+    try {
+      await application.dispose({ discardPersistence: false })
+    } catch (error) {
+      console.error('Vite resource cleanup failed', error)
+    }
+  })()
 }
 
 globalThis.addEventListener('pagehide', dispose, { once: true })
diff --git a/examples/vite-react/src/styles/tailwind.css b/examples/vite-react/src/styles/tailwind.css
index e0f86af..d6b560f 100644
--- a/examples/vite-react/src/styles/tailwind.css
+++ b/examples/vite-react/src/styles/tailwind.css
@@ -1,67 +1,5 @@
 @import 'tailwindcss';
-
-/* Semantic aliases preserve the examples' existing dark palette. */
-@theme inline {
-  --tracking-display: -0.04em;
-  --color-destructive-600: var(--color-red-600);
-  --color-background: #000;
-  --color-primary-foreground: #fff;
-  --color-card: #111113;
-  --color-shadow: #000;
-  --color-foreground: var(--color-zinc-50);
-  --color-text-primary: var(--color-zinc-100);
-  --color-text-secondary: var(--color-zinc-200);
-  --color-text-tertiary: var(--color-zinc-300);
-  --color-muted-foreground: var(--color-zinc-400);
-  --color-text-subtle: var(--color-zinc-500);
-  --color-placeholder: var(--color-zinc-600);
-  --color-border-strong: var(--color-zinc-700);
-  --color-border: var(--color-zinc-800);
-  --color-border-subtle: var(--color-zinc-900);
-  --color-muted: var(--color-zinc-900);
-  --color-brand-200: var(--color-violet-200);
-  --color-brand-300: var(--color-violet-300);
-  --color-brand-400: var(--color-violet-400);
-  --color-brand-500: var(--color-violet-500);
-  --color-brand-600: var(--color-violet-600);
-  --color-brand-800: var(--color-violet-800);
-  --color-brand-900: var(--color-violet-900);
-  --color-brand-950: var(--color-violet-950);
-  --color-destructive-200: var(--color-red-200);
-  --color-destructive-800: var(--color-red-800);
-  --color-destructive-900: var(--color-red-900);
-  --color-destructive-950: var(--color-red-950);
-}
-
-@layer base {
-  :root {
-    --app-black: #050505;
-    --app-purple: #7c3aed;
-    --app-text: #fafafa;
-    color-scheme: dark;
-    font-family: 'Avenir Next', Avenir, 'Segoe UI Variable', 'Segoe UI', sans-serif;
-  }
-
-  body {
-    background: var(--app-black);
-  }
-
-  ::selection {
-    background: var(--app-purple);
-    color: var(--app-text);
-  }
-}
-
-@layer components {
-  .app-backdrop {
-    background: var(--app-black);
-  }
-
-  .display-heading {
-    font-family: 'Avenir Next', Avenir, 'Segoe UI Variable', 'Segoe UI', sans-serif;
-    text-wrap: balance;
-  }
-}
+@import '../../../shared/theme.css';
 
 @media (width >= 48rem) {
   .user-form-grid {
diff --git a/examples/vite-react/tests/app.test.tsx b/examples/vite-react/tests/app.test.tsx
index ab75bfc..562611d 100644
--- a/examples/vite-react/tests/app.test.tsx
+++ b/examples/vite-react/tests/app.test.tsx
@@ -1,14 +1,29 @@
 // @vitest-environment jsdom
 
+import { User } from '@effect-api-query/contracts'
 import { startExampleRpcServer } from '@effect-api-query/server'
+import { QueryClient, QueryClientProvider, useQuery } from '@tanstack/react-query'
 import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { Effect, Exit, Scope } from 'effect'
 import { afterEach, beforeEach, describe, expect, it } from 'vite-plus/test'
 
+import { makeControlledUserWrites } from '../../../tests/fixtures/optimistic-users.ts'
 import { ViteReactExample } from '../src/app.tsx'
+import { CreateUserForm } from '../src/components/users/create-user-form.tsx'
+import { UserList } from '../src/components/users/user-list.tsx'
 import { startViteReactApplication } from '../src/lib/application.ts'
 import type { ViteReactApplication } from '../src/lib/application.ts'
 
+const OptimisticUsers = ({ application }: { readonly application: ViteReactApplication }) => {
+  const users = useQuery(application.rpcQuery.users.list.queryOptions({ staleTime: Infinity }))
+  return (
+    <>
+      <CreateUserForm application={application} />
+      <UserList application={application} users={users.data} />
+    </>
+  )
+}
+
 describe('plain Vite React integration', () => {
   let application: ViteReactApplication | undefined
   let serverScope: Scope.Closeable | undefined
@@ -183,6 +198,43 @@ describe('plain Vite React integration', () => {
     ).toBe(0)
   })
 
+  it('shows optimistic creation and removal, then restores a failed deletion beside the created user', async () => {
+    cleanup()
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const owned = fixture.application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    fixture.seed([ada])
+    owned.queryClient.setQueryData(owned.rpcQuery.users.list.queryKey(), [ada])
+    render(
+      <QueryClientProvider client={owned.queryClient}>
+        <OptimisticUsers application={owned} />
+      </QueryClientProvider>,
+    )
+    try {
+      fireEvent.click(screen.getByRole('button', { name: 'Delete Ada' }))
+      const deletion = await fixture.nextDelete()
+      await waitFor(() => {
+        expect(screen.queryByText('Ada', { exact: true })).toBeNull()
+      })
+      fireEvent.change(screen.getByLabelText('Name'), { target: { value: 'Grace' } })
+      fireEvent.click(screen.getByRole('button', { name: 'Add user' }))
+      const creation = await fixture.nextCreate()
+      await expect(screen.findByText('Grace', { exact: true })).resolves.toBeDefined()
+      expect(screen.getByRole('button', { name: 'Delete Grace' }).hasAttribute('disabled')).toBe(
+        true,
+      )
+      await creation.succeed(new User({ id: 2, name: 'Grace', locale: 'en' }))
+      await expect(screen.findByText('Added Grace')).resolves.toBeDefined()
+      await deletion.fail()
+      await expect(screen.findByText('Ada', { exact: true })).resolves.toBeDefined()
+      expect(screen.getByText('Grace', { exact: true })).toBeDefined()
+      expect(screen.getByRole('alert').textContent).toContain('users.delete')
+    } finally {
+      cleanup()
+      await owned.dispose()
+    }
+  })
+
   it('disposes its client Scope and runtime idempotently', async () => {
     const ownedApplication = application
     expect(ownedApplication).toBeDefined()
diff --git a/examples/vite-react/tests/commands-ui.test.tsx b/examples/vite-react/tests/commands-ui.test.tsx
new file mode 100644
index 0000000..5e2666f
--- /dev/null
+++ b/examples/vite-react/tests/commands-ui.test.tsx
@@ -0,0 +1,124 @@
+// @vitest-environment jsdom
+
+import { CommandStatus } from '@effect-api-query/contracts'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { cleanup, fireEvent, render, within } from '@testing-library/react'
+import { Effect } from 'effect'
+import { afterEach, describe, expect, it, vi } from 'vite-plus/test'
+
+import { makeControlledUserWrites } from '../../../tests/fixtures/optimistic-users.ts'
+import { CommandsSection } from '../src/components/sections/commands-section.tsx'
+
+describe('Cancellable command recovery', () => {
+  afterEach(cleanup)
+
+  it('stops polling a rejected command and retries with its original operation ID', async () => {
+    const starts: string[] = []
+    let command: CommandStatus | null = null
+    const readStatus = vi.fn<() => Effect.Effect<CommandStatus | null>>(() =>
+      Effect.succeed(command),
+    )
+    const fixture = await Effect.runPromise(
+      makeControlledUserWrites(new QueryClient({ defaultOptions: { queries: { retry: false } } }), {
+        start: ({ operationId, steps }) => {
+          starts.push(operationId)
+          if (starts.length === 1) {
+            return Effect.interrupt
+          }
+          command = new CommandStatus({
+            operationId,
+            state: 'completed',
+            completedSteps: steps,
+            totalSteps: steps,
+          })
+          return Effect.succeed(command)
+        },
+        status: readStatus,
+      }),
+    )
+    try {
+      const view = render(
+        <QueryClientProvider client={fixture.application.queryClient}>
+          <CommandsSection application={fixture.application} />
+        </QueryClientProvider>,
+      )
+      const first = within(view.getByRole('region', { name: 'Command 1' }))
+      fireEvent.click(first.getByRole('button', { name: 'Start command' }))
+      await expect(first.findByText('Start mutation: error')).resolves.toBeDefined()
+      await vi.waitFor(() => {
+        expect(first.getByRole('button', { name: 'Start command' }).hasAttribute('disabled')).toBe(
+          false,
+        )
+        expect(
+          fixture.application.queryClient.getQueryState(
+            fixture.application.rpcQuery.commands.status.queryKey({ operationId: starts[0] ?? '' }),
+          ),
+        ).toMatchObject({ status: 'success', data: null, fetchStatus: 'idle' })
+      })
+      const reads = readStatus.mock.calls.length
+      await Effect.runPromise(Effect.sleep('250 millis'))
+      expect(readStatus).toHaveBeenCalledTimes(reads)
+      fireEvent.click(first.getByRole('button', { name: 'Start command' }))
+      await expect(first.findByText('Server state: completed')).resolves.toBeDefined()
+      expect(starts).toHaveLength(2)
+      expect(starts[1]).toBe(starts[0])
+    } finally {
+      cleanup()
+      await fixture.application.dispose()
+    }
+  })
+
+  it('continues reconciling accepted work after the start response fails', async () => {
+    let command: CommandStatus | null = null
+    let reads = 0
+    let failedReads = 0
+    const fixture = await Effect.runPromise(
+      makeControlledUserWrites(new QueryClient({ defaultOptions: { queries: { retry: false } } }), {
+        start: ({ operationId, steps }) => {
+          command = new CommandStatus({
+            operationId,
+            state: 'running',
+            completedSteps: 1,
+            totalSteps: steps,
+          })
+          return Effect.interrupt
+        },
+        status: () => {
+          if (command !== null && failedReads === 0) {
+            failedReads += 1
+            return Effect.interrupt
+          }
+          reads += 1
+          if (command !== null && reads >= 3) {
+            command = new CommandStatus({
+              operationId: command.operationId,
+              totalSteps: command.totalSteps,
+              state: 'completed',
+              completedSteps: command.totalSteps,
+            })
+          }
+          return Effect.succeed(command)
+        },
+      }),
+    )
+    try {
+      const view = render(
+        <QueryClientProvider client={fixture.application.queryClient}>
+          <CommandsSection application={fixture.application} />
+        </QueryClientProvider>,
+      )
+      const first = within(view.getByRole('region', { name: 'Command 1' }))
+      fireEvent.click(first.getByRole('button', { name: 'Start command' }))
+      await expect(first.findByText('Start mutation: error')).resolves.toBeDefined()
+      await expect(first.findByText('Server state: completed')).resolves.toBeDefined()
+      expect(reads).toBeGreaterThanOrEqual(3)
+      expect(failedReads).toBe(1)
+      expect(first.getByRole('button', { name: 'Start command' }).hasAttribute('disabled')).toBe(
+        true,
+      )
+    } finally {
+      cleanup()
+      await fixture.application.dispose()
+    }
+  })
+})
diff --git a/examples/vite-react/tests/commands.test.ts b/examples/vite-react/tests/commands.test.ts
index e985ce1..8549fae 100644
--- a/examples/vite-react/tests/commands.test.ts
+++ b/examples/vite-react/tests/commands.test.ts
@@ -4,8 +4,79 @@ import { Effect, Exit, Scope } from 'effect'
 import { describe, expect, it } from 'vite-plus/test'
 
 import { startViteReactApplication } from '../src/lib/application.ts'
+import type { ViteReactApplication } from '../src/lib/application.ts'
 
 describe('Cancellable commands', () => {
+  it('drains an accepted command before replacing its owner and preserves completed work', async () => {
+    const serverScope = await Effect.runPromise(Scope.make())
+    let previous: ViteReactApplication | undefined
+    let current: ViteReactApplication | undefined
+    try {
+      const server = await Effect.runPromise(
+        startExampleRpcServer().pipe(Scope.provide(serverScope)),
+      )
+      previous = await startViteReactApplication({ rpcUrl: server.rpcUrl })
+      const captured = previous
+      const input = { operationId: 'owner-handoff', steps: 10 }
+      const start = new MutationObserver(
+        captured.queryClient,
+        captured.trackMutationOptions(
+          captured.rpcQuery.commands.start.mutationOptions({
+            onSettled: async () => {
+              if (captured.isActive()) {
+                await captured.queryClient.invalidateQueries({
+                  queryKey: captured.rpcQuery.commands.status.queryKey(input),
+                })
+              }
+            },
+          }),
+        ),
+      )
+      const accepted = start.mutate(input)
+      const statusOptions = captured.rpcQuery.commands.status.queryOptions({ input })
+      await expect
+        .poll(async () => {
+          const status = await captured.queryClient.query(statusOptions)
+          return status?.completedSteps ?? 0
+        })
+        .toBeGreaterThan(0)
+      expect(captured.queryClient.getQueryData(statusOptions.queryKey)?.state).toBe('running')
+      expect(start.getCurrentResult().status).toBe('pending')
+
+      const retiring = captured.dispose()
+      expect(captured.isActive()).toBe(false)
+      const completed = await accepted
+      await retiring
+      expect(completed).toMatchObject({
+        operationId: 'owner-handoff',
+        state: 'completed',
+        completedSteps: 10,
+        totalSteps: 10,
+      })
+      expect(start.getCurrentResult().status).toBe('success')
+      expect(captured.queryClient.getQueryCache().getAll()).toHaveLength(0)
+      expect(captured.queryClient.getMutationCache().getAll()).toHaveLength(0)
+
+      current = await startViteReactApplication({
+        rpcUrl: server.rpcUrl,
+        identity: { ...captured.identity, permissionGeneration: 2 },
+      })
+      const replacementStart = new MutationObserver(
+        current.queryClient,
+        current.trackMutationOptions(current.rpcQuery.commands.start.mutationOptions()),
+      )
+      expect(replacementStart.getCurrentResult().status).toBe('idle')
+      expect(current.queryClient.getMutationCache().getAll()).toHaveLength(0)
+      await expect(
+        current.queryClient.query(current.rpcQuery.commands.status.queryOptions({ input })),
+      ).resolves.toStrictEqual(completed)
+    } finally {
+      await previous?.dispose()
+      await current?.dispose()
+      await Effect.runPromise(Scope.close(serverScope, Exit.void))
+    }
+  })
+
   it('cancels a pending command, reconciles cached progress, and isolates another command', async () => {
     const scope = await Effect.runPromise(Scope.make())
     const server = await Effect.runPromise(startExampleRpcServer().pipe(Scope.provide(scope)))
diff --git a/examples/vite-react/tests/minimal-setup.test.tsx b/examples/vite-react/tests/minimal-setup.test.tsx
new file mode 100644
index 0000000..5ab0eae
--- /dev/null
+++ b/examples/vite-react/tests/minimal-setup.test.tsx
@@ -0,0 +1,35 @@
+// @vitest-environment jsdom
+
+import { startExampleRpcServer } from '@effect-api-query/server'
+import { act, screen } from '@testing-library/react'
+import { Effect, Exit, Scope } from 'effect'
+import { describe, expect, it } from 'vite-plus/test'
+
+import { mountUsersApplication } from '../../../tests/types/docs-react-setup.tsx'
+
+describe('minimal React setup recipe', () => {
+  it('mounts a ready HTTP utility tree with its provider and releases the application after unmount', async () => {
+    const scope = await Effect.runPromise(Scope.make())
+    const element = document.createElement('div')
+    document.body.append(element)
+    let stop: (() => Promise<void>) | undefined
+    try {
+      const server = await Effect.runPromise(startExampleRpcServer().pipe(Scope.provide(scope)))
+      await act(async () => {
+        stop = await mountUsersApplication(element, server.httpApiUrl)
+      })
+      await expect(screen.findByRole('heading', { name: 'Ada Lovelace' })).resolves.toBeDefined()
+      await act(async () => {
+        await stop?.()
+      })
+      stop = undefined
+      expect(element.childElementCount).toBe(0)
+    } finally {
+      if (stop !== undefined) {
+        await act(stop)
+      }
+      element.remove()
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+})
diff --git a/examples/vite-react/tests/owner-boundary.test.tsx b/examples/vite-react/tests/owner-boundary.test.tsx
new file mode 100644
index 0000000..bd192c0
--- /dev/null
+++ b/examples/vite-react/tests/owner-boundary.test.tsx
@@ -0,0 +1,67 @@
+// @vitest-environment jsdom
+
+import type { CommandStatus } from '@effect-api-query/contracts'
+import { startExampleRpcServer } from '@effect-api-query/server'
+import { cleanup, fireEvent, render, screen, within } from '@testing-library/react'
+import { Effect, Exit, Scope } from 'effect'
+import { describe, expect, it, vi } from 'vite-plus/test'
+
+import { ViteReactExample } from '../src/app.tsx'
+import { startViteReactApplication } from '../src/lib/application.ts'
+import type { ViteReactApplication } from '../src/lib/application.ts'
+
+describe('React consumers at the application owner boundary', () => {
+  it.each([1, 2])(
+    'remounts native observers when replacing owner clients at permission generation %s',
+    async (permissionGeneration) => {
+      const serverScope = await Effect.runPromise(Scope.make())
+      let previous: ViteReactApplication | undefined
+      let current: ViteReactApplication | undefined
+      try {
+        const server = await Effect.runPromise(
+          startExampleRpcServer().pipe(Scope.provide(serverScope)),
+        )
+        previous = await startViteReactApplication({ rpcUrl: server.rpcUrl })
+        const view = render(<ViteReactExample application={previous} />)
+        const first = screen.getByRole('region', { name: 'Command 1' })
+        fireEvent.click(within(first).getByRole('button', { name: 'Start command' }))
+        await expect(within(first).findByText('Server state: running')).resolves.toBeDefined()
+        const [status] = previous.queryClient
+          .getQueriesData<CommandStatus | null>({
+            queryKey: previous.rpcQuery.commands.status.key(),
+          })
+          .map(([, data]) => data)
+        expect(status?.operationId).toBeDefined()
+        if (status === undefined || status === null) {
+          throw new Error('Expected the started command status')
+        }
+        current = await startViteReactApplication({
+          rpcUrl: server.rpcUrl,
+          identity: { ...previous.identity, permissionGeneration },
+        })
+        view.rerender(<ViteReactExample application={current} />)
+        expect(screen.getAllByText('Start mutation: idle')).toHaveLength(2)
+        expect(screen.getAllByText('Server state: not started')).toHaveLength(2)
+        const capturedCurrent = current
+        await vi.waitFor(() => {
+          expect(
+            capturedCurrent.queryClient.getQueryData(
+              capturedCurrent.rpcQuery.users.list.queryKey(),
+            ),
+          ).toBeDefined()
+        })
+        await current.rpcQuery.commands.cancel
+          .mutationOptions()
+          .mutationFn({ operationId: status.operationId })
+        await previous.dispose()
+        expect(previous.queryClient.getQueryCache().getAll()).toHaveLength(0)
+        expect(current.queryClient.getMutationCache().getAll()).toHaveLength(0)
+      } finally {
+        cleanup()
+        await previous?.dispose()
+        await current?.dispose()
+        await Effect.runPromise(Scope.close(serverScope, Exit.void))
+      }
+    },
+  )
+})
diff --git a/examples/vite-react/tests/owner-cache.test.ts b/examples/vite-react/tests/owner-cache.test.ts
new file mode 100644
index 0000000..3b30e20
--- /dev/null
+++ b/examples/vite-react/tests/owner-cache.test.ts
@@ -0,0 +1,219 @@
+import { MutationObserver, onlineManager, QueryClient } from '@tanstack/react-query'
+import { Deferred, Effect } from 'effect'
+import { describe, expect, it, vi } from 'vite-plus/test'
+
+import { makeOwnerCache, ownerKeyPrefix } from '../src/lib/owner-cache.ts'
+
+const identity = {
+  tenantId: 'team-a',
+  userId: 'user-a',
+  sessionGeneration: 3,
+  permissionGeneration: 7,
+}
+
+const makeStorage = () => {
+  const values = new Map<string, string>()
+  return {
+    getItem: (key: string) => values.get(key) ?? null,
+    removeItem: (key: string) => {
+      values.delete(key)
+    },
+    setItem: (key: string, value: string) => {
+      values.set(key, value)
+    },
+    values,
+  }
+}
+
+const makeCache = (
+  queryClient: QueryClient,
+  storage: ReturnType<typeof makeStorage>,
+  owner = identity,
+) => {
+  const prefix = ownerKeyPrefix(owner)
+  return makeOwnerCache({
+    identity: owner,
+    queryClient,
+    directoryKeys: {
+      rpc: [...prefix, 'rpc', 'users', 'list', 'query'],
+      http: [...prefix, 'http', 'users', 'list', 'query'],
+    },
+    storage,
+  })
+}
+
+describe('application private cache owner', () => {
+  it('attempts accepted native writes without leaving an offline queue on owner handoff', async () => {
+    const queryClient = new QueryClient()
+    const owner = makeCache(queryClient, makeStorage())
+    const mutation = new MutationObserver(
+      queryClient,
+      owner.trackMutationOptions({
+        mutationFn: async () => await Promise.resolve(4),
+      }),
+    )
+    onlineManager.setOnline(false)
+    const result = mutation.mutate()
+    try {
+      await vi.waitFor(() => {
+        expect(mutation.getCurrentResult().status).toBe('success')
+      })
+      await expect(result).resolves.toBe(4)
+      await owner.retire()
+      expect(queryClient.getMutationCache().getAll()).toHaveLength(0)
+    } finally {
+      onlineManager.setOnline(true)
+      await queryClient.resumePausedMutations()
+      await result
+      await owner.retire()
+    }
+  })
+
+  it('drains an accepted native mutation and rejects new native work after retirement', async () => {
+    const queryClient = new QueryClient()
+    const stored = makeStorage()
+    const owner = makeCache(queryClient, stored)
+    queryClient.setQueryData(
+      [...ownerKeyPrefix(identity), 'rpc', 'users', 'list', 'query'],
+      [{ id: 1, name: 'Ada', locale: 'en' }],
+    )
+    owner.persistDirectory()
+    expect(stored.values.size).toBe(1)
+    const entered = Deferred.makeUnsafe<undefined>()
+    const release = Deferred.makeUnsafe<number>()
+    const mutation = new MutationObserver(
+      queryClient,
+      owner.trackMutationOptions({
+        mutationFn: async () => {
+          await Effect.runPromise(Deferred.succeed(entered, undefined))
+          return await Effect.runPromise(Deferred.await(release))
+        },
+      }),
+    )
+    const result = mutation.mutate()
+    await Effect.runPromise(Deferred.await(entered))
+    owner.persistDirectory()
+    expect(stored.values.size).toBe(0)
+    const retiring = owner.retire()
+    await Effect.runPromise(Deferred.succeed(release, 4))
+    await expect(result).resolves.toBe(4)
+    await retiring
+    const late = new MutationObserver(
+      queryClient,
+      owner.trackMutationOptions({
+        mutationFn: async () => await Promise.resolve(5),
+      }),
+    )
+    await expect(late.mutate()).rejects.toThrow('Owner is inactive')
+    queryClient.clear()
+  })
+
+  it('preserves an explicit reload snapshot while retiring its old in-memory owner', async () => {
+    const storage = makeStorage()
+    const queryClient = new QueryClient()
+    const owner = makeCache(queryClient, storage)
+    const key = [...ownerKeyPrefix(identity), 'rpc', 'users', 'list', 'query']
+    queryClient.setQueryData(key, [{ id: 2, name: 'Grace', locale: 'fr' }])
+    await owner.retire({ discardPersistence: false })
+    expect(owner.isActive()).toBe(false)
+    expect(queryClient.getQueryCache().getAll()).toHaveLength(0)
+    expect(storage.values.size).toBe(1)
+    const browser = new QueryClient()
+    const resumed = makeCache(browser, storage)
+    expect(resumed.restoreDirectory()).toBe(true)
+    expect(browser.getQueryData(key)).toStrictEqual([{ id: 2, name: 'Grace', locale: 'fr' }])
+    expect(browser.getQueryState(key)?.dataUpdatedAt).toBe(0)
+    await resumed.retire()
+    expect(storage.values.size).toBe(0)
+    expect(resumed.restoreDirectory()).toBe(false)
+  })
+
+  it('restores only validated directory DTOs for the same owner and compatible busters', () => {
+    const storage = makeStorage()
+    const server = new QueryClient()
+    const original = makeCache(server, storage)
+    const key = [...ownerKeyPrefix(identity), 'rpc', 'users', 'list', 'query']
+    server.setQueryData(key, [{ id: 1, name: 'Ada', locale: 'en' }])
+    original.persistDirectory()
+    const [saved] = [...storage.values.entries()]
+    expect(saved).toBeDefined()
+    if (saved === undefined) {
+      throw new Error('Expected a persisted directory')
+    }
+    const [storageKey, json] = saved
+    const browser = new QueryClient()
+    const restored = makeCache(browser, storage)
+    expect(restored.restoreDirectory()).toBe(true)
+    expect(browser.getQueryData(key)).toStrictEqual([{ id: 1, name: 'Ada', locale: 'en' }])
+    browser.clear()
+    const snapshot = {
+      identity,
+      schemaVersion: 1,
+      keyVersion: 1,
+      directories: [{ adapter: 'rpc', data: [{ id: 1, name: 'Ada', locale: 'en' }] }],
+    }
+    for (const incompatible of [
+      { ...snapshot, identity: { ...identity, tenantId: 'team-b' } },
+      { ...snapshot, identity: { ...identity, permissionGeneration: 8 } },
+      { ...snapshot, identity: { ...identity, sessionGeneration: 4 } },
+      { ...snapshot, schemaVersion: 2 },
+      { ...snapshot, keyVersion: 2 },
+      {
+        ...snapshot,
+        directories: [{ adapter: 'rpc', data: [{ id: 'invalid', name: 'Ada', locale: 'en' }] }],
+      },
+    ]) {
+      storage.setItem(storageKey, JSON.stringify(incompatible))
+      expect(restored.restoreDirectory()).toBe(false)
+      expect(browser.getQueryCache().getAll()).toHaveLength(0)
+      expect(storage.getItem(storageKey)).toBeNull()
+    }
+    storage.setItem(storageKey, json)
+    const other = makeCache(browser, storage, { ...identity, tenantId: 'team-b' })
+    expect(other.restoreDirectory()).toBe(false)
+    expect(storage.getItem(storageKey)).toBe(json)
+    server.clear()
+    browser.clear()
+  })
+
+  it('retires immediately, removes private state, and lets accepted mutations settle', async () => {
+    const queryClient = new QueryClient()
+    const storage = makeStorage()
+    const owner = makeCache(queryClient, storage)
+    const key = [...ownerKeyPrefix(identity), 'rpc', 'users', 'list', 'query']
+    queryClient.setQueryData(key, [{ id: 1, name: 'Ada', locale: 'en' }])
+    owner.persistDirectory()
+    expect(storage.values.size).toBe(1)
+    const complete = Deferred.makeUnsafe<number>()
+    let serverWriteCompleted = false
+    const result = owner.runMutation(async () => {
+      const value = await Effect.runPromise(Deferred.await(complete))
+      serverWriteCompleted = true
+      return value
+    })
+    await Promise.resolve()
+    const retiring = owner.retire()
+    expect(owner.isActive()).toBe(false)
+    await expect(owner.runMutation(async () => await Promise.resolve(3))).rejects.toThrow(
+      'Owner is inactive',
+    )
+    await Promise.resolve()
+    expect(queryClient.getQueryData(key)).toBeUndefined()
+    expect(storage.values.size).toBe(0)
+    owner.persistDirectory()
+    expect(storage.values.size).toBe(0)
+    let retired = false
+    void (async () => {
+      await retiring
+      retired = true
+    })()
+    await Promise.resolve()
+    expect(retired).toBe(false)
+    await Effect.runPromise(Deferred.succeed(complete, 2))
+    await expect(result).resolves.toBe(2)
+    await retiring
+    expect(serverWriteCompleted).toBe(true)
+    expect(retired).toBe(true)
+    await owner.retire()
+  })
+})
diff --git a/examples/vite-react/tests/owner-switch.test.ts b/examples/vite-react/tests/owner-switch.test.ts
new file mode 100644
index 0000000..e2173a6
--- /dev/null
+++ b/examples/vite-react/tests/owner-switch.test.ts
@@ -0,0 +1,187 @@
+import { startExampleRpcServer } from '@effect-api-query/server'
+import { MutationObserver } from '@tanstack/react-query'
+import { Deferred, Effect, Exit, Scope } from 'effect'
+import { describe, expect, it, vi } from 'vite-plus/test'
+
+import { startViteReactApplication } from '../src/lib/application.ts'
+import type { ViteReactApplication } from '../src/lib/application.ts'
+
+const identity = {
+  tenantId: 'example-team',
+  userId: 'example-user',
+  sessionGeneration: 1,
+  permissionGeneration: 1,
+}
+
+const storage = () => {
+  const values = new Map<string, string>()
+  return {
+    getItem: (key: string) => values.get(key) ?? null,
+    removeItem: (key: string) => {
+      values.delete(key)
+    },
+    setItem: (key: string, value: string) => {
+      values.set(key, value)
+    },
+    values,
+  }
+}
+
+describe('existing Vite application owner handoff', () => {
+  it('captures the original identity before acquiring clients', async () => {
+    const serverScope = await Effect.runPromise(Scope.make())
+    let application: ViteReactApplication | undefined
+    try {
+      const server = await Effect.runPromise(
+        startExampleRpcServer().pipe(Scope.provide(serverScope)),
+      )
+      const callerIdentity = { ...identity }
+      const starting = startViteReactApplication({
+        rpcUrl: server.rpcUrl,
+        identity: callerIdentity,
+      })
+      callerIdentity.permissionGeneration = 7
+      application = await starting
+      expect(application.identity).toStrictEqual(identity)
+      expect(Object.isFrozen(application.identity)).toBe(true)
+      expect(application.rpcQuery.users.list.queryKey().slice(0, 5)).toStrictEqual([
+        'vite-react',
+        identity.tenantId,
+        identity.userId,
+        identity.sessionGeneration,
+        identity.permissionGeneration,
+      ])
+      expect(application.httpQuery.users.list.queryKey().slice(0, 5)).toStrictEqual([
+        'vite-react',
+        identity.tenantId,
+        identity.userId,
+        identity.sessionGeneration,
+        identity.permissionGeneration,
+      ])
+    } finally {
+      await application?.dispose()
+      await Effect.runPromise(Scope.close(serverScope, Exit.void))
+    }
+  })
+
+  it('reports concurrent persistence-removal failures after cleaning its captured owner', async () => {
+    const serverScope = await Effect.runPromise(Scope.make())
+    const persisted = storage()
+    const removalFailure = new Error('Storage removal failed')
+    let removalFails = false
+    let application: ViteReactApplication | undefined
+    try {
+      const server = await Effect.runPromise(
+        startExampleRpcServer().pipe(Scope.provide(serverScope)),
+      )
+      application = await startViteReactApplication({
+        rpcUrl: server.rpcUrl,
+        identity,
+        directoryStorage: {
+          ...persisted,
+          removeItem: (key) => {
+            if (removalFails) {
+              throw removalFailure
+            }
+            persisted.removeItem(key)
+          },
+        },
+      })
+      await application.queryClient.query(application.rpcQuery.users.list.queryOptions())
+      removalFails = true
+      const results = await Promise.allSettled([application.dispose(), application.dispose()])
+      expect(results).toStrictEqual([
+        { status: 'rejected', reason: removalFailure },
+        { status: 'rejected', reason: removalFailure },
+      ])
+      expect(application.isActive()).toBe(false)
+      expect(application.queryClient.getQueryCache().getAll()).toHaveLength(0)
+    } finally {
+      removalFails = false
+      await application?.dispose().catch(() => null)
+      await Effect.runPromise(Scope.close(serverScope, Exit.void))
+    }
+  })
+
+  it('isolates delayed mutation callbacks while preserving the completed server write', async () => {
+    const serverScope = await Effect.runPromise(Scope.make())
+    const callbackEntered = Deferred.makeUnsafe<undefined>()
+    const releaseCallback = Deferred.makeUnsafe<undefined>()
+    const persisted = storage()
+    let previous: ViteReactApplication | undefined
+    let current: ViteReactApplication | undefined
+    try {
+      const server = await Effect.runPromise(
+        startExampleRpcServer().pipe(Scope.provide(serverScope)),
+      )
+      previous = await startViteReactApplication({
+        rpcUrl: server.rpcUrl,
+        identity,
+        directoryStorage: persisted,
+      })
+      const captured = previous
+      await captured.queryClient.query(captured.rpcQuery.users.list.queryOptions())
+      captured.persistDirectory()
+      expect(persisted.values.size).toBe(1)
+      const streamOptions = captured.rpcQuery.diagnostics.stream.liveOptions()
+      const streaming = captured.queryClient.query(streamOptions).catch(() => null)
+      await vi.waitFor(() => {
+        expect(captured.queryClient.isFetching({ queryKey: streamOptions.queryKey })).toBe(1)
+      })
+      const writeOptions = captured.rpcQuery.users.create.mutationOptions()
+      const mutation = new MutationObserver(captured.queryClient, {
+        ...writeOptions,
+        mutationFn: async (input) =>
+          await captured.runMutation(async () => await writeOptions.mutationFn(input)),
+        onSuccess: async (user) => {
+          await Effect.runPromise(Deferred.succeed(callbackEntered, undefined))
+          await Effect.runPromise(Deferred.await(releaseCallback))
+          if (captured.isActive()) {
+            captured.queryClient.setQueryData(
+              captured.rpcQuery.users.get.queryKey({ id: user.id }),
+              user,
+            )
+          }
+          await captured.invalidateUsers()
+          captured.persistDirectory()
+        },
+        onSettled: async () => {
+          await captured.invalidateUsers()
+          captured.persistDirectory()
+        },
+      })
+      const writing = mutation.mutate({ name: 'Completed before handoff' })
+      await Effect.runPromise(Deferred.await(callbackEntered))
+      await captured.dispose()
+      current = await startViteReactApplication({
+        rpcUrl: server.rpcUrl,
+        identity: { ...identity, permissionGeneration: 2 },
+        directoryStorage: persisted,
+      })
+      expect(captured.isActive()).toBe(false)
+      expect(captured.queryClient.getQueryCache().getAll()).toHaveLength(0)
+      expect(captured.queryClient.getMutationCache().getAll()).toHaveLength(0)
+      expect(persisted.values.size).toBe(0)
+      expect(current.queryClient).not.toBe(captured.queryClient)
+      expect(current.rpcQuery.key()).not.toStrictEqual(captured.rpcQuery.key())
+      expect(current.httpQuery.key()).not.toStrictEqual(captured.httpQuery.key())
+      const users = await current.queryClient.query(current.rpcQuery.users.list.queryOptions())
+      expect(users.at(-1)?.name).toBe('Completed before handoff')
+      const newKey = current.rpcQuery.users.list.queryKey()
+      current.persistDirectory()
+      const currentSnapshot = [...persisted.values.entries()]
+      await Effect.runPromise(Deferred.succeed(releaseCallback, undefined))
+      await writing
+      await streaming
+      expect(captured.queryClient.getQueryCache().getAll()).toHaveLength(0)
+      expect(current.queryClient.getQueryState(newKey)?.isInvalidated).toBe(false)
+      expect(current.queryClient.getQueryData(newKey)).toBe(users)
+      expect([...persisted.values.entries()]).toStrictEqual(currentSnapshot)
+    } finally {
+      await Effect.runPromise(Deferred.succeed(releaseCallback, undefined))
+      await previous?.dispose()
+      await current?.dispose()
+      await Effect.runPromise(Scope.close(serverScope, Exit.void))
+    }
+  })
+})
diff --git a/examples/vite-react/tests/slow-query-cancellation.test.tsx b/examples/vite-react/tests/slow-query-cancellation.test.tsx
new file mode 100644
index 0000000..253034c
--- /dev/null
+++ b/examples/vite-react/tests/slow-query-cancellation.test.tsx
@@ -0,0 +1,195 @@
+// @vitest-environment jsdom
+
+import type { DiagnosticStatus } from '@effect-api-query/contracts'
+import { QueryClient } from '@tanstack/react-query'
+import type { QueryFunctionContext } from '@tanstack/react-query'
+import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
+import { Deferred, Effect } from 'effect'
+import { afterEach, describe, expect, it } from 'vite-plus/test'
+
+import { useSlowQueryCancellation } from '../../shared/use-slow-query-cancellation.ts'
+
+interface SlowInput {
+  readonly durationMs: number
+  readonly operationId: string
+}
+interface StatusInput {
+  readonly operationId: string
+}
+type Transport = 'rpc' | 'http'
+
+const makeApplication = ({
+  readStatus,
+  isActive = () => true,
+}: {
+  readonly readStatus?: (status: DiagnosticStatus) => Effect.Effect<DiagnosticStatus>
+  readonly isActive?: () => boolean
+} = {}) => {
+  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  const operations = new Map<string, DiagnosticStatus>()
+  const statusSignals: AbortSignal[] = []
+  const status = (operationId: string) =>
+    operations.get(operationId) ?? { started: 0, interrupted: 0 }
+  const slow = Effect.fnUntraced(function* ({ operationId }: SlowInput) {
+    operations.set(operationId, { ...status(operationId), started: 1 })
+    return yield* Effect.never.pipe(
+      Effect.onInterrupt(() =>
+        Effect.sync(() => {
+          operations.set(operationId, { ...status(operationId), interrupted: 1 })
+        }),
+      ),
+    )
+  })
+  const slowQuery = (transport: Transport, input: SlowInput) => ({
+    queryKey: [transport, 'slow', input.operationId],
+    queryFn: async ({ signal }: QueryFunctionContext) => Effect.runPromise(slow(input), { signal }),
+  })
+  const statusQuery = (transport: Transport, { operationId }: StatusInput) => ({
+    queryKey: [transport, 'status', operationId],
+    queryFn: async ({ signal }: QueryFunctionContext) => {
+      statusSignals.push(signal)
+      const current = status(operationId)
+      return Effect.runPromise(readStatus?.(current) ?? Effect.succeed(current), { signal })
+    },
+  })
+
+  const application = {
+    queryClient,
+    isActive,
+    rpcQuery: {
+      diagnostics: {
+        slow: {
+          queryKey: (input: SlowInput) => slowQuery('rpc', input).queryKey,
+          queryOptions: ({ input }: { readonly input: SlowInput }) => slowQuery('rpc', input),
+        },
+        operationStatus: {
+          queryKey: (input: StatusInput) => statusQuery('rpc', input).queryKey,
+          queryOptions: ({ input }: { readonly input: StatusInput }) => statusQuery('rpc', input),
+        },
+      },
+    },
+    httpQuery: {
+      diagnostics: {
+        slow: {
+          queryKey: ({ query }: { readonly query: SlowInput }) => slowQuery('http', query).queryKey,
+          queryOptions: ({ input }: { readonly input: { readonly query: SlowInput } }) =>
+            slowQuery('http', input.query),
+        },
+        operationStatus: {
+          queryKey: ({ params }: { readonly params: StatusInput }) =>
+            statusQuery('http', params).queryKey,
+          queryOptions: ({ input }: { readonly input: { readonly params: StatusInput } }) =>
+            statusQuery('http', input.params),
+        },
+      },
+    },
+  }
+  return { application, operations, statusSignals }
+}
+
+describe('shared slow-query cancellation lifetime', () => {
+  afterEach(cleanup)
+
+  it.each(['rpc', 'http'] as const)(
+    'unmounting one %s hook interrupts only its operation',
+    async (transport) => {
+      const { application, operations } = makeApplication()
+      const first = renderHook(() => useSlowQueryCancellation(application, transport))
+      const second = renderHook(() => useSlowQueryCancellation(application, transport))
+      try {
+        await act(async () => {
+          await Promise.all([first.result.current.start(), second.result.current.start()])
+        })
+        expect(first.result.current.canCancel).toBe(true)
+        expect(second.result.current.canCancel).toBe(true)
+        expect(operations.size).toBe(2)
+
+        first.unmount()
+        await waitFor(() => {
+          expect(
+            [...operations.values()].filter(({ interrupted }) => interrupted === 1),
+          ).toHaveLength(1)
+        })
+        expect(application.queryClient.isFetching()).toBe(1)
+        expect(second.result.current.canCancel).toBe(true)
+
+        await act(async () => second.result.current.cancel())
+        expect(second.result.current.state).toStrictEqual({ _tag: 'Cancelled', interruptions: 1 })
+        expect(application.queryClient.isFetching()).toBe(0)
+      } finally {
+        first.unmount()
+        second.unmount()
+        await application.queryClient.cancelQueries()
+        application.queryClient.clear()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'unmounting during the initial %s status request stops the request and prevents a slow query',
+    async (transport) => {
+      const { application, operations, statusSignals } = makeApplication({
+        readStatus: () => Effect.never,
+      })
+      const hook = renderHook(() => useSlowQueryCancellation(application, transport))
+      let starting: Promise<void> | undefined
+      try {
+        act(() => {
+          starting = hook.result.current.start()
+        })
+        await waitFor(() => {
+          expect(statusSignals).toHaveLength(1)
+        })
+        hook.unmount()
+        await starting
+        expect(statusSignals[0]?.aborted).toBe(true)
+        expect(operations.size).toBe(0)
+        expect(application.queryClient.isFetching()).toBe(0)
+      } finally {
+        hook.unmount()
+        await application.queryClient.cancelQueries()
+        application.queryClient.clear()
+      }
+    },
+  )
+
+  it('does not publish a completed status request or poll again after its owner retires', async () => {
+    let active = true
+    let statusReads = 0
+    const release = Deferred.makeUnsafe<DiagnosticStatus>()
+    const { application, operations } = makeApplication({
+      isActive: () => active,
+      readStatus: (status) => {
+        statusReads += 1
+        return statusReads === 1 ? Effect.succeed(status) : Deferred.await(release)
+      },
+    })
+    const hook = renderHook(() => useSlowQueryCancellation(application))
+    let starting: Promise<void> | undefined
+    try {
+      act(() => {
+        starting = hook.result.current.start()
+      })
+      await waitFor(() => {
+        expect(statusReads).toBe(2)
+      })
+      active = false
+      await act(async () => {
+        await Effect.runPromise(Deferred.succeed(release, { started: 1, interrupted: 0 }))
+        await starting
+      })
+      expect(hook.result.current.canCancel).toBe(false)
+      expect(hook.result.current.state).toStrictEqual({ _tag: 'Starting' })
+      await act(async () => {
+        await hook.result.current.start()
+        await hook.result.current.cancel()
+      })
+      expect(statusReads).toBe(2)
+      expect(operations.size).toBe(1)
+    } finally {
+      hook.unmount()
+      await application.queryClient.cancelQueries()
+      application.queryClient.clear()
+    }
+  })
+})
diff --git a/examples/vite-react/tests/stream-tracing.test.ts b/examples/vite-react/tests/stream-tracing.test.ts
new file mode 100644
index 0000000..485e46e
--- /dev/null
+++ b/examples/vite-react/tests/stream-tracing.test.ts
@@ -0,0 +1,47 @@
+import { Deferred, Effect, Stream, Tracer } from 'effect'
+import { describe, expect, it } from 'vite-plus/test'
+
+import { traceFeed } from '../../../tests/types/docs-stream-tracing.ts'
+
+describe('stream tracing recipe', () => {
+  it('traces lazy pulls and waits for asynchronous cleanup before ending the span', async () => {
+    const spans: Tracer.NativeSpan[] = []
+    const tracer = Tracer.make({
+      span: (options) => {
+        const span = new Tracer.NativeSpan(options)
+        spans.push(span)
+        return span
+      },
+    })
+    const cleanupStarted = Deferred.makeUnsafe<undefined>()
+    const allowCleanup = Deferred.makeUnsafe<undefined>()
+    const source = Stream.concat(Stream.succeed('Ready'), Stream.never).pipe(
+      Stream.ensuring(
+        Effect.gen(function* () {
+          yield* Deferred.succeed(cleanupStarted, undefined)
+          yield* Deferred.await(allowCleanup)
+        }),
+      ),
+    )
+    const iterable = await Effect.runPromise(
+      Stream.toAsyncIterableEffect(traceFeed(source)).pipe(Effect.withTracer(tracer)),
+    )
+    expect(spans).toHaveLength(0)
+    const iterator = iterable[Symbol.asyncIterator]()
+    try {
+      await expect(iterator.next()).resolves.toStrictEqual({ value: 'Ready', done: false })
+      expect(spans[0]?.status._tag).toBe('Started')
+      expect(spans[0]?.attributes.get('feed.received')).toBe(true)
+      const closing = iterator.return?.()
+      await Effect.runPromise(Deferred.await(cleanupStarted))
+      expect(spans[0]?.status._tag).toBe('Started')
+      await Effect.runPromise(Deferred.succeed(allowCleanup, undefined))
+      await closing
+      expect(spans[0]?.status._tag).toBe('Ended')
+      expect(spans[0]?.attributes.get('feed.cleanup')).toBe(true)
+    } finally {
+      await Effect.runPromise(Deferred.succeed(allowCleanup, undefined))
+      await iterator.return?.()
+    }
+  })
+})
diff --git a/examples/vite-react/tests/suspense-recovery.test.tsx b/examples/vite-react/tests/suspense-recovery.test.tsx
new file mode 100644
index 0000000..b0e3c55
--- /dev/null
+++ b/examples/vite-react/tests/suspense-recovery.test.tsx
@@ -0,0 +1,126 @@
+// @vitest-environment jsdom
+
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { Effect, Exit, Scope } from 'effect'
+import { Suspense } from 'react'
+import { afterEach, describe, expect, it } from 'vite-plus/test'
+
+import { makeRpcTestClient } from '../../../tests/fixtures/effect-rpc.ts'
+import {
+  failureMessage,
+  makeSuspenseQueries,
+  suspenseGroup,
+  TwoUsers,
+  UserScreen,
+  UserUnavailable,
+} from '../../../tests/types/docs-suspense.tsx'
+import type { Queries } from '../../../tests/types/docs-suspense.tsx'
+
+const withUsers = async (
+  read: (
+    id: number,
+  ) => Effect.Effect<{ readonly id: number; readonly name: string }, UserUnavailable>,
+  run: (rpc: Queries<never>, queryClient: QueryClient) => Promise<void>,
+) => {
+  const scope = await Effect.runPromise(Scope.make())
+  const queryClient = new QueryClient()
+  try {
+    const client = await Effect.runPromise(
+      makeRpcTestClient(
+        suspenseGroup,
+        suspenseGroup.of({ 'users.get': ({ id }) => read(id) }),
+      ).pipe(Scope.provide(scope)),
+    )
+    await run(makeSuspenseQueries(client), queryClient)
+  } finally {
+    cleanup()
+    await queryClient.cancelQueries()
+    queryClient.clear()
+    await Effect.runPromise(Scope.close(scope, Exit.void))
+  }
+}
+
+const controlledRead = (state: { unavailable: boolean }) => (id: number) =>
+  Effect.suspend(() =>
+    state.unavailable
+      ? Effect.fail(new UserUnavailable({ message: 'Please try again later.' }))
+      : Effect.succeed({ id, name: 'Ada' }),
+  )
+
+const renderUser = (rpc: Queries<never>, queryClient: QueryClient) =>
+  render(
+    <QueryClientProvider client={queryClient}>
+      <UserScreen rpc={rpc} />
+    </QueryClientProvider>,
+  )
+
+describe('Suspense recovery recipe', () => {
+  afterEach(cleanup)
+
+  it('retries an initial failure after the query and application boundaries reset', async () => {
+    const state = { unavailable: true }
+    await withUsers(controlledRead(state), async (rpc, queryClient) => {
+      renderUser(rpc, queryClient)
+      await expect(screen.findByRole('alert')).resolves.toHaveProperty(
+        'textContent',
+        'Please try again later.Try again',
+      )
+      state.unavailable = false
+      fireEvent.click(screen.getByRole('button', { name: 'Try again' }))
+      await expect(screen.findByRole('heading', { name: 'Ada' })).resolves.toBeDefined()
+      expect(screen.queryByRole('alert')).toBeNull()
+    })
+  })
+
+  it('keeps cached data visible after a failed background refresh', async () => {
+    const state = { unavailable: false }
+    await withUsers(controlledRead(state), async (rpc, queryClient) => {
+      renderUser(rpc, queryClient)
+      await expect(screen.findByRole('heading', { name: 'Ada' })).resolves.toBeDefined()
+      state.unavailable = true
+      fireEvent.click(screen.getByRole('button', { name: 'Refresh' }))
+      await expect(screen.findByRole('alert')).resolves.toHaveProperty(
+        'textContent',
+        'Please try again later.',
+      )
+      expect(screen.getByRole('heading', { name: 'Ada' })).toBeDefined()
+      expect(screen.queryByRole('button', { name: 'Try again' })).toBeNull()
+      state.unavailable = false
+      fireEvent.click(screen.getByRole('button', { name: 'Refresh' }))
+      await waitFor(() => {
+        expect(screen.queryByRole('alert')).toBeNull()
+      })
+    })
+  })
+
+  it('starts independent queries before either Suspense request completes', async () => {
+    const started = new Set<number>()
+    await withUsers(
+      (id) =>
+        Effect.gen(function* () {
+          started.add(id)
+          while (started.size < 2) {
+            yield* Effect.yieldNow
+          }
+          return { id, name: id === 1 ? 'Ada' : 'Grace' }
+        }),
+      async (rpc, queryClient) => {
+        render(
+          <QueryClientProvider client={queryClient}>
+            <Suspense fallback={<p>Loading users…</p>}>
+              <TwoUsers rpc={rpc} />
+            </Suspense>
+          </QueryClientProvider>,
+        )
+        await expect(screen.findByText('Ada and Grace')).resolves.toBeDefined()
+      },
+    )
+  })
+
+  it('uses a safe fallback for unknown errors', () => {
+    expect(failureMessage(new Error('private transport details'))).toBe(
+      'The request failed. Please try again.',
+    )
+  })
+})
diff --git a/examples/vite-react/tests/user-writes.test.ts b/examples/vite-react/tests/user-writes.test.ts
new file mode 100644
index 0000000..6ccdad3
--- /dev/null
+++ b/examples/vite-react/tests/user-writes.test.ts
@@ -0,0 +1,870 @@
+import { User, UserPage } from '@effect-api-query/contracts'
+import {
+  InfiniteQueryObserver,
+  MutationObserver,
+  QueryClient,
+  QueryObserver,
+} from '@tanstack/react-query'
+import { Effect } from 'effect'
+import { describe, expect, it } from 'vite-plus/test'
+
+import { makeControlledUserWrites } from '../../../tests/fixtures/optimistic-users.ts'
+
+const twoPageDirectory = (users: readonly User[]) => ({
+  pages: [
+    new UserPage({ users: users.slice(0, 4), total: users.length, nextCursor: 4 }),
+    new UserPage({ users: users.slice(4), total: users.length, nextCursor: null }),
+  ],
+  pageParams: [0, 4],
+})
+
+describe('User writes in the Vite application', () => {
+  it.each(
+    (['rpc', 'http'] as const).flatMap((adapter) =>
+      (['rpc', 'http'] as const).flatMap((refreshedAdapter) =>
+        [false, true].map((retainOther) => ({ adapter, refreshedAdapter, retainOther })),
+      ),
+    ),
+  )(
+    'preserves an authoritative $refreshedAdapter list after a failed $adapter deletion with another user: $retainOther',
+    async ({ adapter, refreshedAdapter, retainOther }) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const alan = new User({ id: 2, name: 'Alan', locale: 'en' })
+      const initial = retainOther ? [ada, alan] : [ada]
+      fixture.seed(initial)
+      const listKeys = {
+        rpc: rpcQuery.users.list.queryKey(),
+        http: httpQuery.users.list.queryKey(),
+      }
+      for (const key of Object.values(listKeys)) {
+        queryClient.setQueryData(key, initial)
+      }
+      try {
+        const deletion =
+          adapter === 'rpc'
+            ? new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+            : new MutationObserver(queryClient, userWrites.httpDelete()).mutate({
+                params: { id: 1 },
+              })
+        const failure = Promise.allSettled([deletion])
+        const request = await fixture.nextDelete()
+        const optimistic = queryClient.getQueryData(listKeys[refreshedAdapter])
+        const authoritative = retainOther ? [alan] : []
+        fixture.seed(authoritative)
+        await (refreshedAdapter === 'rpc'
+          ? queryClient.query(rpcQuery.users.list.queryOptions())
+          : queryClient.query(httpQuery.users.list.queryOptions()))
+        expect(queryClient.getQueryData(listKeys[refreshedAdapter]) === optimistic).toBe(
+          !retainOther || refreshedAdapter === 'rpc',
+        )
+        await request.fail()
+        await expect(failure).resolves.toMatchObject([{ status: 'rejected' }])
+        expect(queryClient.getQueryData(listKeys[refreshedAdapter])).toStrictEqual(authoritative)
+        const otherAdapter = refreshedAdapter === 'rpc' ? 'http' : 'rpc'
+        expect(queryClient.getQueryData(listKeys[otherAdapter])).toStrictEqual(initial)
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'keeps a refreshed %s list authoritative through a later creation and failed deletion',
+    async (adapter) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const grace = new User({ id: 2, name: 'Grace', locale: 'en' })
+      const listKeys = {
+        rpc: rpcQuery.users.list.queryKey(),
+        http: httpQuery.users.list.queryKey(),
+      }
+      fixture.seed([ada])
+      for (const key of Object.values(listKeys)) {
+        queryClient.setQueryData(key, [ada])
+      }
+      try {
+        const deletion = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+        const failure = Promise.allSettled([deletion])
+        const deleteRequest = await fixture.nextDelete()
+        fixture.seed([])
+        await (adapter === 'rpc'
+          ? queryClient.query(rpcQuery.users.list.queryOptions())
+          : queryClient.query(httpQuery.users.list.queryOptions()))
+        const creation = new MutationObserver(queryClient, userWrites.httpCreate()).mutate({
+          payload: { name: 'Grace' },
+        })
+        const createRequest = await fixture.nextCreate()
+        await createRequest.succeed(grace)
+        await creation
+        await deleteRequest.fail()
+        await expect(failure).resolves.toMatchObject([{ status: 'rejected' }])
+        expect(queryClient.getQueryData(listKeys[adapter])).toStrictEqual([grace])
+        const otherAdapter = adapter === 'rpc' ? 'http' : 'rpc'
+        expect(queryClient.getQueryData(listKeys[otherAdapter])).toStrictEqual([ada, grace])
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'preserves a reentrant authoritative %s list publication during an optimistic edit',
+    async (adapter) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const alan = new User({ id: 2, name: 'Alan', locale: 'en' })
+      const key =
+        adapter === 'rpc' ? rpcQuery.users.list.queryKey() : httpQuery.users.list.queryKey()
+      queryClient.setQueryData(key, [ada, alan])
+      const { queryHash } = queryClient.defaultQueryOptions({ queryKey: key })
+      let replace = true
+      const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
+        if (
+          replace &&
+          event.query.queryHash === queryHash &&
+          event.type === 'updated' &&
+          event.action.type === 'success' &&
+          event.action.manual === true
+        ) {
+          replace = false
+          queryClient.setQueryData(key, [alan])
+        }
+      })
+      try {
+        const deletion = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+        const failure = Promise.allSettled([deletion])
+        const request = await fixture.nextDelete()
+        await request.fail()
+        await expect(failure).resolves.toMatchObject([{ status: 'rejected' }])
+        expect(queryClient.getQueryData(key)).toStrictEqual([alan])
+      } finally {
+        unsubscribe()
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'keeps an authoritative %s list after both overlapping deletes fail',
+    async (adapter) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const key =
+        adapter === 'rpc' ? rpcQuery.users.list.queryKey() : httpQuery.users.list.queryKey()
+      fixture.seed([ada])
+      queryClient.setQueryData(key, [ada])
+      try {
+        const older = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+        const olderFailure = Promise.allSettled([older])
+        const olderRequest = await fixture.nextDelete()
+        const newer = new MutationObserver(queryClient, userWrites.httpDelete()).mutate({
+          params: { id: 1 },
+        })
+        const newerFailure = Promise.allSettled([newer])
+        const newerRequest = await fixture.nextDelete()
+        fixture.seed([])
+        await (adapter === 'rpc'
+          ? queryClient.query(rpcQuery.users.list.queryOptions())
+          : queryClient.query(httpQuery.users.list.queryOptions()))
+        await olderRequest.fail()
+        await olderFailure
+        await newerRequest.fail()
+        await expect(newerFailure).resolves.toMatchObject([{ status: 'rejected' }])
+        expect(queryClient.getQueryData(key)).toStrictEqual([])
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'keeps equal authoritative %s pages independent of optimistic ownership',
+    async (adapter) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const key =
+        adapter === 'rpc'
+          ? rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 })
+          : httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } })
+      fixture.seed([ada])
+      queryClient.setQueryData(key, {
+        pages: [new UserPage({ users: [ada], total: 1, nextCursor: null })],
+        pageParams: [0],
+      })
+      try {
+        const deletion = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+        const failure = Promise.allSettled([deletion])
+        const request = await fixture.nextDelete()
+        const optimisticPage = queryClient.getQueryData(key)?.pages[0]
+        fixture.seed([])
+        await (adapter === 'rpc'
+          ? queryClient.infiniteQuery(
+              rpcQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ cursor, pageSize: 4 }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            )
+          : queryClient.infiniteQuery(
+              httpQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ query: { cursor, pageSize: 4 } }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            ))
+        const authoritativePage = queryClient.getQueryData(key)?.pages[0]
+        expect(authoritativePage).toStrictEqual(optimisticPage)
+        expect(authoritativePage).not.toBe(optimisticPage)
+        await request.fail()
+        await expect(failure).resolves.toMatchObject([{ status: 'rejected' }])
+        expect(queryClient.getQueryData(key)?.pages[0]).toBe(authoritativePage)
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'preserves refreshed %s page totals when a pending creation fails',
+    async (adapter) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const rpcPages = rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 })
+      const httpPages = httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } })
+      for (const key of [rpcPages, httpPages]) {
+        queryClient.setQueryData(key, {
+          pages: [new UserPage({ users: [], total: 0, nextCursor: null })],
+          pageParams: [0],
+        })
+      }
+      try {
+        const mutation =
+          adapter === 'rpc'
+            ? new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({ name: 'Ada' })
+            : new MutationObserver(queryClient, userWrites.httpCreate()).mutate({
+                payload: { name: 'Ada' },
+              })
+        const failure = Promise.allSettled([mutation])
+        const request = await fixture.nextCreate()
+        await (adapter === 'rpc'
+          ? queryClient.infiniteQuery(
+              rpcQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ cursor, pageSize: 4 }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            )
+          : queryClient.infiniteQuery(
+              httpQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ query: { cursor, pageSize: 4 } }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            ))
+        await request.fail()
+        await expect(failure).resolves.toMatchObject([
+          {
+            status: 'rejected',
+            reason: { name: adapter === 'rpc' ? 'EffectRpcQueryError' : 'EffectHttpApiQueryError' },
+          },
+        ])
+        for (const key of [rpcPages, httpPages]) {
+          expect(queryClient.getQueryData(key)).toStrictEqual({
+            pages: [new UserPage({ users: [], total: 0, nextCursor: null })],
+            pageParams: [0],
+          })
+        }
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(['rpc', 'http'] as const)(
+    'preserves refreshed %s page totals when a pending deletion fails',
+    async (adapter) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      fixture.seed([ada])
+      const rpcPages = rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 })
+      const httpPages = httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } })
+      for (const key of [rpcPages, httpPages]) {
+        queryClient.setQueryData(key, {
+          pages: [new UserPage({ users: [ada], total: 1, nextCursor: null })],
+          pageParams: [0],
+        })
+      }
+      try {
+        const mutation =
+          adapter === 'rpc'
+            ? new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+            : new MutationObserver(queryClient, userWrites.httpDelete()).mutate({
+                params: { id: 1 },
+              })
+        const failure = Promise.allSettled([mutation])
+        const request = await fixture.nextDelete()
+        await (adapter === 'rpc'
+          ? queryClient.infiniteQuery(
+              rpcQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ cursor, pageSize: 4 }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            )
+          : queryClient.infiniteQuery(
+              httpQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ query: { cursor, pageSize: 4 } }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            ))
+        await request.fail()
+        await expect(failure).resolves.toMatchObject([
+          {
+            status: 'rejected',
+            reason: { name: adapter === 'rpc' ? 'EffectRpcQueryError' : 'EffectHttpApiQueryError' },
+          },
+        ])
+        for (const key of [rpcPages, httpPages]) {
+          expect(queryClient.getQueryData(key)).toStrictEqual({
+            pages: [new UserPage({ users: [ada], total: 1, nextCursor: null })],
+            pageParams: [0],
+          })
+        }
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it('restores an optimistic page without adjusting a freshly appended page', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    const alan = new User({ id: 2, name: 'Alan', locale: 'en' })
+    fixture.seed([ada, alan])
+    const options = rpcQuery.users.page.infiniteOptions({
+      initialPageParam: 0,
+      input: (cursor: number) => ({ cursor, pageSize: 4 }),
+      getNextPageParam: (page) => page.nextCursor ?? undefined,
+      staleTime: Infinity,
+    })
+    queryClient.setQueryData(options.queryKey, {
+      pages: [new UserPage({ users: [ada], total: 2, nextCursor: 1 })],
+      pageParams: [0],
+    })
+    let unsubscribe: (() => void) | undefined
+    try {
+      const deletion = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+      const failure = Promise.allSettled([deletion])
+      const request = await fixture.nextDelete()
+      const observer = new InfiniteQueryObserver(queryClient, options)
+      unsubscribe = observer.subscribe(() => {})
+      await observer.fetchNextPage()
+      unsubscribe()
+      await request.fail()
+      await expect(failure).resolves.toMatchObject([
+        { status: 'rejected', reason: { name: 'EffectRpcQueryError' } },
+      ])
+      expect(queryClient.getQueryData(options.queryKey)).toStrictEqual({
+        pages: [
+          new UserPage({ users: [ada], total: 2, nextCursor: 1 }),
+          new UserPage({ users: [alan], total: 2, nextCursor: null }),
+        ],
+        pageParams: [0, 1],
+      })
+    } finally {
+      unsubscribe?.()
+      await fixture.application.dispose()
+    }
+  })
+
+  it('publishes a pending user and seeds the returned user through exact generated keys', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [ada])
+    queryClient.setQueryData(httpQuery.users.list.queryKey(), [ada])
+    try {
+      const mutation = new MutationObserver(queryClient, userWrites.rpcCreate())
+      const result = mutation.mutate({ name: 'Grace', locale: 'fr' })
+      const request = await fixture.nextCreate()
+      expect(
+        queryClient.getQueryData(rpcQuery.users.list.queryKey())?.map((user) => user.name),
+      ).toStrictEqual(['Ada', 'Grace'])
+      const grace = new User({ id: 2, name: 'Grace', locale: 'fr' })
+      await request.succeed(grace)
+      await expect(result).resolves.toStrictEqual(grace)
+      expect(
+        queryClient.getQueryData(rpcQuery.users.get.queryKey({ id: 2, locale: 'fr' })),
+      ).toStrictEqual(grace)
+      expect(
+        queryClient.getQueryData(
+          httpQuery.users.get.queryKey({ params: { id: 2 }, query: { locale: 'fr' } }),
+        ),
+      ).toStrictEqual(grace)
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([ada, grace])
+    } finally {
+      await fixture.application.dispose()
+    }
+  })
+
+  it('rolls back a failed deletion without erasing a newer creation or changing page parameters', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    const alan = new User({ id: 2, name: 'Alan', locale: 'en' })
+    const grace = new User({ id: 3, name: 'Grace', locale: 'fr' })
+    const rpcPages = rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 })
+    const httpPages = httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } })
+    fixture.seed([ada, alan])
+    for (const key of [rpcQuery.users.list.queryKey(), httpQuery.users.list.queryKey()]) {
+      queryClient.setQueryData(key, [ada, alan])
+    }
+    for (const key of [rpcPages, httpPages]) {
+      queryClient.setQueryData(key, {
+        pages: [
+          new UserPage({ users: [ada], total: 2, nextCursor: 1 }),
+          new UserPage({ users: [alan], total: 2, nextCursor: null }),
+        ],
+        pageParams: [0, 1],
+      })
+    }
+    try {
+      const deletion = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+      const failure = Effect.runPromiseExit(Effect.promise(async () => deletion))
+      const deleteRequest = await fixture.nextDelete()
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([alan])
+      expect(queryClient.getQueryData(rpcPages)?.pages[0]?.users).toStrictEqual([])
+      const creation = new MutationObserver(queryClient, userWrites.httpCreate()).mutate({
+        payload: { name: 'Grace', locale: 'fr' },
+      })
+      const createRequest = await fixture.nextCreate()
+      await createRequest.succeed(grace)
+      await creation
+      await deleteRequest.fail()
+      await expect(failure).resolves.toHaveProperty('_tag', 'Failure')
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([
+        ada,
+        alan,
+        grace,
+      ])
+      expect(queryClient.getQueryData(httpQuery.users.list.queryKey())).toStrictEqual([
+        ada,
+        alan,
+        grace,
+      ])
+      expect(queryClient.getQueryData(rpcPages)).toStrictEqual({
+        pages: [
+          new UserPage({ users: [ada], total: 3, nextCursor: 1 }),
+          new UserPage({ users: [alan, grace], total: 3, nextCursor: null }),
+        ],
+        pageParams: [0, 1],
+      })
+      expect(queryClient.getQueryData(httpPages)).toStrictEqual(queryClient.getQueryData(rpcPages))
+    } finally {
+      await fixture.application.dispose()
+    }
+  })
+
+  it('keeps a newer successful deletion when an older delete fails', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    fixture.seed([ada])
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [ada])
+    try {
+      const older = Effect.runPromiseExit(
+        Effect.promise(async () =>
+          new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 }),
+        ),
+      )
+      const olderRequest = await fixture.nextDelete()
+      const newer = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+      const newerRequest = await fixture.nextDelete()
+      await newerRequest.succeed()
+      await newer
+      await olderRequest.fail()
+      await expect(older).resolves.toHaveProperty('_tag', 'Failure')
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([])
+    } finally {
+      await fixture.application.dispose()
+    }
+  })
+
+  it('restores the original entity when both overlapping deletes fail', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [ada])
+    try {
+      const older = Effect.runPromiseExit(
+        Effect.promise(async () =>
+          new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 }),
+        ),
+      )
+      const olderRequest = await fixture.nextDelete()
+      const newer = Effect.runPromiseExit(
+        Effect.promise(async () =>
+          new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 }),
+        ),
+      )
+      const newerRequest = await fixture.nextDelete()
+      await olderRequest.fail()
+      await older
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([])
+      await newerRequest.fail()
+      await expect(newer).resolves.toHaveProperty('_tag', 'Failure')
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([ada])
+    } finally {
+      await fixture.application.dispose()
+    }
+  })
+
+  it.each([true, false])(
+    'restores distinct failed deletions in directory order with the earlier failure first: %s',
+    async (earlierFailsFirst) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const alan = new User({ id: 2, name: 'Alan', locale: 'en' })
+      const grace = new User({ id: 3, name: 'Grace', locale: 'en' })
+      const lists = [rpcQuery.users.list.queryKey(), httpQuery.users.list.queryKey()]
+      const pages = [
+        rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 }),
+        httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } }),
+      ]
+      for (const key of lists) {
+        queryClient.setQueryData(key, [ada, alan])
+      }
+      for (const key of pages) {
+        queryClient.setQueryData(key, {
+          pages: [new UserPage({ users: [ada, alan], total: 2, nextCursor: null })],
+          pageParams: [0],
+        })
+      }
+      try {
+        const older = Effect.runPromiseExit(
+          Effect.promise(async () =>
+            new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 }),
+          ),
+        )
+        const first = await fixture.nextDelete()
+        const newer = Effect.runPromiseExit(
+          Effect.promise(async () =>
+            new MutationObserver(queryClient, userWrites.httpDelete()).mutate({
+              params: { id: 2 },
+            }),
+          ),
+        )
+        const second = await fixture.nextDelete()
+        const creation = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+          name: 'Grace',
+        })
+        const created = await fixture.nextCreate()
+        await created.succeed(grace)
+        await creation
+        if (earlierFailsFirst) {
+          await first.fail()
+          await older
+          await second.fail()
+          await newer
+        } else {
+          await second.fail()
+          await newer
+          await first.fail()
+          await older
+        }
+        for (const key of lists) {
+          expect(queryClient.getQueryData(key)).toStrictEqual([ada, alan, grace])
+        }
+        for (const key of pages) {
+          expect(queryClient.getQueryData(key)).toStrictEqual({
+            pages: [new UserPage({ users: [ada, alan, grace], total: 3, nextCursor: null })],
+            pageParams: [0],
+          })
+        }
+      } finally {
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it.each(
+    (['rpc', 'http'] as const).flatMap((adapter) =>
+      [false, true].flatMap((addedTarget) =>
+        [false, true].map((newerFailsFirst) => ({ adapter, addedTarget, newerFailsFirst })),
+      ),
+    ),
+  )(
+    'restores refreshed $adapter rows and pages through overlapping deletions; added target: $addedTarget, newer failure first: $newerFailsFirst',
+    async ({ adapter, addedTarget, newerFailsFirst }) => {
+      const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+      const { queryClient, rpcQuery, httpQuery, userWrites } = fixture.application
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      const alan = new User({ id: 2, name: 'Alan', locale: 'en' })
+      const grace = new User({ id: 3, name: 'Grace', locale: 'en' })
+      const hopper = new User({ id: 4, name: 'Hopper', locale: 'en' })
+      const knuth = new User({ id: 5, name: 'Knuth', locale: 'en' })
+      const dennis = new User({ id: 6, name: 'Dennis', locale: 'en' })
+      const initial = [ada, alan, grace, hopper, knuth, dennis]
+      const updatedAlan = new User({ id: 2, name: 'Updated Alan', locale: 'fr' })
+      const linus = new User({ id: 7, name: 'Linus', locale: 'fr' })
+      const authoritative = [hopper, knuth, grace, dennis, updatedAlan, linus]
+      const lists = {
+        rpc: rpcQuery.users.list.queryKey(),
+        http: httpQuery.users.list.queryKey(),
+      }
+      const pages = {
+        rpc: rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 }),
+        http: httpQuery.users.page.infiniteKey({ query: { cursor: 0, pageSize: 4 } }),
+      }
+      fixture.seed(initial)
+      for (const key of Object.values(lists)) {
+        queryClient.setQueryData(key, initial)
+      }
+      for (const key of Object.values(pages)) {
+        queryClient.setQueryData(key, twoPageDirectory(initial))
+      }
+      const older = new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 1 })
+      const olderOutcome = Promise.allSettled([older])
+      const first = await fixture.nextDelete()
+      try {
+        fixture.seed(authoritative)
+        await (adapter === 'rpc'
+          ? queryClient.query(rpcQuery.users.list.queryOptions())
+          : queryClient.query(httpQuery.users.list.queryOptions()))
+        await (adapter === 'rpc'
+          ? queryClient.infiniteQuery(
+              rpcQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ cursor, pageSize: 4 }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            )
+          : queryClient.infiniteQuery(
+              httpQuery.users.page.infiniteOptions({
+                initialPageParam: 0,
+                input: (cursor: number) => ({ query: { cursor, pageSize: 4 } }),
+                getNextPageParam: (page) => page.nextCursor ?? undefined,
+              }),
+            ))
+        const target = addedTarget ? linus : updatedAlan
+        const newer =
+          adapter === 'rpc'
+            ? new MutationObserver(queryClient, userWrites.httpDelete()).mutate({
+                params: { id: target.id },
+              })
+            : new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: target.id })
+        const newerOutcome = Promise.allSettled([newer])
+        const second = await fixture.nextDelete()
+        const latest =
+          adapter === 'rpc'
+            ? new MutationObserver(queryClient, userWrites.rpcDelete()).mutate({ id: 3 })
+            : new MutationObserver(queryClient, userWrites.httpDelete()).mutate({
+                params: { id: 3 },
+              })
+        const latestOutcome = Promise.allSettled([latest])
+        const third = await fixture.nextDelete()
+        if (newerFailsFirst) {
+          await second.fail()
+          await newerOutcome
+          await third.fail()
+        } else {
+          await third.fail()
+          await latestOutcome
+          await second.fail()
+        }
+        await expect(newerOutcome).resolves.toMatchObject([{ status: 'rejected' }])
+        await expect(latestOutcome).resolves.toMatchObject([{ status: 'rejected' }])
+        expect(queryClient.getQueryData(lists[adapter])).toStrictEqual(authoritative)
+        expect(queryClient.getQueryData(pages[adapter])).toStrictEqual(
+          twoPageDirectory(authoritative),
+        )
+        await first.fail()
+        await olderOutcome
+        const otherAdapter = adapter === 'rpc' ? 'http' : 'rpc'
+        expect(queryClient.getQueryData(lists[adapter])).toStrictEqual(authoritative)
+        expect(queryClient.getQueryData(pages[adapter])).toStrictEqual(
+          twoPageDirectory(authoritative),
+        )
+        expect(queryClient.getQueryData(lists[otherAdapter])).toStrictEqual(initial)
+        expect(queryClient.getQueryData(pages[otherAdapter])).toStrictEqual(
+          twoPageDirectory(initial),
+        )
+      } finally {
+        await first.fail()
+        await olderOutcome
+        await fixture.application.dispose()
+      }
+    },
+  )
+
+  it('preserves a newer creation when an older create callback completes late', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [])
+    try {
+      const older = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+        name: 'Ada',
+      })
+      const olderRequest = await fixture.nextCreate()
+      const newer = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+        name: 'Grace',
+      })
+      const newerRequest = await fixture.nextCreate()
+      const grace = new User({ id: 2, name: 'Grace', locale: 'en' })
+      await newerRequest.succeed(grace)
+      await newer
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      await olderRequest.succeed(ada)
+      await older
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([ada, grace])
+    } finally {
+      await fixture.application.dispose()
+    }
+  })
+
+  it('cancels an older reconciliation fetch before publishing a newer write', async () => {
+    const fixture = await Effect.runPromise(
+      makeControlledUserWrites(
+        new QueryClient({
+          defaultOptions: { queries: { queryKeyHashFn: (key) => `owner:${JSON.stringify(key)}` } },
+        }),
+      ),
+    )
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [])
+    fixture.holdLists()
+    const observer = new QueryObserver(
+      queryClient,
+      rpcQuery.users.list.queryOptions({ staleTime: Infinity }),
+    )
+    const unsubscribe = observer.subscribe(() => {})
+    try {
+      const older = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+        name: 'Ada',
+      })
+      const first = await fixture.nextCreate()
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      await first.succeed(ada)
+      const stale = await fixture.nextList()
+      const newer = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+        name: 'Grace',
+      })
+      const second = await fixture.nextCreate()
+      await older
+      const grace = new User({ id: 2, name: 'Grace', locale: 'en' })
+      await second.succeed(grace)
+      const current = await fixture.nextList()
+      await stale.succeed([ada])
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([ada, grace])
+      await current.succeed([ada, grace])
+      await newer
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([ada, grace])
+      expect(queryClient.getQueriesData({ queryKey: rpcQuery.users.list.key() })).toHaveLength(1)
+      expect(queryClient.getQueryState(rpcQuery.users.list.queryKey())?.isInvalidated).toBe(false)
+    } finally {
+      unsubscribe()
+      await fixture.application.dispose()
+    }
+  })
+
+  it('keeps late callbacks bound to a retired owner and leaves a replacement client untouched', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [])
+    const replacement = new QueryClient()
+    const grace = new User({ id: 2, name: 'Grace', locale: 'en' })
+    replacement.setQueryData(rpcQuery.users.list.queryKey(), [grace])
+    try {
+      const mutation = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+        name: 'Ada',
+      })
+      const request = await fixture.nextCreate()
+      fixture.retire()
+      queryClient.clear()
+      await request.succeed(new User({ id: 1, name: 'Ada', locale: 'en' }))
+      await mutation
+      expect(queryClient.getQueryCache().getAll()).toHaveLength(0)
+      expect(replacement.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([grace])
+      expect(replacement.getQueryState(rpcQuery.users.list.queryKey())?.isInvalidated).toBe(false)
+    } finally {
+      replacement.clear()
+      await fixture.application.dispose()
+    }
+  })
+
+  it('settles through its original owner after native observer callbacks are replaced', async () => {
+    const original = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const replacement = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const first = original.application
+    const second = replacement.application
+    const grace = new User({ id: 2, name: 'Grace', locale: 'en' })
+    first.queryClient.setQueryData(first.rpcQuery.users.list.queryKey(), [])
+    second.queryClient.setQueryData(second.rpcQuery.users.list.queryKey(), [grace])
+    try {
+      const observer = new MutationObserver(first.queryClient, first.userWrites.rpcCreate())
+      const mutation = observer.mutate({ name: 'Ada' })
+      const request = await original.nextCreate()
+      observer.setOptions(second.userWrites.rpcCreate())
+      const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+      await request.succeed(ada)
+      await mutation
+      expect(first.queryClient.getQueryData(first.rpcQuery.users.list.queryKey())).toStrictEqual([
+        ada,
+      ])
+      expect(second.queryClient.getQueryData(second.rpcQuery.users.list.queryKey())).toStrictEqual([
+        grace,
+      ])
+      expect(
+        second.queryClient.getQueryState(second.rpcQuery.users.list.queryKey())?.isInvalidated,
+      ).toBe(false)
+    } finally {
+      await original.application.dispose()
+      await replacement.application.dispose()
+    }
+  })
+
+  it('removes a failed creation without erasing a newer response or corrupting page totals', async () => {
+    const fixture = await Effect.runPromise(makeControlledUserWrites(new QueryClient()))
+    const { queryClient, rpcQuery, userWrites } = fixture.application
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [])
+    const pages = rpcQuery.users.page.infiniteKey({ cursor: 0, pageSize: 4 })
+    queryClient.setQueryData(pages, {
+      pages: [new UserPage({ users: [], total: 0, nextCursor: null })],
+      pageParams: [0],
+    })
+    try {
+      const older = Effect.runPromiseExit(
+        Effect.promise(async () =>
+          new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({ name: 'Ada' }),
+        ),
+      )
+      const first = await fixture.nextCreate()
+      const newer = new MutationObserver(queryClient, userWrites.rpcCreate()).mutate({
+        name: 'Grace',
+      })
+      const second = await fixture.nextCreate()
+      const grace = new User({ id: 2, name: 'Grace', locale: 'en' })
+      await second.succeed(grace)
+      await newer
+      await first.fail()
+      await expect(older).resolves.toHaveProperty('_tag', 'Failure')
+      expect(queryClient.getQueryData(rpcQuery.users.list.queryKey())).toStrictEqual([grace])
+      expect(queryClient.getQueryData(pages)).toStrictEqual({
+        pages: [new UserPage({ users: [grace], total: 1, nextCursor: null })],
+        pageParams: [0],
+      })
+    } finally {
+      await fixture.application.dispose()
+    }
+  })
+})
diff --git a/package.json b/package.json
index aeef267..56e5051 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "effect-api-query",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "Type-safe TanStack Query utilities derived from Effect RPC and HTTP API contracts.",
   "keywords": [
     "tanstack-intent"
@@ -18,7 +18,6 @@
   "files": [
     "dist",
     "skills",
-    "CHANGELOG.md",
     "LICENSE"
   ],
   "type": "module",
@@ -51,11 +50,12 @@
     "@changesets/config": "4.0.1",
     "@effect-api-query/contracts": "workspace:*",
     "@effect-api-query/server": "workspace:*",
+    "@effect/platform-node": "catalog:",
     "@effect/tsgo": "0.47.2",
     "@effect/vitest": "4.0.0",
     "@playwright/test": "1.63.0",
     "@shadcn/lint": "0.2.0",
-    "@tanstack/intent": "0.5.0",
+    "@tanstack/intent": "0.5.3",
     "@tanstack/query-core": "catalog:",
     "@tanstack/react-query": "catalog:",
     "@tanstack/react-router": "catalog:",
@@ -71,7 +71,7 @@
     "react": "catalog:",
     "react-dom": "catalog:",
     "tsx": "catalog:",
-    "typescript": "7.0.2",
+    "typescript": "catalog:",
     "typescript-5.9": "npm:typescript@5.9.3",
     "ultracite": "7.12.2",
     "unplugin-unused": "0.6.0",
@@ -80,7 +80,7 @@
     "vitest": "catalog:"
   },
   "peerDependencies": {
-    "@tanstack/query-core": ">=5.102.0 <6",
+    "@tanstack/query-core": ">=5.103.1 <6",
     "effect": "catalog:"
   },
   "packageManager": "pnpm@12.8.2"
diff --git a/playwright.config.ts b/playwright.config.ts
index 3b0b990..19a887f 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -7,7 +7,7 @@ export default defineConfig(browserTestDefaults, {
   testDir: './e2e',
   webServer: [
     browserTestServer('vp run server', 'http://127.0.0.1:3001/health'),
-    browserTestServer('vp run --no-cache vite-react-preview', 'http://127.0.0.1:4173'),
-    browserTestServer('vp run --no-cache tanstack-start-preview', 'http://127.0.0.1:3000'),
+    browserTestServer('vp run --ignore-depends-on vite-react-preview', 'http://127.0.0.1:4173'),
+    browserTestServer('vp run --ignore-depends-on tanstack-start-preview', 'http://127.0.0.1:3000'),
   ],
 })
diff --git a/playwright.docs.config.ts b/playwright.docs.config.ts
index 2cbb351..3375446 100644
--- a/playwright.docs.config.ts
+++ b/playwright.docs.config.ts
@@ -1,10 +1,16 @@
 import { defineConfig } from '@playwright/test'
 import type { PlaywrightTestConfig } from '@playwright/test'
+import { Config, ConfigProvider, Effect, Option } from 'effect'
 
 import { browserTestDefaults, browserTestServer } from './e2e/browser-test-config.ts'
 
-// DOCS_BASE_URL is the deployment origin, e.g. https://ueberbrot.github.io.
-const hostedOrigin = process.env['DOCS_BASE_URL']
+const hostedOrigin = Option.getOrUndefined(
+  Effect.runSync(
+    Config.String('DOCS_BASE_URL')
+      .pipe(Config.option)
+      .parse(ConfigProvider.fromEnv({ preserveEmptyStrings: true })),
+  ),
+)
 
 const docsConfig: PlaywrightTestConfig = {
   outputDir: 'test-results/docs',
@@ -17,10 +23,9 @@ const docsConfig: PlaywrightTestConfig = {
 if (hostedOrigin === undefined) {
   docsConfig.webServer = {
     ...browserTestServer(
-      'vp run docs-preview --host 127.0.0.1 --port 4321',
+      'vp run --ignore-depends-on docs-preview --host 127.0.0.1 --port 4321',
       'http://127.0.0.1:4321/effect-api-query/',
     ),
-    // Keep Astro attached so Playwright owns the preview process in agent environments.
     env: { ASTRO_PREVIEW_BACKGROUND: '1' },
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f60623a..820675f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -164,6 +164,9 @@ settings:
 
 catalogs:
   default:
+    '@effect/platform-node':
+      specifier: 4.0.0
+      version: 4.0.0
     '@tailwindcss/vite':
       specifier: 4.3.3
       version: 4.3.3
@@ -209,6 +212,9 @@ catalogs:
     tsx:
       specifier: 4.23.15
       version: 4.23.15
+    typescript:
+      specifier: 7.0.2
+      version: 7.0.2
     vite:
       specifier: npm:@voidzero-dev/vite-plus-core@1.0.0
       version: 1.0.0
@@ -218,6 +224,10 @@ catalogs:
     vitest:
       specifier: 5.0.1
       version: 5.0.1
+  docs:
+    typescript:
+      specifier: 6.0.3
+      version: 6.0.3
 
 overrides:
   vite@*: npm:@voidzero-dev/vite-plus-core@1.0.0
@@ -245,6 +255,9 @@ importers:
       '@effect-api-query/server':
         specifier: workspace:*
         version: link:examples/server
+      '@effect/platform-node':
+        specifier: 'catalog:'
+        version: 4.0.0(effect@4.0.0)(redis@6.3.0)
       '@effect/tsgo':
         specifier: 0.47.2
         version: 0.47.2
@@ -258,8 +271,8 @@ importers:
         specifier: 0.2.0
         version: 0.2.0
       '@tanstack/intent':
-        specifier: 0.5.0
-        version: 0.5.0
+        specifier: 0.5.3
+        version: 0.5.3
       '@tanstack/query-core':
         specifier: 'catalog:'
         version: 5.104.0
@@ -306,7 +319,7 @@ importers:
         specifier: 'catalog:'
         version: 4.23.15
       typescript:
-        specifier: 7.0.2
+        specifier: 'catalog:'
         version: 7.0.2
       typescript-5.9:
         specifier: npm:typescript@5.9.3
@@ -349,7 +362,7 @@ importers:
         specifier: 0.9.10
         version: 0.9.10(@emnapi/runtime@1.11.3)(prettier@3.9.9)(typescript@6.0.3)
       typescript:
-        specifier: 6.0.3
+        specifier: catalog:docs
         version: 6.0.3
 
   examples/contracts:
@@ -364,7 +377,7 @@ importers:
         specifier: workspace:*
         version: link:../contracts
       '@effect/platform-node':
-        specifier: 4.0.0
+        specifier: 'catalog:'
         version: 4.0.0(effect@4.0.0)(redis@6.3.0)
       effect:
         specifier: 'catalog:'
@@ -2136,8 +2149,8 @@ packages:
     resolution: {integrity: sha512-utTS5L2OkeYUzXGohL1Z8sefu1GLNOJcxe8Hd6iIdc/Xo1K1nDB2JEp4iSFhvYh33xKC9V91TxrS8qfrpoKobQ==}
     engines: {node: '>=20.19'}
 
-  '@tanstack/intent@0.5.0':
-    resolution: {integrity: sha512-27zOOpQLfBTM5cQjqkASf6JH3jggMwr29UhK8dlAI1WP9rjzywJ87/I6meiH/khyPIFNRluh9Q8wlIVrpN4Jpg==}
+  '@tanstack/intent@0.5.3':
+    resolution: {integrity: sha512-2zeLGRJ+796daqv3DrwXsrXn7TZb4yOIogJgrqeF96YEIwOsJoDIW/eQBwZVAcR1OQ3znA3dGDizb5GBmxk4Zg==}
     engines: {node: '>=20.12.0'}
     hasBin: true
 
@@ -6570,7 +6583,7 @@ snapshots:
 
   '@tanstack/history@1.162.4': {}
 
-  '@tanstack/intent@0.5.0': {}
+  '@tanstack/intent@0.5.3': {}
 
   '@tanstack/query-core@5.104.0': {}
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index d68773d..a6a1e41 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,8 +2,10 @@ packages:
   - .
   - apps/*
   - examples/*
+  - '!examples/shared'
 
 catalog:
+  '@effect/platform-node': 4.0.0
   '@tailwindcss/vite': 4.3.3
   '@tanstack/query-core': 5.104.0
   '@tanstack/react-query': 5.104.0
@@ -19,13 +21,19 @@ catalog:
   react-dom: 19.3.0
   tailwindcss: 4.3.3
   tsx: 4.23.15
+  typescript: 7.0.2
   vite: npm:@voidzero-dev/vite-plus-core@1.0.0
   vite-plus: 1.0.0
   vitest: 5.0.1
 
+catalogs:
+  docs:
+    typescript: 6.0.3
+
 minimumReleaseAge: 10080
 minimumReleaseAgeStrict: true
 minimumReleaseAgeIgnoreMissingTime: false
+trustLockfile: false
 
 allowBuilds:
   'esbuild@0.28.2': true
diff --git a/scripts/decode-utf8.mts b/scripts/decode-utf8.mts
new file mode 100644
index 0000000..a69af78
--- /dev/null
+++ b/scripts/decode-utf8.mts
@@ -0,0 +1,2 @@
+export const decodeUtf8 = (bytes: Uint8Array): string =>
+  new TextDecoder('utf-8', { ignoreBOM: true }).decode(bytes)
diff --git a/scripts/measure-construction.mts b/scripts/measure-construction.mts
new file mode 100644
index 0000000..88f381d
--- /dev/null
+++ b/scripts/measure-construction.mts
@@ -0,0 +1,131 @@
+import { NodeRuntime } from '@effect/platform-node'
+import { Clock, Effect, Layer, Schema } from 'effect'
+import { HttpServer } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiBuilder,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiTest,
+} from 'effect/http-api'
+import { Rpc, RpcGroup, RpcTest } from 'effect/rpc'
+
+import { createHttpApiQueryUtils, createRpcQueryUtils } from '#effect-api-query'
+
+const Payload = Schema.Struct({
+  id: Schema.Int,
+  locale: Schema.String.pipe(Schema.withConstructorDefault(Effect.succeed('en'))),
+  rows: Schema.Array(Schema.Struct({ id: Schema.Int, title: Schema.String })),
+})
+const program = Effect.gen(function* () {
+  const clock = yield* Clock.Clock
+  const measurements: {
+    adapter: string
+    stage: string
+    operations: number
+    records: number
+    iterations: number
+    milliseconds: number[]
+  }[] = []
+  const measure = (
+    adapter: string,
+    stage: string,
+    operations: number,
+    records: number,
+    iterations: number,
+    operation: () => void,
+  ) => {
+    for (let warmup = 0; warmup < 20; warmup += 1) {
+      operation()
+    }
+    const milliseconds = Array.from({ length: 5 }, () => {
+      const started = clock.monotonicTimeNanosUnsafe()
+      for (let iteration = 0; iteration < iterations; iteration += 1) {
+        operation()
+      }
+      return Number(clock.monotonicTimeNanosUnsafe() - started) / 1_000_000
+    })
+    measurements.push({ adapter, stage, operations, records, iterations, milliseconds })
+  }
+  for (const operationCount of [1, 250]) {
+    const rpcs = Array.from({ length: operationCount }, (_, index) =>
+      Rpc.make(`read-${index}`, { payload: Payload, success: Schema.Int }),
+    )
+    const group = RpcGroup.make(...rpcs)
+    const rpcClient = yield* RpcTest.makeClient(group, { flatten: true }).pipe(
+      Effect.provide(
+        group.toLayer(
+          Object.fromEntries(
+            rpcs.map((rpc) => [rpc._tag, (value: typeof Payload.Type) => Effect.succeed(value.id)]),
+          ),
+        ),
+      ),
+    )
+    const rpcFactory = () =>
+      createRpcQueryUtils(group, { client: rpcClient, keyPrefix: ['construction'] })
+    const endpoint = (index: number) =>
+      HttpApiEndpoint.post(`read-${index}`, `/read-${index}`, {
+        payload: Payload,
+        success: Schema.Int,
+      })
+    const endpoints = [
+      endpoint(0),
+      ...Array.from({ length: operationCount - 1 }, (_, index) => endpoint(index + 1)),
+    ] as const
+    const api = HttpApi.make('construction').add(HttpApiGroup.make('records').add(...endpoints))
+    const handlers: Record<
+      `read-${number}`,
+      (request: { payload: typeof Payload.Type }) => Effect.Effect<number>
+    > = Object.fromEntries(
+      endpoints.map((current) => [
+        current.identifier,
+        ({ payload }: { payload: typeof Payload.Type }) => Effect.succeed(payload.id),
+      ]),
+    )
+    const httpClient = yield* HttpApiTest.groups(api, ['records']).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          HttpApiBuilder.group(api, 'records', (builder) => builder.handleAll(handlers)),
+          HttpServer.layerServices,
+        ),
+      ),
+    )
+    const httpFactory = () =>
+      createHttpApiQueryUtils(api, { client: httpClient, keyPrefix: ['construction'] })
+    measure('rpc', 'factory', operationCount, 0, 50, () => {
+      rpcFactory()
+    })
+    measure('http', 'factory', operationCount, 0, 50, () => {
+      httpFactory()
+    })
+    if (operationCount !== 1) {
+      continue
+    }
+    const rpc = rpcFactory()['read-0']
+    const http = httpFactory().records['read-0']
+    if (rpc === undefined || http === undefined) {
+      throw new TypeError('Missing workload operation')
+    }
+    for (const records of [1, 100]) {
+      const input = {
+        id: 1,
+        rows: Array.from({ length: records }, (_, id) => ({ id, title: `record-${id}` })),
+      }
+      const request = { payload: Payload.make(input) }
+      measure('rpc', 'query-key', 1, records, 500, () => {
+        rpc.queryKey(input)
+      })
+      measure('rpc', 'query-options', 1, records, 500, () => {
+        rpc.queryOptions({ input })
+      })
+      measure('http', 'query-key', 1, records, 500, () => {
+        http.queryKey(request)
+      })
+      measure('http', 'query-options', 1, records, 500, () => {
+        http.queryOptions({ input: request })
+      })
+    }
+  }
+  console.log(JSON.stringify({ samples: 5, warmupIterations: 20, measurements }))
+})
+NodeRuntime.runMain(program.pipe(Effect.scoped))
diff --git a/scripts/verify-docs-examples.mts b/scripts/verify-docs-examples.mts
index 410512c..2ae63cf 100644
--- a/scripts/verify-docs-examples.mts
+++ b/scripts/verify-docs-examples.mts
@@ -1,22 +1,96 @@
+import { NodeRuntime, NodeServices } from '@effect/platform-node'
+import { Effect, FileSystem, Path } from 'effect'
 // fallow-ignore-file unused-file
-// The docs-check task verifies tutorial text against packed compiler fixtures.
-import { strictEqual } from 'node:assert'
-import { readFileSync } from 'node:fs'
+import { ok } from 'node:assert'
 
-for (const [page, fixture] of [
-  ['quick-start', 'docs-rpc-quick-start'],
-  ['http-quick-start', 'docs-http-quick-start'],
-]) {
-  const markdown = readFileSync(
-    new URL(`../apps/docs/src/content/docs/getting-started/${page}.md`, import.meta.url),
-    'utf-8',
-  )
-  const source = readFileSync(new URL(`../tests/types/${fixture}.ts`, import.meta.url), 'utf-8')
-  const samples = [...markdown.matchAll(/^```ts\n(?<source>[\s\S]*?)^```/gmu)]
-  strictEqual(samples.length, 1, `${page} must contain its complete TypeScript fixture`)
-  strictEqual(
-    samples[0]?.groups?.['source']?.trimEnd(),
-    source.trimEnd(),
-    `${page} differs from ${fixture}.ts`,
+import { decodeUtf8 } from './decode-utf8.mts'
+
+const unindent = (lines: readonly string[]) => {
+  const indentation = Math.min(
+    ...lines
+      .filter((line) => line.trim().length > 0)
+      .map((line) => /^ */u.exec(line)?.[0].length ?? 0),
   )
+  return lines.map((line) => line.slice(indentation)).join('\n')
 }
+
+const program = Effect.gen(function* () {
+  const fs = yield* FileSystem.FileSystem
+  const path = yield* Path.Path
+  for (const [page, fixtures] of [
+    ['README.md', ['tests/types/docs-readme-rpc', 'tests/types/docs-readme-http']],
+    ['getting-started/quick-start', ['tests/types/docs-rpc-quick-start']],
+    ['getting-started/http-quick-start', ['tests/types/docs-http-quick-start']],
+    ['guides/react-query', ['tests/types/docs-react-setup.tsx', 'tests/types/docs-react-entry']],
+    ['guides/suspense-and-recovery', ['tests/types/docs-suspense.tsx']],
+    ['guides/trace-streams', ['tests/types/docs-stream-tracing']],
+    ['guides/query-defaults', ['tests/types/docs-policies']],
+    ['reference/type-inference', ['tests/types/docs-policies']],
+    ['guides/queries', ['tests/types/docs-functionality']],
+    ['guides/mutations', ['tests/types/docs-functionality']],
+    ['guides/pagination', ['tests/types/docs-functionality']],
+    ['guides/streaming', ['tests/types/docs-functionality']],
+    ['guides/http-metadata', ['tests/types/docs-functionality']],
+    ['guides/http-queries-and-mutations', ['tests/types/docs-functionality']],
+    ['guides/retry-queries', ['tests/types/docs-retry']],
+    ['guides/refresh-from-events', ['tests/types/docs-user-events']],
+    [
+      'guides/websocket-clients',
+      ['tests/fixtures/socket-client', 'tests/fixtures/docs-websocket-use'],
+    ],
+    ['guides/stream-snapshots', ['tests/types/docs-stream-snapshot']],
+    ['guides/hydrate-query-views', ['tests/types/docs-hydration-views']],
+    [
+      'guides/hydrate-unary-data',
+      [
+        'tests/types/docs-hydration-dto',
+        'tests/types/docs-hydration-rich',
+        'tests/types/docs-hydration-async',
+      ],
+    ],
+  ] as const) {
+    const markdown = decodeUtf8(
+      yield* fs.readFile(
+        yield* path.fromFileUrl(
+          new URL(
+            page === 'README.md' ? '../README.md' : `../apps/docs/src/content/docs/${page}.md`,
+            import.meta.url,
+          ),
+        ),
+      ),
+    )
+    const samples = [...markdown.matchAll(/^```(?:ts|tsx)\n(?<source>[\s\S]*?)^```/gmu)]
+    ok(samples.length > 0, `${page} must contain a TypeScript excerpt`)
+    const sources: string[][] = []
+    for (const fixture of fixtures) {
+      const fixturePath = /\.tsx?$/u.test(fixture) ? fixture : `${fixture}.ts`
+      const source = decodeUtf8(
+        yield* fs.readFile(yield* path.fromFileUrl(new URL(`../${fixturePath}`, import.meta.url))),
+      )
+      sources.push(
+        source
+          .replaceAll("from '#effect-api-query'", "from 'effect-api-query'")
+          .replaceAll("from './docs-react-setup.tsx'", "from './users-app.tsx'")
+          .replaceAll("from '../fixtures/user-events.ts'", "from './user-events.ts'")
+          .trimEnd()
+          .split('\n'),
+      )
+    }
+    for (const [index, sample] of samples.entries()) {
+      const lines = sample.groups?.['source']?.trimEnd().split('\n') ?? []
+      ok(
+        lines.some((line) => line.trim().length > 0),
+        `${page} excerpt ${index + 1} is empty`,
+      )
+      ok(
+        sources.some((source) =>
+          source.some(
+            (_, start) => unindent(source.slice(start, start + lines.length)) === unindent(lines),
+          ),
+        ),
+        `${page} excerpt ${index + 1} differs from its allowed fixtures`,
+      )
+    }
+  }
+})
+NodeRuntime.runMain(program.pipe(Effect.provide(NodeServices.layer)))
diff --git a/scripts/verify-packed-consumer.mts b/scripts/verify-packed-consumer.mts
deleted file mode 100644
index 5d26fc2..0000000
--- a/scripts/verify-packed-consumer.mts
+++ /dev/null
@@ -1,533 +0,0 @@
-import { listIntentSkills, loadIntentSkill } from '@tanstack/intent/core'
-import { Schema } from 'effect'
-// fallow-ignore-file unused-file
-// Vite+ invokes this verifier through its dynamically declared packed-package task.
-import { deepStrictEqual, equal, match } from 'node:assert/strict'
-import { execFileSync } from 'node:child_process'
-import { createHash } from 'node:crypto'
-import {
-  cpSync,
-  existsSync,
-  mkdtempSync,
-  readFileSync,
-  realpathSync,
-  rmSync,
-  writeFileSync,
-} from 'node:fs'
-import { builtinModules } from 'node:module'
-import { tmpdir } from 'node:os'
-import nodePath from 'node:path'
-import ts from 'typescript-5.9'
-
-import repositoryManifest from '../package.json' with { type: 'json' }
-
-const repositoryRoot = nodePath.resolve(import.meta.dirname, '..')
-const artifactDirectory = nodePath.join(repositoryRoot, '.artifacts')
-const consumerFixtureDirectory = nodePath.join(repositoryRoot, 'tests', 'packed-consumer')
-const lockfilePath = nodePath.join(repositoryRoot, 'pnpm-lock.yaml')
-const typeFixtureDirectory = nodePath.join(repositoryRoot, 'tests', 'types')
-const workspaceConfigPath = nodePath.join(repositoryRoot, 'pnpm-workspace.yaml')
-const workspaceConfig = readFileSync(workspaceConfigPath, 'utf-8')
-const defaultTarballName = `${repositoryManifest.name.replace(/^@/u, '').replaceAll('/', '-')}-${repositoryManifest.version}.tgz`
-const tarballPath = nodePath.resolve(
-  repositoryRoot,
-  process.env['EFFECT_API_QUERY_TARBALL'] ?? nodePath.join(artifactDirectory, defaultTarballName),
-)
-
-if (!existsSync(tarballPath)) {
-  throw new Error(`Packed tarball does not exist: ${tarballPath}`)
-}
-
-const artifactDigest = () => createHash('sha512').update(readFileSync(tarballPath)).digest('hex')
-const initialDigest = artifactDigest()
-
-const packedManifest = Schema.decodeSync(
-  Schema.fromJsonString(
-    Schema.Struct({
-      bugs: Schema.Struct({ url: Schema.String }),
-      dependencies: Schema.optionalKey(Schema.Unknown),
-      description: Schema.String,
-      engines: Schema.optionalKey(Schema.Unknown),
-      exports: Schema.Unknown,
-      homepage: Schema.String,
-      keywords: Schema.Array(Schema.String),
-      license: Schema.String,
-      name: Schema.String,
-      peerDependencies: Schema.Struct({
-        '@tanstack/query-core': Schema.String,
-        effect: Schema.String,
-      }).annotate({ parseOptions: { onExcessProperty: 'error' } }),
-      publishConfig: Schema.Struct({ access: Schema.String }).annotate({
-        parseOptions: { onExcessProperty: 'error' },
-      }),
-      repository: Schema.Struct({ url: Schema.String }),
-      sideEffects: Schema.Boolean,
-      type: Schema.String,
-      version: Schema.String,
-    }),
-  ),
-)(execFileSync('tar', ['-xOzf', tarballPath, 'package/package.json'], { encoding: 'utf-8' }))
-
-equal(packedManifest.name, 'effect-api-query')
-equal(
-  packedManifest.version,
-  repositoryManifest.version,
-  'The packed version must match the root manifest',
-)
-equal('dependencies' in packedManifest, false)
-equal(packedManifest.license, 'ISC')
-equal(packedManifest.sideEffects, false)
-equal(packedManifest.type, 'module')
-equal(packedManifest.repository.url, 'git+https://github.com/ueberBrot/effect-api-query.git')
-equal(packedManifest.homepage, 'https://github.com/ueberBrot/effect-api-query#readme')
-equal(packedManifest.bugs.url, 'https://github.com/ueberBrot/effect-api-query/issues')
-equal(packedManifest.description, repositoryManifest.description)
-deepStrictEqual(packedManifest.publishConfig, { access: 'public' })
-
-const testedVersion = (dependency: keyof typeof repositoryManifest.devDependencies): string => {
-  const specifier = repositoryManifest.devDependencies[dependency]
-  if (specifier !== 'catalog:') {
-    return specifier
-  }
-
-  const escapedDependency = dependency.replaceAll(/[.*+?^${}()|[\]\\]/gu, '\\$&')
-  const catalogVersion = new RegExp(
-    `^  ['"]?${escapedDependency}['"]?: (?<version>\\S+)$`,
-    'mu',
-  ).exec(workspaceConfig)?.groups?.['version']
-  if (catalogVersion === undefined) {
-    throw new Error(`The default catalog must define ${dependency}`)
-  }
-  return catalogVersion
-}
-
-const lockedVersions = (dependency: string): readonly string[] => {
-  const escapedDependency = dependency.replaceAll('/', '\\/')
-  // pnpm stores the project graph last, after any package-manager/config document.
-  const projectLockfile = readFileSync(lockfilePath, 'utf-8')
-    .split(/^---[ \t]*(?:#[^\r\n]*)?\r?$/mu)
-    .at(-1)
-  if (
-    projectLockfile === undefined ||
-    !/^lockfileVersion: ['"]9\.0['"]\r?$/mu.test(projectLockfile) ||
-    !/^importers:\r?$/mu.test(projectLockfile)
-  ) {
-    throw new Error('The last lockfile document must define the version 9 project graph')
-  }
-  const lockedPackages = /^packages:\n(?<packages>[\s\S]*?)^snapshots:/mu.exec(projectLockfile)
-    ?.groups?.['packages']
-  if (lockedPackages === undefined) {
-    throw new Error('The project lockfile must define resolved packages and snapshots')
-  }
-  const matches = lockedPackages.matchAll(
-    new RegExp(`^  ['"]?${escapedDependency}@(?<version>[^('":]+)`, 'gmu'),
-  )
-  return [...new Set(Array.from(matches, (lockedMatch) => lockedMatch.groups?.['version']))]
-    .filter((version): version is string => version !== undefined)
-    .sort()
-}
-
-const overrides = /^overrides:\n(?<entries>(?:[ \t]+[^\n]*\n)*)/mu.exec(workspaceConfig)?.groups?.[
-  'entries'
-]
-match(overrides ?? '', /^ {2}['"]?vitest@\*['"]?: ['"]?catalog:['"]?$/mu)
-const vitestOverride = testedVersion('vitest')
-
-deepStrictEqual(lockedVersions('effect'), [testedVersion('effect')])
-deepStrictEqual(lockedVersions('vitest'), [vitestOverride])
-
-deepStrictEqual(packedManifest.exports, {
-  '.': {
-    types: './dist/index.d.mts',
-    import: './dist/index.mjs',
-  },
-})
-equal('engines' in packedManifest, false)
-
-const publicBarrel = readFileSync(nodePath.join(repositoryRoot, 'src', 'index.ts'), 'utf-8')
-equal(
-  /\bexport\s+(?:type\s+)?\*/u.test(publicBarrel),
-  false,
-  'The public barrel must use named exports',
-)
-
-const builtModule = execFileSync('tar', ['-xOzf', tarballPath, 'package/dist/index.mjs'], {
-  encoding: 'utf-8',
-})
-match(builtModule, /from ["']@tanstack\/query-core["']/u)
-match(builtModule, /from ["']effect(?:\/rpc)?["']/u)
-equal(/\bnode:/u.test(builtModule), false, 'The runtime must not import Node APIs')
-for (const imported of builtModule.matchAll(/\bfrom\s*["'](?<specifier>[^"']+)["']/gu)) {
-  equal(
-    builtinModules.includes(imported.groups?.['specifier'] ?? ''),
-    false,
-    'The runtime must not import bare Node built-ins',
-  )
-}
-const sourceMap = Schema.decodeSync(
-  Schema.fromJsonString(
-    Schema.Struct({
-      sources: Schema.Array(Schema.String),
-    }),
-  ),
-)(
-  execFileSync('tar', ['-xOzf', tarballPath, 'package/dist/index.mjs.map'], {
-    encoding: 'utf-8',
-  }),
-)
-equal(
-  sourceMap.sources.some((source) => source.includes('node_modules/')),
-  false,
-  'The runtime must not bundle private copies of dependencies',
-)
-
-const builtDeclaration = execFileSync('tar', ['-xOzf', tarballPath, 'package/dist/index.d.mts'], {
-  encoding: 'utf-8',
-})
-const declarationSource = ts.createSourceFile(
-  'index.d.mts',
-  builtDeclaration,
-  ts.ScriptTarget.Latest,
-  true,
-  ts.ScriptKind.TS,
-)
-const declarationNames = declarationSource.statements
-  .flatMap((statement) => {
-    if (ts.isExportDeclaration(statement)) {
-      if (statement.exportClause === undefined) {
-        throw new Error('The declaration entry must use named exports')
-      }
-      return ts.isNamedExports(statement.exportClause)
-        ? statement.exportClause.elements.map((element) => element.name.text)
-        : [statement.exportClause.name.text]
-    }
-    if (ts.isExportAssignment(statement)) {
-      equal(statement.isExportEquals, false, 'The declaration entry must use ESM exports')
-      return ['default']
-    }
-    const modifiers = ts.canHaveModifiers(statement) ? ts.getModifiers(statement) : undefined
-    if (modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) !== true) {
-      return []
-    }
-    if (modifiers.some((modifier) => modifier.kind === ts.SyntaxKind.DefaultKeyword)) {
-      return ['default']
-    }
-    if (ts.isVariableStatement(statement)) {
-      return statement.declarationList.declarations.map((declaration) => {
-        if (!ts.isIdentifier(declaration.name)) {
-          throw new Error('Exported declaration variables must have names')
-        }
-        return declaration.name.text
-      })
-    }
-    if (
-      ts.isClassDeclaration(statement) ||
-      ts.isFunctionDeclaration(statement) ||
-      ts.isInterfaceDeclaration(statement) ||
-      ts.isTypeAliasDeclaration(statement) ||
-      ts.isEnumDeclaration(statement) ||
-      ts.isModuleDeclaration(statement) ||
-      ts.isImportEqualsDeclaration(statement)
-    ) {
-      if (statement.name === undefined) {
-        throw new Error('Exported declarations must have names')
-      }
-      return [statement.name.text]
-    }
-    throw new Error('Unsupported exported declaration')
-  })
-  .sort()
-deepStrictEqual(declarationNames, [
-  'CreateHttpApiQueryUtilsOptions',
-  'CreateRpcQueryUtilsOptions',
-  'EffectHttpApiQueryConfigError',
-  'EffectHttpApiQueryConfigErrorCode',
-  'EffectHttpApiQueryError',
-  'EffectHttpApiQueryKeyError',
-  'EffectHttpApiQueryKeyErrorCode',
-  'EffectRpcQueryConfigError',
-  'EffectRpcQueryConfigErrorCode',
-  'EffectRpcQueryEmptyStreamError',
-  'EffectRpcQueryError',
-  'EffectRpcQueryKeyError',
-  'EffectRpcQueryKeyErrorCode',
-  'HttpApiKeyEncoder',
-  'HttpApiQueryUtils',
-  'JsonValue',
-  'KeyEncoder',
-  'QueryData',
-  'RpcQueryUtils',
-  'RunPromiseExit',
-  'SkipToken',
-  'StreamingRpcOptions',
-  'UnaryRpcOptions',
-  'createHttpApiQueryUtils',
-  'createRpcQueryUtils',
-  'isEffectHttpApiQueryError',
-  'isEffectRpcQueryError',
-  'skipToken',
-])
-
-const queryCoreCompatibilityCases = () => {
-  const supportedPeerRange = '>=5.102.0 <6'
-  deepStrictEqual(packedManifest.peerDependencies, {
-    '@tanstack/query-core': supportedPeerRange,
-    effect: testedVersion('effect'),
-  })
-
-  const range = /^>=(?<minimum>\d+\.\d+\.\d+) <(?<nextMajor>\d+)$/u.exec(supportedPeerRange)?.groups
-  if (range?.['minimum'] === undefined || range['nextMajor'] === undefined) {
-    throw new Error(`Unsupported Query Core peer range: ${supportedPeerRange}`)
-  }
-
-  const current = testedVersion('@tanstack/query-core')
-  const currentReact = testedVersion('@tanstack/react-query')
-  equal(currentReact, current)
-  deepStrictEqual(lockedVersions('@tanstack/query-core'), [current])
-  deepStrictEqual(lockedVersions('@tanstack/react-query'), [currentReact])
-  const [currentMajor] = current.split('.')
-  equal(
-    range['nextMajor'],
-    String(Number(currentMajor) + 1),
-    'The Query Core peer range must stop before the next major',
-  )
-
-  const lowerBound = {
-    label:
-      current === range['minimum']
-        ? 'query-core-lower-bound-and-current'
-        : 'query-core-lower-bound',
-    queryCoreVersion: range['minimum'],
-    reactQueryVersion: range['minimum'],
-  }
-  return current === range['minimum']
-    ? [lowerBound]
-    : [
-        lowerBound,
-        {
-          label: 'query-core-current',
-          queryCoreVersion: current,
-          reactQueryVersion: currentReact,
-        },
-      ]
-}
-
-const packedFiles = execFileSync('tar', ['-tzf', tarballPath], { encoding: 'utf-8' })
-  .trim()
-  .split('\n')
-  .sort()
-const skillPaths = [
-  'skills/effect-api-query/SKILL.md',
-  'skills/effect-api-query/references/http.md',
-  'skills/effect-api-query/references/query-patterns.md',
-  'skills/effect-api-query/references/rpc.md',
-]
-const skillExamples: string[] = []
-for (const path of ['LICENSE', ...skillPaths]) {
-  const packedContent = execFileSync('tar', ['-xOzf', tarballPath, `package/${path}`], {
-    encoding: 'utf-8',
-  })
-  equal(
-    packedContent,
-    readFileSync(nodePath.join(repositoryRoot, path), 'utf-8'),
-    `The packed ${path} must match the candidate`,
-  )
-  for (const sample of packedContent.matchAll(/^```ts\n(?<source>[\s\S]*?)^```/gmu)) {
-    const source = sample.groups?.['source']
-    if (source !== undefined) {
-      skillExamples.push(source)
-    }
-  }
-}
-equal(skillExamples.length > 0, true, 'The packed usage skill must have compilable examples')
-equal(packedManifest.keywords.includes('tanstack-intent'), true)
-const changelogPath = nodePath.join(repositoryRoot, 'CHANGELOG.md')
-const hasChangelog = existsSync(changelogPath)
-if (repositoryManifest.version !== '0.0.0') {
-  equal(hasChangelog, true, 'A versioned release must include its changelog')
-}
-if (hasChangelog) {
-  equal(
-    execFileSync('tar', ['-xOzf', tarballPath, 'package/CHANGELOG.md'], { encoding: 'utf-8' }),
-    readFileSync(changelogPath, 'utf-8'),
-    'The packed changelog must match the candidate',
-  )
-}
-deepStrictEqual(packedFiles, [
-  ...(hasChangelog ? ['package/CHANGELOG.md'] : []),
-  'package/LICENSE',
-  'package/README.md',
-  'package/dist/index.d.mts',
-  'package/dist/index.mjs',
-  'package/dist/index.mjs.map',
-  'package/package.json',
-  ...skillPaths.map((path) => `package/${path}`),
-])
-
-const compilerCases = [
-  {
-    executable: nodePath.join(repositoryRoot, 'node_modules', 'typescript-5.9', 'bin', 'tsc'),
-    label: 'typescript-5.9',
-  },
-  {
-    executable: nodePath.join(repositoryRoot, 'node_modules', 'typescript', 'bin', 'tsc'),
-    label: 'typescript-current',
-  },
-] as const
-
-const peerCases = queryCoreCompatibilityCases()
-
-const runTypeScript = (
-  consumerDirectory: string,
-  compiler: (typeof compilerCases)[number],
-  project: 'tsconfig.json' | 'tsconfig.tanstack-start.json' | 'tsconfig.type-scale.json',
-  extendedDiagnostics: boolean,
-): void => {
-  console.log(`Verifying ${project} with ${compiler.label}`)
-  execFileSync(
-    process.execPath,
-    [
-      compiler.executable,
-      '-p',
-      project,
-      '--pretty',
-      'false',
-      ...(extendedDiagnostics ? ['--extendedDiagnostics'] : []),
-    ],
-    { cwd: consumerDirectory, stdio: 'inherit' },
-  )
-}
-
-const verifyConsumer = (peer: (typeof peerCases)[number]): void => {
-  const consumerDirectory = mkdtempSync(nodePath.join(tmpdir(), `effect-api-query-${peer.label}-`))
-
-  try {
-    cpSync(consumerFixtureDirectory, consumerDirectory, { recursive: true })
-    for (const fixture of [
-      'public-contract.ts',
-      'tanstack-start-contract.ts',
-      'http-contract.ts',
-      'type-scale.ts',
-      'http-type-scale.ts',
-      'docs-rpc-quick-start.ts',
-      'docs-http-quick-start.ts',
-    ]) {
-      cpSync(
-        nodePath.join(typeFixtureDirectory, fixture),
-        nodePath.join(consumerDirectory, fixture),
-      )
-    }
-
-    const consumerManifest = {
-      name: `effect-api-query-packed-consumer-${peer.label}`,
-      private: true,
-      type: 'module',
-      intent: { skills: ['effect-api-query'] },
-      dependencies: {
-        '@tanstack/query-core': peer.queryCoreVersion,
-        '@tanstack/react-query': peer.reactQueryVersion,
-        '@tanstack/react-router': testedVersion('@tanstack/react-router'),
-        '@tanstack/react-router-ssr-query': testedVersion('@tanstack/react-router-ssr-query'),
-        '@tanstack/react-start': testedVersion('@tanstack/react-start'),
-        '@types/node': testedVersion('@types/node'),
-        '@types/react': testedVersion('@types/react'),
-        '@types/react-dom': testedVersion('@types/react-dom'),
-        effect: testedVersion('effect'),
-        'effect-api-query': `file:${tarballPath}`,
-        react: testedVersion('react'),
-        'react-dom': testedVersion('react-dom'),
-      },
-    }
-    writeFileSync(
-      nodePath.join(consumerDirectory, 'package.json'),
-      JSON.stringify(consumerManifest, null, 2),
-    )
-    for (const [index, source] of skillExamples.entries()) {
-      writeFileSync(nodePath.join(consumerDirectory, `skill-example-${index}.ts`), source)
-    }
-
-    // Prefer cached artifacts, but allow a fresh machine to fetch exact pinned versions.
-    // The temporary project must resolve every peer from its own node_modules.
-    execFileSync('pnpm', ['install', '--ignore-scripts', '--prefer-offline'], {
-      cwd: consumerDirectory,
-      stdio: 'inherit',
-    })
-
-    const skillUse = 'effect-api-query#effect-api-query'
-    const intentOptions = { cwd: consumerDirectory }
-    const catalog = listIntentSkills(intentOptions)
-    deepStrictEqual(
-      catalog.skills.map((skill) => skill.use),
-      [skillUse],
-    )
-    const loadedSkill = loadIntentSkill(skillUse, intentOptions)
-    equal(loadedSkill.version, packedManifest.version)
-    equal(
-      readFileSync(nodePath.resolve(consumerDirectory, loadedSkill.path), 'utf-8'),
-      readFileSync(nodePath.join(repositoryRoot, 'skills/effect-api-query/SKILL.md'), 'utf-8'),
-      'Intent must load the shipped skill from the installed package',
-    )
-    // Intent can emit paths relative to the consumer or absolute paths when the
-    // package resolves outside it (for example through a symlinked temp directory).
-    const loadedReferences = new Set(
-      Array.from(loadedSkill.content.matchAll(/\]\((?<destination>[^)\n]+\.md)\)/gu), (link) => {
-        const destination = link.groups?.['destination']
-        if (destination === undefined) {
-          throw new Error('The reference link must include its destination')
-        }
-        return realpathSync(nodePath.resolve(consumerDirectory, destination))
-      }),
-    )
-    for (const path of skillPaths.slice(1)) {
-      const installedReference = realpathSync(
-        nodePath.resolve(consumerDirectory, loadedSkill.packageRoot, path),
-      )
-      equal(
-        loadedReferences.has(installedReference),
-        true,
-        `Intent must resolve the shipped ${path} reference`,
-      )
-    }
-
-    for (const compiler of compilerCases) {
-      runTypeScript(consumerDirectory, compiler, 'tsconfig.json', false)
-      runTypeScript(consumerDirectory, compiler, 'tsconfig.tanstack-start.json', false)
-      runTypeScript(
-        consumerDirectory,
-        compiler,
-        'tsconfig.type-scale.json',
-        peer.queryCoreVersion === testedVersion('@tanstack/query-core') &&
-          compiler.label === 'typescript-current',
-      )
-    }
-
-    for (const fixture of ['runtime.mts', 'http-runtime.mts']) {
-      execFileSync(process.execPath, ['--experimental-import-meta-resolve', fixture], {
-        cwd: consumerDirectory,
-        stdio: 'inherit',
-      })
-    }
-  } finally {
-    rmSync(consumerDirectory, { force: true, recursive: true })
-  }
-}
-
-for (const peer of peerCases) {
-  verifyConsumer(peer)
-}
-
-equal(artifactDigest(), initialDigest, 'The tested release archive must remain unchanged')
-console.log(
-  JSON.stringify(
-    {
-      package: `${packedManifest.name}@${packedManifest.version}`,
-      tarball: tarballPath,
-      sha512: initialDigest,
-      files: packedFiles,
-      compilers: compilerCases.map((compiler) => compiler.label),
-      peers: peerCases,
-    },
-    null,
-    2,
-  ),
-)
diff --git a/skills/effect-api-query/SKILL.md b/skills/effect-api-query/SKILL.md
index 32c59f9..d11b158 100644
--- a/skills/effect-api-query/SKILL.md
+++ b/skills/effect-api-query/SKILL.md
@@ -1,16 +1,50 @@
 ---
 name: effect-api-query
 description: >-
-  Use effect-api-query to derive TanStack Query options and cache keys from
-  Effect RPC or HttpApi contracts. Load when wiring createRpcQueryUtils or
-  createHttpApiQueryUtils, choosing
-  query or mutation builders, adding pagination or RPC streams, configuring
-  cache identity, handling execution failures or cancellation, or integrating
-  the library with React Query or SSR.
+  Use when integrating effect-api-query with an Effect RPC or HttpApi contract:
+  derive TanStack Query keys and options, choose buffered or streaming views,
+  configure metadata, pagination, defaults or cache filters, coordinate writes
+  and cache owners, capture or hydrate SSR data, or rebuild native framework
+  queries from reactive input. Also use when diagnosing execution failures,
+  cancellation, or ready-client lifetime in these integrations.
 license: ISC
 metadata:
+  purpose: >-
+    Derive typed TanStack Query keys and options from ready Effect RPC and HTTP
+    clients, preserving cache identity, decoded query views, native framework
+    behavior, and application-owned execution, hydration, and resource lifetime.
   type: core
   library: effect-api-query
+  library_version: '0.1.0'
+sources:
+  - 'src/**/*.ts'
+  - 'tests/**/*.ts'
+  - 'tests/**/*.tsx'
+  - '**/examples/shared/*.ts'
+  - '**/examples/vite-react/src/lib/*.ts'
+  - '**/examples/vite-react/src/main.tsx'
+  - '**/examples/vite-react/src/app.tsx'
+  - '**/examples/vite-react/src/components/ui/effect-error-details.tsx'
+  - '**/examples/vite-react/tests/*.ts*'
+  - '**/examples/tanstack-start/src/lib/*.ts'
+  - '**/examples/tanstack-start/src/router.tsx'
+  - '**/examples/tanstack-start/src/components/effect-error-details.tsx'
+  - '**/examples/tanstack-start/tests/*.ts*'
+  - '**/examples/server/src/*.ts'
+  - '**/examples/server/tests/**/*.ts'
+  - 'GLOSSARY.md'
+  - 'README.md'
+  - 'package.json'
+  - 'pnpm-workspace.yaml'
+  - 'scripts/*.mts'
+  - 'docs/adr/000*.md'
+  - 'docs/adr/0010-*.md'
+  - 'docs/adr/0012-*.md'
+  - 'docs/adr/0014-*.md'
+  - 'docs/adr/0015-*.md'
+  - 'docs/adr/002*.md'
+  - '**/apps/docs/src/content/docs/**/*.md'
+  - '**/apps/docs/src/content/docs/**/*.mdx'
 ---
 
 # Use effect-api-query
@@ -21,10 +55,11 @@ the application owns transport, authentication, resources, and cache policy.
 
 ## Choose the adapter
 
-Inspect the installed `effect-api-query/package.json` for its version and peer
-requirements. This library targets Effect 4 APIs; use the installed declarations
-when resolving API differences. Preserve literal contract types so the factory
-can infer the utility tree.
+Inspect the installed package manifest for its version and peers. This version
+uses the coordinated Effect 4.0.0 set; Query Core peers are `>=5.103.1 <6`.
+Use the installed declarations and preserve literal contracts.
+[Frameworks and hosts](references/frameworks-and-hosts.md) explains reactive
+options, version constraints, and transport ownership.
 
 Read the reference for the contract you are integrating:
 
@@ -44,18 +79,26 @@ an eager, frozen utility tree without making a request.
 | Buffered read              | `queryOptions({ input, ...options })`                            | `useQuery`, `useSuspenseQuery`, `queryClient.query`           |
 | Write                      | `mutationOptions({ ...callbacks })`                              | `useMutation`, `MutationObserver`; pass variables to `mutate` |
 | Cursor pagination          | `infiniteOptions({ initialPageParam, input, getNextPageParam })` | `useInfiniteQuery`, `queryClient.infiniteQuery`               |
-| Ordered RPC stream history | `streamedOptions({ input, maxChunks, refetchMode })`             | Ordinary query hooks or observers                             |
-| Latest RPC stream value    | `liveOptions({ input })`                                         | Ordinary query hooks or observers                             |
+| HTTP data/status/headers   | `metadataOptions({ input, ...options })`                         | Ordinary query hooks or observers                             |
+| Ordered RPC or SSE history | `streamedOptions({ input, maxChunks, refetchMode })`             | Ordinary query hooks or observers                             |
+| Latest RPC or SSE value    | `liveOptions({ input })`                                         | Ordinary query hooks or observers                             |
 
 Unary RPCs and buffered HTTP endpoints without multipart expose read, write, and pagination builders.
 Choose by application intent; HTTP method and RPC name do not restrict the choice.
 Buffered multipart HTTP endpoints expose mutation builders only and accept explicit `FormData`;
 follow the [HTTP rules](references/http.md) for upload input and encoder configuration.
-Streaming RPCs expose only accumulated and live query builders. Inputless
-operations omit `input`.
+Streaming RPCs and supported HTTP SSE endpoints expose accumulated and live
+builders. Metadata is a separate buffered HTTP query view. Inputless operations
+omit `input`.
 
-Read [query patterns](references/query-patterns.md) when adding conditional reads,
-pagination, streaming, React Query, or server rendering.
+Read only the branch needed for the task:
+
+| Task                                                                           | Read                                                       |
+| ------------------------------------------------------------------------------ | ---------------------------------------------------------- |
+| Infer reusable operation types, skip input, paginate, or choose stream history | [Query patterns](references/query-patterns.md)             |
+| Reuse typed policies, filter caches, apply writes or events, replace owners    | [Cache workflows](references/cache-workflows.md)           |
+| Capture open streams, serialize query views, or dispose request work           | [Hydration and SSR](references/hydration-and-ssr.md)       |
+| Mount native providers, recover Suspense, choose transport/host or versions    | [Frameworks and hosts](references/frameworks-and-hosts.md) |
 
 ## Preserve generated cache identity
 
@@ -63,15 +106,21 @@ pagination, streaming, React Query, or server rendering.
   backend identifiers when they distinguish results. The factory cannot infer
   identity from a client, URL, middleware, or RPC request options.
 - Pass caller options such as `staleTime`, `select`, and callbacks into the
-  builder. Preserve its `queryFn`, `queryKey`, and `queryKeyHashFn`; the builder
-  removes caller-supplied `queryHash`. Mutation builders own `mutationFn` and
-  `mutationKey`.
+  builder. Preserve its `queryFn` and `queryKey`. Configure custom hashing through
+  QueryClient global or prefix `queryKeyHashFn`; builders reject per-call hashing.
+  Keep hashing stable while cache entries remain. Streams reject a default
+  `queryHash` inconsistent with the key hasher or a conflicting cached identity
+  with `UnsupportedQueryHash`. Retire the old cache before changing its hash
+  policy. Mutation builders own `mutationFn` and `mutationKey`.
 - Treat captured inputs as immutable and build new options when they change.
   Keys are frozen snapshots; request inputs are not necessarily copied or frozen,
   so later mutation can make execution disagree with its key.
-- Use `queryKey(input)`, `infiniteKey(initialInput)`, `streamedKey(input)`, or
-  `liveKey(input)` for a particular cache shape. These keys retain the cache
-  data type; `select` changes observer data only.
+- Use the generated concrete key for its cache shape. Accumulated keys include
+  normalized retention/refetch policy: `streamedKey(input, policy)`. HTTP stream
+  keys also include decoder policy. Inputless stream keys take policy first.
+  Concrete keys retain the unselected cache data type. Hooks, observers, and
+  `queryClient.query` apply `select`; `getQueryData` reads the decoded cache value.
+  Use the matching options' `queryKey` when it already exists.
 - Use `key()` on a tree, branch, or leaf for prefix invalidation. After mutations,
   invalidate affected reads explicitly. RPC and HTTP roots are distinct; use
   the original caller prefix only for deliberate invalidation across adapters.
@@ -88,19 +137,27 @@ that provides them. It must return an Effect `Exit` and forward its second argum
 factory default. A custom key encoder supplies cache identity; execution services
 still come from the runner.
 
-Queries forward TanStack cancellation to Effect. Cancel outstanding queries
-before disposing their resources. Mutations receive no query abort signal;
-durable command cancellation needs an application operation identified before
-work starts. Interrupting a client call does not undo a completed write.
+Ordinary queries forward TanStack cancellation to Effect. For Suspense hooks,
+read the cancellation limitation in [frameworks and hosts](references/frameworks-and-hosts.md).
+Stop consumers, cancel queries,
+and drain local streams, pending preparation, and accepted mutations before
+disposing resources. Native cancellation can settle before finalizers finish;
+`fetchStreamSnapshot` drains its own capture. Mutations receive no query abort
+signal. A cancellable command needs an application operation identified before
+work starts; owner retirement leaves completed remote work intact.
+
+For spans and cleanup that cover stream consumption, follow the lifetime tracing
+recipe in [query patterns](references/query-patterns.md).
 
 ## Interpret results and failures
 
-Buffered queries normalize successful `undefined` to `null`; mutations preserve
-`undefined`. Streamed values follow the stream contract described in the query
-patterns reference.
+Buffered queries and live emissions normalize successful `undefined` to `null`.
+Accumulated stream elements and mutation results preserve `undefined`. See the
+query patterns reference for stream behavior.
 
-Configuration and key-generation errors are synchronous: an options builder may
-fail before a hook or query function runs. Failed execution Exits become
+Configuration and key-generation errors can fail preparation before a hook or
+query function runs. A stream's incompatible cache hashing rejects execution with
+a configuration error. Failed execution Exits become
 `EffectRpcQueryError` or `EffectHttpApiQueryError`. Narrow with
 `isEffectRpcQueryError` or `isEffectHttpApiQueryError`, then inspect the preserved
 Effect `cause`. A runner rejection passes through unchanged.
diff --git a/skills/effect-api-query/references/cache-workflows.md b/skills/effect-api-query/references/cache-workflows.md
new file mode 100644
index 0000000..53cb202
--- /dev/null
+++ b/skills/effect-api-query/references/cache-workflows.md
@@ -0,0 +1,209 @@
+# Defaults, filters, writes, and cache owners
+
+## Register native defaults and filters
+
+Create the QueryClient and utilities once for each owner. Register global defaults,
+then matching prefixes from broad to specific; TanStack merges them in registration
+order, without sorting by specificity. Omit an option to inherit it. Explicit
+`initialData: undefined` overrides an inherited seed, and `staleTime: 0` overrides
+inherited freshness. Reuse endpoint-aware callbacks through typed policies; keep
+selection and input at each builder call.
+
+```ts
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Schema } from 'effect'
+import { createRpcQueryUtils, viewPrefix } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+export const users = RpcGroup.make(
+  Rpc.make('users.read', {
+    payload: {
+      id: Schema.FiniteFromString,
+      locale: Schema.String.pipe(Schema.withConstructorDefault(Effect.succeed('en'))),
+    },
+    success: Schema.Struct({ id: Schema.Finite, name: Schema.String, locale: Schema.String }),
+  }),
+)
+
+export function userCache(client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof users>>) {
+  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  const rpc = createRpcQueryUtils(users, { client, keyPrefix: ['users-app'] })
+  queryClient.setQueryDefaults(rpc.key(), { staleTime: 30_000 })
+  queryClient.setQueryDefaults(rpc.users.key(), { gcTime: 600_000 })
+  const queryPrefix = viewPrefix(rpc.users.read, 'query')
+  queryClient.setQueryDefaults(queryPrefix, { staleTime: 60_000 })
+  return {
+    queryClient,
+    selected: rpc.users.read.queryOptions({
+      input: { id: 1 },
+      initialData: undefined,
+      select: (user) => user.name,
+    }),
+    exact: { queryKey: rpc.users.read.queryKey({ id: 1 }), exact: true as const },
+    everyLocale: { queryKey: [...queryPrefix, { id: '1' }] as const },
+  }
+}
+```
+
+Here `everyLocale` matches the encoded string ID across locales. The concrete key
+materializes `locale: 'en'` and addresses only that full input. Native partial
+filters must follow the actual canonical encoding, including any custom projection.
+HTTP filters retain `params`, `query`, `headers`, and `payload` labels and default
+lowercase header names. An opaque scalar encoder cannot expose omitted fields to
+partial matching; use a broad prefix or an exact generated key.
+
+Root, branch, leaf, and `viewPrefix(leaf, view)` prefixes support native
+`invalidateQueries`, `cancelQueries`, and other filters. Exact stream keys include
+policy; a view prefix matches all its inputs and stream policies. `viewPrefix`
+accepts only supported query views and returns a frozen ordinary tuple, without
+a DataTag. Only concrete generated query keys carry data/error tags; broad reads
+remain `unknown` until the application establishes their representation. Selection
+changes hook, observer, and `queryClient.query` results while the cache keeps full decoded data. Configure hashing
+through QueryClient global or prefix `queryKeyHashFn` and keep it stable; builders
+reject per-call hashing. Streams reject inconsistent default `queryHash` values
+and conflicting cached identity with `UnsupportedQueryHash` during execution.
+Retire the old cache before changing its hash policy.
+Mutation defaults and keys use the separate native mutation cache.
+
+## Reuse typed query and mutation policies
+
+Use `withQueryPolicy(leaf, view, policy)` to bind common freshness, retry, or
+observer callbacks to that leaf's original options builder. Use
+`withMutationPolicy(leaf, policy)` for typed mutation callbacks and retry settings.
+Create these bound builders once per owner and reuse them at call sites. The
+following factory shares a freshness decision and mutation invalidation:
+
+```ts
+import { Schema } from 'effect'
+import { createRpcQueryUtils, withMutationPolicy, withQueryPolicy } from 'effect-api-query'
+import type { QueryPolicy } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+export const directory = RpcGroup.make(
+  Rpc.make('users.get', {
+    payload: { id: Schema.Int },
+    success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+  }),
+  Rpc.make('users.rename', {
+    payload: { id: Schema.Int, name: Schema.String },
+    success: Schema.Void,
+  }),
+)
+
+export function userPolicies(client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof directory>>) {
+  const rpc = createRpcQueryUtils(directory, { client, keyPrefix: ['directory-app'] })
+  const policy = {
+    staleTime: (query) => (query.state.data === undefined ? 0 : 60_000),
+    retry: false,
+  } satisfies QueryPolicy<typeof rpc.users.get>
+  const read = withQueryPolicy(rpc.users.get, 'query', policy)
+  const rename = withMutationPolicy(rpc.users.rename, {
+    onSuccess: (_data, _variables, _result, context) =>
+      context.client.invalidateQueries({ queryKey: rpc.users.key() }),
+  })
+  return {
+    read,
+    rename,
+    selected: read({ input: { id: 1 }, select: (user) => user.name }),
+    refreshed: read({ input: { id: 2 }, staleTime: 0 }),
+  }
+}
+```
+
+Extract a stored policy with `satisfies QueryPolicy<typeof leaf, View>` or
+`MutationPolicy<typeof leaf>` to retain contextual callback types. Query callbacks
+see that view's cached data and error; mutation callbacks see its data and complete
+variables. Input, projection, initial/placeholder data, page mapping, stream
+identity, and adapter request controls belong to each bound builder invocation.
+QueryClient continues to own hashing; generated functions and keys stay owned.
+
+Mutation policies exclude `onMutate` so local optimistic context retains its
+inference. Shared callbacks receive that local result as `unknown`. Call-site
+options replace matching defaults, including whole callbacks; callbacks are not
+composed. Compose explicitly if both actions are required, and return their
+Promise when settlement must wait. Keep originating-owner checks and overlapping
+write coordination in the application workflow below. For typed domain failure
+classification and shared RPC/HTTP retry decisions, use
+[the retry recipe](https://ueberbrot.github.io/effect-api-query/guides/retry-queries/).
+
+## Coordinate overlapping optimistic writes
+
+Keep this workflow in the application and make every participating write follow it:
+
+1. In `onMutate`, capture the originating owner and reserve this write before an
+   await. Cancel older reconciliation reads before publishing optimistic state.
+2. Snapshot only the affected entities and positions. Preserve unrelated list
+   entries, infinite pages, and `pageParams`; allocate temporary IDs per creation.
+   Each new deletion captures current fields and positions after an authoritative
+   refresh; shared overlap snapshots retain ordering within the owned view.
+3. Return the original owner's commit, rollback, and settlement actions in mutation
+   context. Check that owner after every await and before any cache side effect.
+4. On success, replace only this write's optimistic value and seed exact generated
+   detail keys with the response's locale and other identity fields.
+5. On failure, remove this write's temporary entry or restore its removed entity
+   beside surviving original neighbors. A whole stale-snapshot rollback can erase
+   another write. Roll back only a cache revision still owned by the optimistic
+   write; preserve later authoritative updates even when structural sharing keeps
+   the same data object. Coordinate repeated deletions of the same entity explicitly.
+6. Reconcile when the final overlapping write settles. Each new write cancels an
+   earlier reconciliation before its optimistic update.
+
+An observer's option update can replace pending callbacks or a not-yet-started
+mutation function. Context preserves originating actions; remount consumers at an
+owner handoff. Cache rollback cannot undo accepted server work. External writes,
+manual replacement, and server ordering need application conflict policy.
+
+## Refresh from application events
+
+Map authenticated, decoded domain events deliberately to native generated filters.
+If RPC and HTTP share a domain, name both roots. Capture the original owner in one
+scoped consumer; unregister event, Reactivity, and mutation listeners on closure.
+Check that owner before queued invalidation and after awaits.
+
+Defer refresh while participating mutations are pending, retain the invalidation
+intent, and flush it after settlement. A branch refresh may subsume narrower work.
+Effect Reactivity keys need an explicit application mapping; a Query tuple has no
+implied Reactivity subscription. Native batching combines invalidations of the same
+Reactivity key, without guaranteeing one Query refresh across distinct keys.
+
+An accepted monotonic cursor records invalidation intent, not durable delivery or
+successful reads. Replay ordered events with duplicate suppression when supported;
+otherwise refresh authoritative reads and reset the sequence deliberately. The
+application owns authentication, reconnect, replay storage, epochs, acknowledgements,
+and out-of-order delivery.
+
+## Replace an owner in order
+
+Partition results by safe tenant, user, backend, session, and permission-generation
+identity in `keyPrefix`; keep credentials out of keys. Capture the retiring owner,
+unmount its consumers, mark it inactive, stop new work, cancel queries, and drain
+accepted mutations and local streams before releasing ready-client resources.
+Only then acquire and mount the replacement. Apply this sequence even when semantic
+identity is unchanged. A provider client prop change alone does not replace hook
+ownership. Guard late commit, rollback, and settlement callbacks even after drain.
+
+An accepted command may finish remotely during retirement; completed work persists.
+Use an explicit application command-cancellation operation to stop future domain
+work. Local retirement supplies neither rollback nor remote cancellation acknowledgement.
+A hanging request or finalizer can delay handoff. For an operation-ID protocol with
+separate start, progress, and cancel calls, use the
+[cancellable commands example](https://ueberbrot.github.io/effect-api-query/examples/cancellable-commands/).
+
+For reload persistence, allowlist a validated DTO view, repeat the safe owner tuple
+in its envelope, and include schema/key version busters. Restore only matching
+identities through freshly generated keys; discard foreign or incompatible data
+before writing. Avoid persisting pending optimistic values, arbitrary caches, errors,
+mutations, credentials, or class prototypes. Use paired codecs for rich values.
+
+Explicit disposal should expose storage failures while completing resource cleanup.
+Lifecycle callbacks such as pagehide or HMR must handle a rejected disposal Promise
+so it does not become an unhandled rejection. Preserve the chosen reload-persistence
+policy and ordered cleanup.
+
+Sources: [defaults and policies](https://ueberbrot.github.io/effect-api-query/guides/query-defaults/),
+[cache keys and filters](https://ueberbrot.github.io/effect-api-query/guides/cache-filters/),
+[optimistic writes](https://ueberbrot.github.io/effect-api-query/guides/optimistic-writes/),
+[owner replacement](https://ueberbrot.github.io/effect-api-query/guides/switch-cache-owners/),
+[event refresh](https://ueberbrot.github.io/effect-api-query/guides/refresh-from-events/).
diff --git a/skills/effect-api-query/references/frameworks-and-hosts.md b/skills/effect-api-query/references/frameworks-and-hosts.md
new file mode 100644
index 0000000..57ddf6f
--- /dev/null
+++ b/skills/effect-api-query/references/frameworks-and-hosts.md
@@ -0,0 +1,163 @@
+# Native frameworks, transports, and supported hosts
+
+When choosing a framework, router, or host, use the
+[integration overview](https://ueberbrot.github.io/effect-api-query/integrations/)
+for native consumer and application lifetime boundaries.
+
+## Rebuild captured options from reactive input
+
+Acquire clients and create utilities during application setup. Supply the native
+framework's Query provider. Builders capture plain input at each call; invoke them
+inside the framework's reactive options computation so changed input produces a
+new key and query function. Mutations receive new variables at execution time.
+
+| Framework | Native options construction                                                       |
+| --------- | --------------------------------------------------------------------------------- |
+| React     | Rebuild the builder result as component input changes; use ordinary Query hooks   |
+| Vue       | `computed(() => rpc.users.read.queryOptions(...))` passed to `useQuery`           |
+| Solid     | `useQuery(() => rpc.users.read.queryOptions(...))`                                |
+| Svelte    | `createQuery(() => rpc.users.read.queryOptions(...))`                             |
+| Angular   | `injectQuery(() => rpc.users.read.queryOptions(...))` inside an injection context |
+
+Apply this pattern to infinite, metadata, accumulated, and live options too. This
+factory constructs utilities once and returns hooks for native component setup:
+
+```ts
+import { useQuery as useSolidQuery } from '@tanstack/solid-query'
+import { useQuery as useVueQuery } from '@tanstack/vue-query'
+import { Schema } from 'effect'
+import { createRpcQueryUtils, skipToken } from 'effect-api-query'
+import type { InferQueryData, InferQueryError } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+import { computed, ref } from 'vue'
+
+export const group = RpcGroup.make(
+  Rpc.make('users.read', {
+    payload: { id: Schema.Int },
+    success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+  }),
+)
+
+export function makeUserHooks(client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>) {
+  const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['users-app'] })
+  return {
+    useVueUser() {
+      const id = ref<number | undefined>(1)
+      const options = computed(() =>
+        rpc.users.read.queryOptions({
+          input: id.value === undefined ? skipToken : { id: id.value },
+          select: (user) => user.name,
+        }),
+      )
+      const user = useVueQuery<
+        InferQueryData<typeof rpc.users.read>,
+        InferQueryError<typeof rpc.users.read>,
+        string
+      >(options)
+      return { id, user }
+    },
+    useSolidUser(id: () => number | undefined) {
+      return useSolidQuery(() => {
+        const value = id()
+        return rpc.users.read.queryOptions({
+          input: value === undefined ? skipToken : { id: value },
+          select: (user) => user.name,
+        })
+      })
+    },
+  }
+}
+```
+
+Vue's explicit hook generics preserve tagged data/error types while avoiding deep
+recursive unwrapping of Effect Causes. Let builders infer their arguments. Vue
+function-valued `enabled` is a zero-argument getter; use a boolean or `() => boolean`,
+instead of Core's `enabled(query)` callback. Solid accepts the Core callback.
+
+Solid Query 5.104.0 query/infinite overloads require a defined seed or no seed; a
+possibly undefined value or initializer does not match. Vue accepts that initializer.
+Explicit `initialData: undefined` overrides inherited seeds. Angular's skipped query
+keeps optional `data()` even with defined initial data; Svelte preserves defined data
+for that combination. Both accept possibly undefined initializers with optional data.
+
+Compile Svelte with `module: 'ESNext'` and `moduleResolution: 'Bundler'`; NodeNext
+checking exposes an upstream `.svelte` declaration import limitation. Angular results
+are signals such as `data()`; register `provideTanStackQuery(queryClient)` and use an
+injection context. Use native infinite and mutation hooks with the matching builders.
+
+For ordinary Query hooks and observers, last-observer removal cancels abort-aware
+open queries. Keep resources alive until local finalizers finish. For an owner
+change, follow the ordered unmount, drain, dispose, and remount procedure in
+[cache workflows](cache-workflows.md).
+
+## Mount a provider and recover Suspense
+
+For a first React integration, acquire one client, create the utility tree and
+QueryClient once, and mount `QueryClientProvider`. Unmount consumers before disposing
+the application's client resources. Use
+[the React client setup](https://ueberbrot.github.io/effect-api-query/guides/react-query/#acquire-and-mount-the-client)
+for one acquired HTTP client, one component, and an awaited cleanup function.
+
+Put `QueryErrorResetBoundary` around a component error boundary and Suspense.
+On retry, reset both the Query error boundary and the component boundary before
+rendering its queries again. With cached data, a failed refetch normally keeps
+rendering that data; show the local error when fetching stops, or deliberately
+throw it if the application wants boundary recovery.
+
+Use `useSuspenseQueries` for independent reads that should start together.
+Its native overload may need explicit `{ queryFnData, error }` type descriptors
+derived with the inference helpers. Follow
+[the complete Suspense recipe](https://ueberbrot.github.io/effect-api-query/guides/suspense-and-recovery/)
+for the boundary and parallel-query signatures. Native Suspense query hooks do
+not support cancellation: use ordinary Query hooks or observers when abort and
+open-stream cleanup are required. Skipped query options cannot be used with
+Suspense hooks.
+
+## Match application dependencies
+
+Keep Effect packages coordinated with the exact package peer. Match each native
+Query wrapper to the application's Query Core and use a compiler supported by
+its framework tooling. Angular core, common, compiler, and platform-browser
+should share one release.
+
+## Keep transport and host ownership explicit
+
+- **HTTP RPC:** acquire a flat client in a live application Scope with matching
+  protocol and serialization, as in [RPC setup](rpc.md).
+- **Shared WebSocket RPC:** concurrent unary and stream requests share the owned
+  connection while retaining independent keys and cancellation. Acquire replacement
+  resources after retiring the prior owner. Reconnect, backoff, authentication, and
+  replay remain application policy. Local cancellation does not prove remote cleanup.
+- **Server-local RPC:** a request-scoped public decoded-message client/server can
+  avoid a network round trip. Server-owned services determine authority; caller
+  services cannot override it. This path skips wire Schema codecs; retain a
+  schema-aware protocol when their validation or effects matter.
+- **Browser/dedicated worker:** each host owns its ready clients, runtime, Scope,
+  and QueryClient. Worker-hosted operations do not establish cross-host `postMessage`
+  transport, service/shared workers, authentication, or cache synchronization.
+  Await cleanup before terminating a worker.
+- **External OpenAPI HTTP:** `openapi-typescript` can generate encoded DTO types
+  from native `OpenApi.fromApi` for `openapi-fetch`. That client calls HTTP
+  independently and cannot replace the ready Effect HttpApiClient in the factory.
+  Multipart needs explicit FormData serialization. Raw SSE bytes provide neither
+  event parsing nor Schema decoding or reserved-failure handling.
+
+Keep the native WebSocket buffer default of 16 unless the application verifies
+another size with its workload. With Effect 4.0.0, an overflowing buffer of size
+one can stall other calls; larger chunks and unfinished queue offers also need
+application checks. A client chunk Schema failure can fail unrelated calls, and
+larger buffers do not isolate it. Keep streaming schemas compatible.
+
+Single-element arrays in GET and form-urlencoded payloads can fail native server
+decoding. Array query parameters and JSON array responses retain their representation.
+The factories preserve the ready client's actual execution contract; they supply
+no transport batching, platform services, or framework providers. Error guards use
+same-realm `instanceof`; transfer safe error DTOs deliberately across realms.
+
+Sources: [Vue Query](https://ueberbrot.github.io/effect-api-query/guides/vue-query/),
+[Solid Query](https://ueberbrot.github.io/effect-api-query/guides/solid-query/),
+[Svelte Query](https://ueberbrot.github.io/effect-api-query/guides/svelte-query/),
+[Angular Query](https://ueberbrot.github.io/effect-api-query/guides/angular-query/),
+[host boundaries](https://ueberbrot.github.io/effect-api-query/reference/browser-and-worker-hosts/),
+[WebSocket clients](https://ueberbrot.github.io/effect-api-query/guides/websocket-clients/).
diff --git a/skills/effect-api-query/references/http.md b/skills/effect-api-query/references/http.md
index af38476..423319e 100644
--- a/skills/effect-api-query/references/http.md
+++ b/skills/effect-api-query/references/http.md
@@ -52,6 +52,10 @@ try {
   await queryClient.query(
     http.users.get.queryOptions({ input: { params: { id: 1 } }, staleTime: 30_000 }),
   )
+  const metadata = await queryClient.query(
+    http.users.get.metadataOptions({ input: { params: { id: 1 } } }),
+  )
+  console.log(metadata.data.name, metadata.status, metadata.headers['etag'])
   const rename = new MutationObserver(
     queryClient,
     http.users.rename.mutationOptions({
@@ -103,9 +107,83 @@ mutation-only, including mixed plain and multipart alternatives. Those leaves ex
 only `key()`, `mutationKey()`, and `mutationOptions()`, regardless of HTTP method.
 Mixed alternatives preserve Effect's client request union.
 
-The adapter omits an endpoint entirely if it has **any streaming success alternative**
-or **any streaming multipart request alternative**. Empty groups disappear. Use the underlying
-Effect client directly for these endpoints.
+An endpoint with exactly one SSE success exposes `streamedKey` / `streamedOptions` for
+ordered history and `liveKey` / `liveOptions` for the latest decoded value. Declared
+response-header wrappers surround each emission. Keep `sseOptions` beside decoded
+`input`; live keys include decoder policy, while accumulated keys also include retention
+and refetch policy. Applications own reconnect and resume controls. Empty live completion
+raises `EffectHttpApiQueryEmptyStreamError`; a top-level `undefined` emission becomes `null`.
+
+Raw byte streams, mixed buffered/SSE successes, multipart SSE payloads, and streaming
+multipart request alternatives omit the whole endpoint. Empty groups disappear. Consume
+unsupported streams through the underlying Effect client.
+
+## Read buffered metadata
+
+Use `metadataOptions` when a read needs decoded data, response status, or raw
+string headers. Use `metadataKey(input)` for typed cache access. Its `metadata`
+discriminator separates it from ordinary data; a leaf prefix matches both views.
+Metadata has no mutation or infinite builders and is absent on multipart and
+streaming endpoints.
+
+Fetched envelopes and their copied header records are frozen. The decoded `data`
+remains mutable and retains any declared decoded header wrapper. Only an entirely
+undefined success becomes `null`. Initial data, hydration, manual writes, and
+selected results remain application-owned.
+
+Native `select`, skipping, defaults, and cancellation apply. Global and prefix
+`structuralSharing` policies apply to fetched metadata snapshots. Selected results
+and later manual writes use an explicit policy passed to `metadataOptions`, or
+standard deep sharing when omitted. An inherited sharing callback does not govern
+those later values. A fresh-cache hit from `queryClient.query` does not replace an
+existing Query's options. Install a changed policy through an observer or an actual
+fetch before relying on it for manual writes.
+
+Apply an application disclosure policy before persisting raw headers: their strings
+receive no inspection redaction.
+
+## Consume decoded SSE
+
+Keep decoder options beside the request. This function accepts an already acquired
+client for the same declaration and returns independent history and latest views:
+
+```ts
+import { Schema } from 'effect'
+import { createHttpApiQueryUtils } from 'effect-api-query'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+
+export const eventsApi = HttpApi.make('events-api').add(
+  HttpApiGroup.make('events').add(
+    HttpApiEndpoint.get('watch', '/events', {
+      query: { channel: Schema.String },
+      success: HttpApiSchema.StreamSse({ data: Schema.String }),
+    }),
+  ),
+)
+
+export function httpEventOptions(client: HttpApiClient.ForApi<typeof eventsApi>) {
+  const http = createHttpApiQueryUtils(eventsApi, { client, keyPrefix: ['events-app'] })
+  const input = { query: { channel: 'news' } }
+  const policy = {
+    maxChunks: 100,
+    refetchMode: 'append' as const,
+    sseOptions: { maxEventSize: 1_048_576 },
+  }
+  return {
+    history: http.events.watch.streamedOptions({ input, ...policy }),
+    historyKey: http.events.watch.streamedKey(input, policy),
+    latest: http.events.watch.liveOptions({ input, sseOptions: policy.sseOptions }),
+  }
+}
+```
+
+The accumulated key includes normalized `maxChunks`, `refetchMode`, and
+`sseOptions.maxEventSize`; the live key includes the decoder limit. Its default is
+10 MiB per SSE event, distinct from the cache's element bound. Applications own
+reconnect, replay, and resume. For refetch visibility and retention, read
+[query patterns](query-patterns.md); for request capture, read
+[hydration and SSR](hydration-and-ssr.md).
 
 ## Multipart mutations
 
@@ -128,8 +206,9 @@ rules apply to default encoding, not custom encoder output.
 Configure custom encoders under declaration group and endpoint identifiers,
 including top-level groups: `keyEncoders: { groupId: { endpointId: encoder } }`.
 The encoder receives the complete decoded request. For endpoints with query support,
-provide one when encoding requires services, the request contains explicit redacted values, or the endpoint
-declares multiple payload alternatives. Binary query inputs need a JSON-safe projection,
+provide one when encoding requires services, uses opaque middleware, contains explicit
+redacted values, or declares multiple payload alternatives. Runtime middleware inspection
+is conservative even for synchronous service-free encoding. Binary query inputs need a JSON-safe projection,
 such as an array of bytes.
 
 Return strict synchronous `JsonValue` and preserve body/content-type distinctions
@@ -138,4 +217,5 @@ supplies identity only; the client still performs request encoding, and the
 runner must provide required services. Keep ordinary authentication in client
 middleware and use safe identity partitions in the key prefix.
 
-Source: [HTTP factory contract](https://ueberbrot.github.io/effect-api-query/reference/http-factory/).
+Sources: [HTTP factory](https://ueberbrot.github.io/effect-api-query/reference/http-factory/),
+[HTTP builders](https://ueberbrot.github.io/effect-api-query/reference/http-builders/).
diff --git a/skills/effect-api-query/references/hydration-and-ssr.md b/skills/effect-api-query/references/hydration-and-ssr.md
new file mode 100644
index 0000000..6691bca
--- /dev/null
+++ b/skills/effect-api-query/references/hydration-and-ssr.md
@@ -0,0 +1,146 @@
+# Capture, hydrate, and dispose request data
+
+## Capture an open stream
+
+Use a fresh request-owned QueryClient and keep its ready clients, runner, and Scope
+alive until every capture and preparation settles. `queryClient.query` waits for
+stream completion. Use `fetchStreamSnapshot` for the first new cache publication or
+normal completion; it cancels that exact query and awaits local iterator cleanup.
+
+```ts
+import { dehydrate } from '@tanstack/query-core'
+import type { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import { createRpcQueryUtils, fetchStreamSnapshot } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+export const updates = RpcGroup.make(
+  Rpc.make('updates.watch', {
+    payload: { channel: Schema.String },
+    success: Schema.String,
+    stream: true,
+  }),
+)
+
+export async function captureUpdates(
+  queryClient: QueryClient,
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof updates>>,
+  signal: AbortSignal,
+) {
+  const rpc = createRpcQueryUtils(updates, { client, keyPrefix: ['updates-app'] })
+  const options = rpc.updates.watch.streamedOptions({
+    input: { channel: 'news' },
+    maxChunks: 20,
+    retry: false,
+  })
+  await fetchStreamSnapshot(queryClient, options, { signal, timeoutMs: 5_000 })
+  return dehydrate(queryClient, { shouldDehydrateMutation: () => false })
+}
+```
+
+The same helper accepts RPC or HTTP accumulated/live options. Default `fresh` mode
+starts a new attempt even with initial or cached success. `append` retains existing
+history. A `replace` refetch of previously fetched data publishes only at completion,
+so an indefinite replacement needs completion or timeout. Explicit `mode: 'cached'`
+reuses successful data without starting or cancelling work, and falls back to fresh
+when no successful entry exists. Native `select` and QueryClient defaults apply.
+
+Reserve the exact key exclusively during fresh capture: it must be idle and
+unobserved. Avoid same-key writes, observers, and concurrent fetches until settlement;
+an external manual publication can otherwise look like a stream emission. Other
+keys keep running. Hash through QueryClient defaults; per-call `queryHash` and
+`queryKeyHashFn` are rejected.
+
+Abort and timeout stop the data wait, then cleanup is awaited before resolution or
+rejection. `timeoutMs` does not bound finalization. Local settlement does not await a
+remote cancellation acknowledgement. Dispose client resources after helper settlement.
+
+## Choose a consistent cache representation
+
+Server and browser need equivalent contracts, inputs, safe prefixes, and hashing.
+Use independent QueryClients, clients, runners, and Scopes. Choose `staleTime` to
+control the first browser refetch; a new browser stream reconnects independently.
+
+Use JSON-safe success DTOs in both caches, or encode decoded domain values at the
+snapshot boundary and decode them during hydration. `select` changes observer data,
+not the cache. `structuredClone` does not restore class prototypes or supply JSON
+codecs for bigint and bytes. This synchronous paired codec keeps rich values through
+hydration and later contract refetch:
+
+```ts
+import { defaultShouldDehydrateQuery, dehydrate, hydrate } from '@tanstack/query-core'
+import type { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+
+export class Profile extends Schema.Class<Profile>('Profile')({
+  name: Schema.String,
+  credits: Schema.BigIntFromString,
+  avatar: Schema.Uint8ArrayFromBase64,
+}) {
+  summary() {
+    return `${this.name}: ${this.credits} credits`
+  }
+}
+
+export const snapshotProfile = (queryClient: QueryClient): string =>
+  JSON.stringify(
+    dehydrate(queryClient, {
+      shouldDehydrateMutation: () => false,
+      shouldDehydrateQuery: (query) =>
+        defaultShouldDehydrateQuery(query) && query.queryKey[0] === 'profile',
+      serializeData: Schema.encodeUnknownSync(Profile),
+    }),
+  )
+
+export const hydrateProfile = (queryClient: QueryClient, json: string): void =>
+  hydrate(queryClient, JSON.parse(json), {
+    defaultOptions: { deserializeData: Schema.decodeUnknownSync(Profile) },
+  })
+```
+
+Reserve this recipe's prefix for unary `Profile` data and declare `Profile` as the
+operation success on both sides. The enclosing snapshot must come from the matching
+application encoder. Synchronous callbacks require service-free synchronous codecs.
+
+For effectful or serviceful codecs, run application-owned preparation before native
+dehydration transport or hydration. Await all selected encodings before publishing
+one snapshot. Decode all selected entries before one native `hydrate` call, so one
+failed decode leaves the destination untouched. Never store preparation Effects or
+Promises as query data. Supply codec services through the owning runtime.
+
+Choose codecs for the complete view:
+
+| View                        | Preserve                                                                      |
+| --------------------------- | ----------------------------------------------------------------------------- |
+| Infinite data               | Every `pages` value and `pageParams` representation                           |
+| Accumulated stream          | Ordered decoded values, including distinct `undefined` and `null`             |
+| Live stream                 | Latest decoded value, with top-level `undefined` already normalized to `null` |
+| HTTP decoded header wrapper | Body and decoded headers, reconstructing the wrapper                          |
+| HTTP metadata               | Decoded data/wrapper, status, and approved raw string headers                 |
+
+JSON turns undefined array elements into null; use a tagged codec when accumulated
+history distinguishes them. A header wrapper with an undefined body remains a
+wrapper, so preserve that body separately. Encode all declared success alternatives
+and rich page parameters. The package supplies no codec registry or serializer.
+
+Retain `defaultShouldDehydrateQuery` to omit failed queries. Custom error transfer
+must separately encode `state.error` and `state.fetchFailureReason`; data codecs do
+not sanitize Causes, headers, or those fields. A safe error DTO does not automatically
+reconstruct package error classes. Apply application disclosure rules before transport.
+
+## Drain request work before disposal
+
+Track query execution, accepted mutations, preparation, and snapshot captures in
+the request owner. On request completion or abort, stop accepting work, abort pending preparation/captures, cancel
+queries, and drain accepted mutations and local finalizers before closing clients or
+runtimes. Cancelling QueryClient work alone does not drain codec preparation or
+acknowledge finalization. Clear the request's private cache as part of its lifecycle.
+The browser acquires independent resources after hydration.
+
+When adding query persistence to the Start example, compose its application-owned
+persister. Replacing it bypasses tracking of query and iterator cleanup.
+
+Sources: [stream snapshots](https://ueberbrot.github.io/effect-api-query/guides/stream-snapshots/),
+[unary hydration](https://ueberbrot.github.io/effect-api-query/guides/hydrate-unary-data/),
+[query-view codecs](https://ueberbrot.github.io/effect-api-query/guides/hydrate-query-views/).
diff --git a/skills/effect-api-query/references/query-patterns.md b/skills/effect-api-query/references/query-patterns.md
index 1956fb0..e114a60 100644
--- a/skills/effect-api-query/references/query-patterns.md
+++ b/skills/effect-api-query/references/query-patterns.md
@@ -1,4 +1,32 @@
-# Conditional reads, pages, streams, and SSR
+# Conditional reads, pages, and streams
+
+## Reuse inferred operation types
+
+Import inference helpers from `effect-api-query` and apply them to a utility leaf:
+
+| Helper                                                | Representation                                                        |
+| ----------------------------------------------------- | --------------------------------------------------------------------- |
+| `InferInput<typeof rpc.users.read>`                   | RPC payload constructor input, including omitted constructor defaults |
+| `InferInput<typeof http.users.read>`                  | Decoded HTTP request containers; multipart payloads use `FormData`    |
+| `InferQueryData<typeof rpc.users.read>`               | Cached ordinary query data, before `select`                           |
+| `InferQueryData<typeof http.users.read, 'metadata'>`  | Decoded data, status, and copied raw headers                          |
+| `InferQueryData<typeof rpc.events.watch, 'streamed'>` | Ordered decoded stream elements                                       |
+| `InferQueryData<typeof rpc.events.watch, 'live'>`     | Latest normalized query data                                          |
+| `InferQueryError<typeof rpc.users.read>`              | Error type carried by the concrete query key                          |
+| `InferMutationData<typeof rpc.users.write>`           | Successful mutation value, preserving `undefined`                     |
+| `InferMutationError<typeof rpc.users.write>`          | Buffered mutation execution error type                                |
+
+Specify `'infinite'` to infer `InfiniteData` with an unknown page-parameter type.
+Use the actual options' tagged key when the mapper establishes a more precise
+page-parameter type. Query and live data normalize `undefined` to `null`;
+accumulated elements and mutation data keep it. `InferQueryError` accepts the
+same view parameter as `InferQueryData`. Choose a view supported by that leaf;
+stream leaves need an explicit `'live'` or `'streamed'` view. Branches and
+unsupported default views infer `never`. These types describe the contract;
+runner rejections still pass through at runtime.
+
+For the complete input, supported-view, and cache representation contract, read
+[Type Inference](https://ueberbrot.github.io/effect-api-query/reference/type-inference/).
 
 ## Conditional reads with React Query
 
@@ -37,8 +65,8 @@ export function makeUseUser(client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeo
 ```
 
 HTTP uses the same conditional pattern with its decoded request shape. Unary,
-streamed, and live options also accept direct `skipToken`; their object form
-preserves caller options. Inputless operations, key builders, and mutations do
+metadata, streamed, and live builders take `input: skipToken` in the options
+object and preserve caller options. Inputless operations, key builders, and mutations do
 not accept it. Skipped options cannot execute through manual refetch and are
 unsuitable for suspense or prefetch-only hooks.
 
@@ -103,13 +131,15 @@ export const events = RpcGroup.make(
 
 export function eventOptions(client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof events>>) {
   const rpc = createRpcQueryUtils(events, { client, keyPrefix: ['events-app'] })
+  const input = { channel: 'news' }
+  const policy = { maxChunks: 100, refetchMode: 'append' as const }
   return {
     history: rpc.events.watch.streamedOptions({
-      input: { channel: 'news' },
-      maxChunks: 100,
-      refetchMode: 'append',
+      input,
+      ...policy,
     }),
-    latest: rpc.events.watch.liveOptions({ input: { channel: 'news' } }),
+    historyKey: rpc.events.watch.streamedKey(input, policy),
+    latest: rpc.events.watch.liveOptions({ input }),
   }
 }
 ```
@@ -119,8 +149,12 @@ entries and start independent executions when both are observed.
 
 Accumulated queries retain emitted elements in order. `maxChunks` is a positive
 safe integer limiting element count, not bytes; omission leaves history unbounded.
-Choose a consistent policy for each cache entry: `maxChunks` and `refetchMode`
-are not part of its identity.
+Both `maxChunks` and `refetchMode` contribute to normalized cache identity.
+Omitted policy and explicit unlimited/reset policy share an identity; different
+bounds or refetch modes use different entries. Use `streamedKey(input, policy)`
+or the matching options' `queryKey`. Inputless operations take the policy first.
+HTTP accumulated views additionally include SSE decoder policy; HTTP live views
+include decoder policy too.
 
 - `reset` (default) clears data and returns to pending on refetch.
 - `append` adds new emissions to cached history.
@@ -131,32 +165,44 @@ Live queries cache only the latest value and accept neither history option.
 With no cached data, an empty accumulated stream resolves to `[]`. An empty
 append refetch preserves existing history; empty reset and replace refetches
 finish with `[]`. Empty live completion raises `EffectRpcQueryEmptyStreamError`.
-Emitted chunks are retained as supplied, unlike buffered query `undefined`
-normalization.
+Live queries normalize each emitted `undefined` to `null`, including an emission
+after a defined value. Live keys, selectors, and initial data use that normalized
+type. Accumulated chunks retain their original values, including `undefined`.
 
 On an initial fetch, both views become successful after the first emission. They
-keep fetching until completion. Canceling closes the iterator and interrupts its
-Effect resources. An awaited QueryClient call waits for stream completion. Observe
-the cache to consume intermediate values.
-
-## Server rendering and hydration
-
-Create a fresh QueryClient, client, and runtime for each server request.
-Share the generated options between loaders and components through
-router context. Keep key prefixes and inputs equivalent between server and
-browser. Keep server and browser resource ownership separate. Choose `staleTime` to
-avoid an immediate duplicate read during hydration.
-
-Keep successful query data compatible with the application's serializer. The
-package does not serialize Schema classes, dates, binary values, or error Causes.
-TanStack's default dehydration policy omits failed queries so the browser can
-refetch them. Preserve that policy unless the application defines its own safe
-error serialization contract.
-
-For an open RPC stream, observe the first successful cache snapshot, cancel the
-query, and then dehydrate. Awaiting stream completion can stall SSR indefinitely.
-Register cleanup for request completion and abort; cancel queries before runtime
-disposal. Keep browser resources alive for the application's lifetime.
+keep fetching until completion. Ordinary-query cancellation closes the iterator
+and interrupts its Effect resources. Native cancellation can settle before local
+finalizers finish. Suspense hooks have the native cancellation limitation described
+in [frameworks and hosts](frameworks-and-hosts.md).
+An awaited QueryClient call waits for stream completion; hooks and observers see
+intermediate values. For SSR, read [hydration and SSR](hydration-and-ssr.md) and use
+`fetchStreamSnapshot` to capture and drain an open query.
+
+Bounds take effect after a new emission. An oversized seed remains until then.
+Each publication uses a new array and leaves earlier histories unchanged; arrays
+are not runtime-frozen, so treat cache values as immutable. A bound limits element
+count, not retained object size or bytes.
+
+Each consumed value contributes to cache writes. Native structural sharing does
+not suppress those writes or promise a renderer's update count. Choose a live
+query for complete current-state emissions and bounded history for recent events;
+the latest delta alone cannot reconstruct state. Set publication rate or sampling
+on the producer or an application-owned Stream transformation.
+
+## Trace stream consumption and cleanup
+
+Acquire an `Effect.makeSpanScoped` span when `Stream.unwrap` begins consumption.
+Provide that span as `Tracer.ParentSpan` for nested pull work, and update the captured
+span directly from emission instrumentation and `Stream.ensuring`. This keeps the
+span open through asynchronous local cleanup. Supply telemetry services through the
+ready client or its runner, and keep the runtime alive through iterator cleanup.
+A span or retry around the runner's iterable-creation Effect ends before consumption;
+it does not cover stream emissions or finalization.
+
+For a complete HTTP SSE client, Otlp layer, and drained snapshot example, use
+[the stream lifetime tracing recipe](https://ueberbrot.github.io/effect-api-query/guides/trace-streams/).
+Use the client's response transformation before response-mode wrapping to preserve
+decoded header wrappers. Applications own span attributes and disclosure policy.
 
 Sources: [builders](https://ueberbrot.github.io/effect-api-query/reference/generated-builders/),
-[TanStack Start integration](https://ueberbrot.github.io/effect-api-query/guides/tanstack-start/).
+[stream history](https://ueberbrot.github.io/effect-api-query/guides/choose-stream-history/).
diff --git a/skills/effect-api-query/references/rpc.md b/skills/effect-api-query/references/rpc.md
index aba2338..38fa9ff 100644
--- a/skills/effect-api-query/references/rpc.md
+++ b/skills/effect-api-query/references/rpc.md
@@ -88,11 +88,18 @@ Use the payload or a safe key prefix for any identity carried by these options.
 `streamBufferSize` controls the client's stream buffer; `maxChunks` controls the
 accumulated cache. Unary `discard` and stream `asQueue` controls are unavailable.
 
+Keep the native default stream buffer unless the application has tested another
+size with its transport. Effect 4.0.0's shared WebSocket receive loop can stall
+another request when cancellation meets an overflowing buffer of size one.
+`maxChunks` bounds cached history after emissions and does not resize that queue.
+
 ## Custom key encoders
 
 Configure `keyEncoders` by the original literal RPC tag, such as `'secrets.read'`.
 An encoder receives the normalized payload after constructor defaults. Provide
-one when payload encoding needs services or contains explicit redacted values.
+one when payload encoding needs services, contains explicit redacted values, or uses
+opaque encoding middleware. Runtime inspection treats middleware conservatively,
+including synchronous service-free middleware.
 
 Return a synchronous strict `JsonValue`: finite numbers, strings, booleans,
 null, dense arrays, and plain objects with defined JSON values. Default RPC
diff --git a/src/core/inference.ts b/src/core/inference.ts
new file mode 100644
index 0000000..deb8c89
--- /dev/null
+++ b/src/core/inference.ts
@@ -0,0 +1,77 @@
+import type { dataTagErrorSymbol, dataTagSymbol, SkipToken } from '@tanstack/query-core'
+
+export type QueryView = 'query' | 'infinite' | 'metadata' | 'live' | 'streamed'
+
+export type SupportedQueryView<Leaf> = {
+  [View in QueryView]: [Leaf] extends [Record<`${View}Key`, (...args: never[]) => unknown>]
+    ? [Leaf] extends [Record<`${View}Options`, (...args: never[]) => unknown>]
+      ? View
+      : never
+    : never
+}[QueryView]
+
+export type QueryViewKey<Leaf, View extends QueryView> =
+  Leaf extends Record<`${View}Key`, (...args: never[]) => infer Key> ? Key : never
+
+export type MutationResult<Leaf> = Leaf extends {
+  readonly mutationOptions: (...args: never[]) => infer Options
+}
+  ? Options
+  : never
+
+export type OptionsInput<Leaf> = Leaf extends {
+  readonly streamedOptions: (...args: infer Args) => unknown
+}
+  ? NonNullable<Args[0]> extends { readonly input: infer Input }
+    ? Exclude<Input, SkipToken>
+    : void
+  : Leaf extends { readonly queryKey: (...args: infer Args) => unknown }
+    ? Args extends []
+      ? void
+      : Args[0]
+    : never
+
+/** The RPC payload constructor input or decoded HTTP request accepted by a leaf. */
+export type InferInput<Leaf> = [MutationResult<Leaf>] extends [never]
+  ? OptionsInput<Leaf>
+  : MutationResult<Leaf> extends { readonly mutationFn: (input: infer Input) => unknown }
+    ? Input
+    : never
+
+/** The cached data for a supported view, before an observer's select projection. */
+export type InferQueryData<
+  Leaf,
+  View extends SupportedQueryView<Leaf> = Extract<'query', SupportedQueryView<Leaf>>,
+> = [QueryViewKey<Leaf, View>] extends [never]
+  ? never
+  : QueryViewKey<Leaf, View> extends { readonly [dataTagSymbol]: infer Data }
+    ? Data
+    : never
+
+/** The execution and package errors carried by a supported view's concrete key. */
+export type InferQueryError<
+  Leaf,
+  View extends SupportedQueryView<Leaf> = Extract<'query', SupportedQueryView<Leaf>>,
+> = [QueryViewKey<Leaf, View>] extends [never]
+  ? never
+  : QueryViewKey<Leaf, View> extends { readonly [dataTagErrorSymbol]: infer Error }
+    ? Error
+    : never
+
+/** The unmodified successful value returned by a buffered mutation. */
+export type InferMutationData<Leaf> = [MutationResult<Leaf>] extends [never]
+  ? never
+  : MutationResult<Leaf> extends {
+        readonly mutationFn: (...args: never[]) => Promise<infer Data>
+      }
+    ? Data
+    : never
+
+/** The execution error exposed by a buffered mutation. */
+export type InferMutationError<Leaf> = [MutationResult<Leaf>] extends [never]
+  ? never
+  : MutationResult<Leaf> extends {
+        readonly retry?: boolean | number | ((count: number, error: infer Error) => boolean)
+      }
+    ? Error
+    : never
diff --git a/src/core/operation.ts b/src/core/operation.ts
index affd70e..c9fc18f 100644
--- a/src/core/operation.ts
+++ b/src/core/operation.ts
@@ -11,7 +11,6 @@ export type OperationInput =
   | {
       readonly _tag: 'Input'
       readonly requiresEncoder: boolean
-      /** Prepares page requests without deriving another cache identity. */
       readonly pageInput: (input: unknown) => unknown
       readonly prepare: (
         input: unknown,
@@ -23,7 +22,7 @@ export type OperationInput =
 export interface OperationIdentity {
   readonly id: string
   readonly path: readonly string[]
-  /** Removes adapter-owned fields from the fresh options copy. */
+  readonly unsupportedQueryHash: (option: 'queryKeyHashFn' | 'queryHash') => Error
   readonly takeOptions: (options: Record<string, unknown>) => unknown
 }
 
@@ -35,22 +34,31 @@ export interface BufferedOperation extends OperationIdentity {
 export interface UnaryOperation extends BufferedOperation {
   readonly kind: 'Unary'
   readonly input: OperationInput
+  readonly metadata?: {
+    readonly invoke: BufferedOperation['invoke']
+    readonly executionError: (operation: 'metadata', cause: Cause.Cause<unknown>) => Error
+    readonly finalizeData: (data: unknown) => unknown
+  }
 }
 
 export interface MutationOperation extends BufferedOperation {
   readonly kind: 'Mutation'
 }
 
+export interface QueryPreparation {
+  readonly identity: readonly JsonValue[]
+  readonly makeQuery: (input: unknown) => QueryFunction
+}
+
 export interface StreamingOperation extends OperationIdentity {
   readonly kind: 'Streaming'
   readonly input: OperationInput
-  /** Consumes and validates stream policy, including for skipped requests. */
   readonly prepareStream: (
     options: Record<string, unknown>,
     operation: 'live' | 'streamed',
     runner: RunPromiseExit<unknown>,
     requestOptions: unknown,
-  ) => (input: unknown) => QueryFunction
+  ) => QueryPreparation
 }
 
 export type OperationDescription = UnaryOperation | MutationOperation | StreamingOperation
diff --git a/src/core/policy.ts b/src/core/policy.ts
new file mode 100644
index 0000000..ee67497
--- /dev/null
+++ b/src/core/policy.ts
@@ -0,0 +1,96 @@
+import type {
+  InfiniteData,
+  MutationObserverOptions,
+  QueryKey,
+  QueryObserverOptions,
+} from '@tanstack/query-core'
+
+import type {
+  InferInput,
+  InferMutationData,
+  InferMutationError,
+  InferQueryData,
+  InferQueryError,
+  QueryView,
+  QueryViewKey,
+  SupportedQueryView,
+} from './inference'
+import type { ExactBuilderOptions, OwnedMutationOption, OwnedQueryOption } from './types'
+
+export type LocalQueryOption =
+  | OwnedQueryOption
+  | 'select'
+  | 'initialData'
+  | 'initialDataUpdatedAt'
+  | 'placeholderData'
+  | 'initialPageParam'
+  | 'getNextPageParam'
+  | 'getPreviousPageParam'
+  | 'maxPages'
+
+export type QueryPageData<Data, View extends QueryView> = View extends 'infinite'
+  ? Data extends InfiniteData<infer Page>
+    ? Page
+    : never
+  : Data
+
+export type QueryPageParam<Data, View extends QueryView> = View extends 'infinite'
+  ? Data extends InfiniteData<unknown, infer PageParam>
+    ? PageParam
+    : never
+  : never
+
+export type NativeQueryPolicy<Leaf, View extends SupportedQueryView<Leaf>> = QueryObserverOptions<
+  QueryPageData<InferQueryData<Leaf, View>, View>,
+  InferQueryError<Leaf, View>,
+  InferQueryData<Leaf, View>,
+  InferQueryData<Leaf, View>,
+  Extract<QueryViewKey<Leaf, View>, QueryKey>,
+  QueryPageParam<InferQueryData<Leaf, View>, View>
+>
+
+/** Reusable cache and observer policies; inputs, projections and identity remain local. */
+export type QueryPolicy<
+  Leaf,
+  View extends SupportedQueryView<Leaf> = Extract<'query', SupportedQueryView<Leaf>>,
+> = Omit<NativeQueryPolicy<Leaf, View>, LocalQueryOption>
+
+/** Reusable mutation callbacks receive typed data and variables and an unknown local context. */
+export type MutationPolicy<Leaf> = Omit<
+  MutationObserverOptions<InferMutationData<Leaf>, InferMutationError<Leaf>, InferInput<Leaf>>,
+  OwnedMutationOption | 'onMutate'
+>
+
+export type ViewBuilder<Leaf, View extends QueryView> = Leaf[Extract<`${View}Options`, keyof Leaf>]
+export interface MutationLeaf {
+  readonly mutationOptions: (...args: never[]) => unknown
+}
+
+// oxlint-disable-next-line typescript/no-unnecessary-type-parameters
+const bindPolicy = <Builder, Policy extends object>(builder: Builder, policy: Policy): Builder => {
+  // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+  const build = builder as (options: Policy) => unknown
+  // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+  return ((options?: Policy) => build({ ...policy, ...options })) as Builder
+}
+
+/** Binds typed defaults to a query builder. Call-site options replace matching defaults. */
+export const withQueryPolicy = <
+  Leaf,
+  View extends SupportedQueryView<Leaf>,
+  Supplied extends object,
+>(
+  leaf: Leaf,
+  view: View,
+  policy: ExactBuilderOptions<QueryPolicy<NoInfer<Leaf>, NoInfer<View>>, Supplied>,
+): ViewBuilder<Leaf, View> => {
+  // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+  const builder = leaf[`${view}Options` as Extract<`${View}Options`, keyof Leaf>]
+  return bindPolicy(builder, policy)
+}
+
+/** Binds typed defaults to a mutation builder. Call-site callbacks replace defaults. */
+export const withMutationPolicy = <Leaf extends MutationLeaf, Supplied extends object>(
+  leaf: Leaf,
+  policy: ExactBuilderOptions<MutationPolicy<NoInfer<Leaf>>, Supplied>,
+): Leaf['mutationOptions'] => bindPolicy(leaf.mutationOptions, policy)
diff --git a/src/core/schema-key.ts b/src/core/schema-key.ts
index 94487d1..d5683ad 100644
--- a/src/core/schema-key.ts
+++ b/src/core/schema-key.ts
@@ -5,10 +5,10 @@ export interface SchemaKeyEncoding {
   readonly encode: (input: unknown) => unknown
 }
 
-// Runtime Schema metadata erases encoding service types. Conservatively require a
-// custom encoder for encoding-side middleware; decoding-only middleware uses identity.
-const containsUnsafeKeyEncoding = (value: unknown, seen = new WeakSet()): boolean => {
-  if (!Predicate.isObjectOrArray(value) || seen.has(value)) {
+const safeAsts = new WeakSet()
+
+const containsUnsafeKeyEncoding = (value: unknown, seen: Set<object>): boolean => {
+  if (!Predicate.isObjectOrArray(value) || seen.has(value) || safeAsts.has(value)) {
     return false
   }
   seen.add(value)
@@ -43,23 +43,29 @@ const containsUnsafeKeyEncoding = (value: unknown, seen = new WeakSet()): boolea
   )
 }
 
-/** Keeps unsafe encoding inspection and default synchronous encoding together. */
 export const createSchemaKeyEncoding = (schema: Schema.Top): SchemaKeyEncoding => {
   let requiresEncoder: boolean | undefined
   let defaultEncode: SchemaKeyEncoding['encode'] | undefined
 
   return {
     get requiresEncoder() {
-      requiresEncoder ??= containsUnsafeKeyEncoding(schema.ast)
+      if (requiresEncoder === undefined) {
+        const seen = new Set<object>()
+        requiresEncoder = containsUnsafeKeyEncoding(schema.ast, seen)
+        if (!requiresEncoder) {
+          for (const node of seen) {
+            if (SchemaAST.isAST(node)) {
+              safeAsts.add(node)
+            }
+          }
+        }
+      }
       return requiresEncoder
     },
     encode: (input) => {
       if (defaultEncode === undefined) {
-        // SAFETY: Callers require a custom encoder for unsafe Schema encoding;
-        // the default path can encode synchronously without remaining services.
         // oxlint-disable-next-line typescript/no-unsafe-type-assertion, anti-slop/no-chained-type-assertions
         const encodingSchema = schema as unknown as Schema.ConstraintEncoder<unknown>
-        // Parser creation stays inside the caller's key-generation error handling.
         defaultEncode = Schema.encodeUnknownSync(encodingSchema)
       }
       return defaultEncode(input)
diff --git a/src/core/stream-snapshot.ts b/src/core/stream-snapshot.ts
new file mode 100644
index 0000000..c5d9e9c
--- /dev/null
+++ b/src/core/stream-snapshot.ts
@@ -0,0 +1,146 @@
+import { CancelledError } from '@tanstack/query-core'
+import type {
+  DefaultError,
+  QueryClient,
+  QueryExecuteOptions,
+  QueryFunction,
+  QueryKey,
+} from '@tanstack/query-core'
+import { Predicate } from 'effect'
+
+export interface StreamSnapshotOptions {
+  readonly mode?: 'fresh' | 'cached'
+  readonly signal?: AbortSignal
+  readonly timeoutMs?: number
+}
+
+const validateSnapshotControls = (
+  options: Pick<QueryExecuteOptions, 'queryHash' | 'queryKeyHashFn'>,
+  timeoutMs: number,
+): void => {
+  if (Object.hasOwn(options, 'queryHash') || Object.hasOwn(options, 'queryKeyHashFn')) {
+    throw new TypeError('Stream snapshots inherit hashing from QueryClient defaults')
+  }
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > 2_147_483_647) {
+    throw new RangeError('timeoutMs must be positive and at most 2147483647')
+  }
+}
+
+export const fetchStreamSnapshot = async <
+  TQueryFnData,
+  TError = DefaultError,
+  TData = TQueryFnData,
+  TQueryKey extends QueryKey = QueryKey,
+>(
+  queryClient: QueryClient,
+  options: QueryExecuteOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey> & {
+    readonly queryFn: QueryFunction<TQueryFnData, TQueryKey>
+    readonly queryHash?: never
+    readonly queryKeyHashFn?: never
+  },
+  { mode = 'fresh', signal, timeoutMs = 10_000 }: StreamSnapshotOptions = {},
+): Promise<TData> => {
+  signal?.throwIfAborted()
+  validateSnapshotControls(options, timeoutMs)
+  if (!Predicate.isFunction(options.queryFn)) {
+    throw new TypeError('Stream snapshots require a callable query function')
+  }
+  const cache = queryClient.getQueryCache()
+  const { queryHash } = queryClient.defaultQueryOptions(options)
+  const existing = cache.get(queryHash)
+  if (mode === 'cached' && existing?.state.status === 'success') {
+    return await queryClient.query({ ...options, queryHash, staleTime: 'static' })
+  }
+  if (
+    existing !== undefined &&
+    (existing.state.fetchStatus !== 'idle' || existing.getObserversCount() > 0)
+  ) {
+    throw new Error('Stream snapshots require an idle query without observers')
+  }
+  let published = false
+  let started = false
+  let executionSignal: AbortSignal | undefined
+  let failed = false
+  let failure: unknown
+  let cleanup = Promise.resolve()
+  let cancellation: Promise<void> | undefined
+  const cancel = async () => {
+    cancellation ??= queryClient.cancelQueries({
+      predicate: (query) => query.queryHash === queryHash,
+    })
+    await cancellation
+  }
+  let ready!: () => void
+  let rejectPublication!: (reason: AbortSignal['reason']) => void
+  const publication = new Promise<void>((resolve, reject) => {
+    ready = resolve
+    rejectPublication = reject
+  })
+  const stop = cache.subscribe((event) => {
+    if (
+      event.query.queryHash === queryHash &&
+      event.type === 'updated' &&
+      event.action.type === 'success' &&
+      event.action.manual === true
+    ) {
+      published = true
+      ready()
+      void cancel()
+    }
+  })
+  const onAbort = () => {
+    rejectPublication(signal?.reason)
+  }
+  signal?.addEventListener('abort', onAbort, { once: true })
+  const timer = setTimeout(() => {
+    rejectPublication(new DOMException('Stream snapshot timed out', 'TimeoutError'))
+  }, timeoutMs)
+  let result: TData
+  try {
+    void queryClient.invalidateQueries({
+      predicate: (query) => query.queryHash === queryHash,
+      refetchType: 'none',
+    })
+    signal?.throwIfAborted()
+    const fetching = queryClient.query({
+      ...options,
+      queryHash,
+      staleTime: 0,
+      initialDataUpdatedAt: 0,
+      queryFn: async (context) => {
+        started = true
+        failed = false
+        failure = undefined
+        executionSignal = context.signal
+        let finished!: () => void
+        cleanup = new Promise<void>((resolve) => {
+          finished = resolve
+        })
+        try {
+          return await options.queryFn(context)
+        } catch (error) {
+          failed = true
+          failure = error
+          throw error
+        } finally {
+          finished()
+        }
+      },
+    })
+    await Promise.race([publication, fetching])
+    result = await fetching
+    if (!published && (!started || executionSignal?.aborted === true)) {
+      throw new CancelledError({ revert: true })
+    }
+  } finally {
+    stop()
+    clearTimeout(timer)
+    signal?.removeEventListener('abort', onAbort)
+    await cancel()
+    await cleanup
+  }
+  if (failed) {
+    throw failure
+  }
+  return result
+}
diff --git a/src/core/streamed-query.ts b/src/core/streamed-query.ts
new file mode 100644
index 0000000..bf737ff
--- /dev/null
+++ b/src/core/streamed-query.ts
@@ -0,0 +1,217 @@
+import { experimental_streamedQuery, hashKey } from '@tanstack/query-core'
+import type { QueryFunctionContext } from '@tanstack/query-core'
+import { Exit, Predicate, Stream } from 'effect'
+import type { Cause } from 'effect'
+
+import type { RunPromiseExit, StreamRefetchMode } from './types'
+
+export type StreamQueryPolicy =
+  | {
+      readonly maxChunks: number | undefined
+      readonly _tag: 'Accumulated'
+      readonly refetchMode: StreamRefetchMode
+    }
+  | { readonly _tag: 'Live' }
+
+export const prepareStreamPolicy = (
+  options: Record<string, unknown>,
+  operation: 'live' | 'streamed',
+  invalid: (code: 'InvalidMaxChunks' | 'InvalidRefetchMode', message: string) => Error,
+) => {
+  let policy: StreamQueryPolicy
+  if (operation === 'streamed') {
+    const { maxChunks, refetchMode = 'reset' } = options
+    if (
+      maxChunks !== undefined &&
+      (!Predicate.isNumber(maxChunks) || !Number.isSafeInteger(maxChunks) || maxChunks <= 0)
+    ) {
+      throw invalid('InvalidMaxChunks', 'maxChunks must be a positive safe integer')
+    }
+    if (refetchMode !== 'reset' && refetchMode !== 'append' && refetchMode !== 'replace') {
+      throw invalid('InvalidRefetchMode', 'refetchMode must be reset, append, or replace')
+    }
+    policy = { _tag: 'Accumulated', maxChunks, refetchMode }
+  } else {
+    policy = { _tag: 'Live' }
+  }
+  delete options['refetchMode']
+  delete options['maxChunks']
+  return {
+    policy,
+    history:
+      policy._tag === 'Live'
+        ? undefined
+        : { maxChunks: policy.maxChunks ?? null, refetchMode: policy.refetchMode },
+  }
+}
+
+export interface MakeStreamQueryOptions {
+  readonly policy: StreamQueryPolicy
+  readonly source: Stream.Stream<unknown, unknown, unknown>
+  readonly executionError: (cause: Cause.Cause<unknown>) => Error
+  readonly unsupportedHash: () => Error
+  readonly emptyError?: (() => Error) | undefined
+  readonly runPromiseExit: RunPromiseExit<unknown>
+}
+
+const streamQueryIterable = <A>(
+  source: AsyncIterable<A>,
+  signal: AbortSignal,
+  emptyError: (() => Error) | undefined,
+): AsyncIterable<A> => ({
+  [Symbol.asyncIterator]() {
+    const iterator = source[Symbol.asyncIterator]()
+    let closePromise: Promise<IteratorResult<A>> | undefined
+    let emitted = false
+    const detach = () => {
+      // oxlint-disable-next-line eslint/no-use-before-define
+      signal.removeEventListener('abort', onAbort)
+    }
+    const close = async () => {
+      closePromise ??= (async () => {
+        try {
+          return (await iterator.return?.()) ?? { done: true, value: undefined }
+        } finally {
+          detach()
+        }
+      })()
+      return closePromise
+    }
+    const onAbort = () => {
+      // oxlint-disable-next-line promise/prefer-await-to-then
+      void Promise.resolve().then(close).catch(detach)
+    }
+    signal.addEventListener('abort', onAbort, { once: true })
+
+    return {
+      async next() {
+        let result: IteratorResult<A>
+        if (signal.aborted) {
+          result = await close()
+        } else {
+          try {
+            result = await iterator.next()
+          } catch (error) {
+            detach()
+            throw error
+          }
+        }
+        if (result.done === true) {
+          detach()
+          if (!emitted && emptyError !== undefined) {
+            throw emptyError()
+          }
+        }
+        emitted = true
+        return result
+      },
+      return: close,
+      async throw(cause?: unknown) {
+        detach()
+        if (iterator.throw !== undefined) {
+          return await iterator.throw(cause)
+        }
+        await close()
+        throw cause
+      },
+    }
+  },
+})
+
+export const makeStreamQuery = ({
+  policy,
+  source,
+  executionError,
+  unsupportedHash,
+  emptyError,
+  runPromiseExit,
+}: MakeStreamQueryOptions) => {
+  const validateHash = ({ client, queryKey }: QueryFunctionContext) => {
+    const { queryHash, queryKeyHashFn } = client.defaultQueryOptions({ queryKey })
+    if (queryHash !== (queryKeyHashFn ?? hashKey)(queryKey)) {
+      throw unsupportedHash()
+    }
+    const cache = client.getQueryCache()
+    let currentFound = false
+    let nativeHash: string | undefined
+    for (const query of cache.getAll()) {
+      if (query.queryHash === queryHash) {
+        currentFound = true
+        continue
+      }
+      if (query.options.queryKeyHashFn === queryKeyHashFn) {
+        continue
+      }
+      if (currentFound) {
+        try {
+          nativeHash ??= hashKey(queryKey)
+          if (hashKey(query.queryKey) !== nativeHash) {
+            continue
+          }
+        } catch {
+          continue
+        }
+      }
+      if (query.queryHash === (query.options.queryKeyHashFn ?? hashKey)(queryKey)) {
+        throw unsupportedHash()
+      }
+    }
+    return cache.get(queryHash)
+  }
+  const streamFn = async ({ signal }: { readonly signal: AbortSignal }) => {
+    const stream = source.pipe(
+      Stream.catchCauseIf(
+        () => !signal.aborted,
+        (cause) => Stream.fail(executionError(cause)),
+      ),
+    )
+    // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
+    const exit = await runPromiseExit(Stream.toAsyncIterableEffect(stream), { signal })
+    if (Exit.isFailure(exit)) {
+      throw executionError(exit.cause)
+    }
+    return streamQueryIterable(exit.value, signal, policy._tag === 'Live' ? emptyError : undefined)
+  }
+
+  if (policy._tag === 'Live') {
+    const queryFn = experimental_streamedQuery({
+      initialValue: null,
+      reducer: (_latest: unknown, value: unknown) => (value === undefined ? null : value),
+      streamFn,
+    })
+    return async (context: QueryFunctionContext) => {
+      validateHash(context)
+      return await queryFn(context)
+    }
+  }
+
+  const { maxChunks, refetchMode } = policy
+  return async (context: QueryFunctionContext) => {
+    const query = validateHash(context)
+    const reset = refetchMode === 'reset' && query?.isFetched() === true
+    let emitted = false
+    const initialValue: unknown[] = []
+    const queryFn = experimental_streamedQuery({
+      initialValue,
+      reducer: (values: unknown[], value: unknown) => {
+        const history = reset && !emitted ? [] : values
+        emitted = true
+        if (maxChunks === undefined) {
+          return [...history, value]
+        }
+        const start = Math.max(0, history.length + 1 - maxChunks)
+        // oxlint-disable-next-line unicorn/no-new-array
+        const next = new Array<unknown>(history.length + 1 - start)
+        for (let index = start; index < history.length; index += 1) {
+          next[index - start] = history[index]
+        }
+        next[next.length - 1] = value
+        return next
+      },
+      refetchMode,
+      streamFn,
+    })
+    const result = await queryFn(context)
+    return reset && !emitted ? [] : result
+  }
+}
diff --git a/src/core/types.ts b/src/core/types.ts
index bc4206a..80a6e9c 100644
--- a/src/core/types.ts
+++ b/src/core/types.ts
@@ -7,24 +7,16 @@ import type {
   NonUndefinedGuard,
   QueryFunction,
   QueryKey,
-  QueryKeyHashFunction,
   QueryObserverOptions,
   SkipToken,
 } from '@tanstack/query-core'
 import type { Effect, Exit, Redacted } from 'effect'
 
-/** A JSON scalar accepted in key prefixes and canonical key payloads. */
 export type JsonPrimitive = boolean | null | number | string
 
 /** An immutable JSON value accepted in cache keys. */
 export type JsonValue = JsonPrimitive | { readonly [key: string]: JsonValue } | readonly JsonValue[]
 
-/**
- * The value cached for a successful buffered query.
- *
- * TanStack rejects `undefined` query data, so possible `undefined` values become
- * `null`. Mutation results keep the success type unchanged.
- */
 export type QueryData<A> = undefined extends A ? Exclude<A, undefined | void> | null : A
 
 /** Runs an Effect and returns its Exit, optionally forwarding an abort signal. */
@@ -33,15 +25,51 @@ export type RunPromiseExit<R = never> = <A, E>(
   options?: { readonly signal?: AbortSignal },
 ) => Promise<Exit.Exit<A, E>>
 
+/** Requires encoders only when eligible requests need an override. */
+export type KeyEncoderRequirement<Eligible, Required, Encoders> = [Eligible] extends [never]
+  ? { readonly keyEncoders?: never }
+  : [Required] extends [never]
+    ? {
+        /** Overrides synchronous semantic encoding for selected requests. */
+        readonly keyEncoders?: Encoders
+      }
+    : {
+        /** Supplies safe synchronous cache identity for requests requiring an encoder. */
+        readonly keyEncoders: Encoders
+      }
+
+/** Requires a custom runner when client-side Schema services remain. */
+export type RunnerRequirement<Services> = [Services] extends [never]
+  ? {
+      /** Overrides service-free execution; defaults to `Effect.runPromiseExit`. */
+      readonly runPromiseExit?: RunPromiseExit
+    }
+  : {
+      /** Runs Effects that retain client-side Schema services. */
+      readonly runPromiseExit: RunPromiseExit<Services>
+    }
+
+/** Uses the adapter's inputless proof to determine key-builder arguments. */
+export type KeyBuilder<Input, Key, Inputless extends boolean> = [Inputless] extends [true]
+  ? () => Key
+  : (input: Input) => Key
+
 export type OwnedQueryOption = 'queryFn' | 'queryKey' | 'queryKeyHashFn' | 'queryHash'
 export type OwnedMutationOption = 'mutationFn' | 'mutationKey'
 
-/** Retains the initial-data guarantee through a generated options overload. */
+export type StreamRefetchMode = 'append' | 'replace' | 'reset'
+
+export type StreamedPolicyOptions = {
+  /** Controls whether a refetch clears, appends to, or replaces accumulated data. */
+  readonly refetchMode?: StreamRefetchMode | undefined
+  /** Retains at most this many newest elements; must be a positive safe integer. */
+  readonly maxChunks?: number | undefined
+}
+
 export type WithDefinedInitialData<Options, Data> = Omit<Options, 'initialData'> & {
   readonly initialData: NonUndefinedGuard<Data> | (() => NonUndefinedGuard<Data>)
 }
 
-/** Keeps initialData optional in the non-defined overload. */
 export type WithUndefinedInitialData<Options, Data> = Omit<Options, 'initialData'> & {
   readonly initialData?:
     | undefined
@@ -49,7 +77,6 @@ export type WithUndefinedInitialData<Options, Data> = Omit<Options, 'initialData
     | NonUndefinedGuard<Data>
 }
 
-/** Shared Query Core fields plus the adapter's request-local options. */
 export type QueryInput<
   Data,
   Error,
@@ -63,11 +90,10 @@ export type QueryOptions<
   Error,
   Selected,
   Key extends QueryKey,
-  Fn = QueryFunction<Data, Key>,
+  Fn = QueryFunction<Data>,
 > = QueryInput<Data, Error, Selected, Key> & {
   readonly queryFn: Fn
   readonly queryKey: Key
-  readonly queryKeyHashFn: QueryKeyHashFunction<Key>
 }
 
 export type ConditionalQueryOptions<Data, Error, Selected, Key extends QueryKey> = QueryOptions<
@@ -75,10 +101,119 @@ export type ConditionalQueryOptions<Data, Error, Selected, Key extends QueryKey>
   Error,
   Selected,
   Key,
-  QueryFunction<Data, Key> | SkipToken
+  QueryFunction<Data> | SkipToken
 >
 
-/** Owns unary query inference; adapters supply their request, data, error, and key types. */
+export type InputQueryOptions<
+  Input,
+  Data,
+  Error,
+  Selected,
+  Key extends QueryKey,
+  SkippedKey extends QueryKey,
+> = unknown extends Input
+  ? ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>
+  : [Input] extends [SkipToken]
+    ? QueryOptions<Data, Error, Selected, SkippedKey, SkipToken>
+    : SkipToken extends Input
+      ? ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>
+      : QueryOptions<Data, Error, Selected, Key>
+
+export type ExactBuilderOptions<Expected, Supplied> = Expected &
+  Supplied & {
+    readonly [
+      Key in Exclude<keyof Supplied, keyof Expected | typeof uninferredBuilderOptions>
+    ]: string extends Key ? Supplied[Key] : number extends Key ? Supplied[Key] : never
+  }
+
+export type SuppliedInitialData<Supplied> = 'initialData' extends keyof Supplied
+  ? undefined extends Supplied['initialData']
+    ? Omit<Supplied, 'initialData'> & {
+        readonly initialData?: Exclude<Supplied['initialData'], undefined>
+      }
+    : Supplied
+  : Supplied
+
+declare const uninferredBuilderOptions: unique symbol
+export type UninferredBuilderOptions = { readonly [uninferredBuilderOptions]?: never }
+
+export type SuppliedQueryOptions<Options, Supplied, AdapterOptions> =
+  typeof uninferredBuilderOptions extends keyof Supplied
+    ? Options
+    : Pick<
+        Options,
+        Extract<
+          keyof Options,
+          | 'queryFn'
+          | 'queryKey'
+          | 'select'
+          | 'retry'
+          | 'retryDelay'
+          | 'initialPageParam'
+          | 'getNextPageParam'
+        >
+      > &
+        Omit<SuppliedInitialData<Supplied>, 'input' | keyof AdapterOptions>
+
+export type InputQueryBuilder<
+  Input,
+  Data,
+  Error,
+  Key extends QueryKey,
+  SkippedKey extends QueryKey,
+  AdapterOptions,
+> = {
+  <
+    Selected = Data,
+    ActualInput extends Input = Input,
+    Supplied extends object = UninferredBuilderOptions,
+  >(
+    options: ExactBuilderOptions<
+      WithDefinedInitialData<
+        QueryInput<
+          Data,
+          Error,
+          Selected,
+          InputQueryOptions<ActualInput, Data, Error, Selected, Key, SkippedKey>['queryKey'],
+          AdapterOptions
+        >,
+        Data
+      > & { readonly input: ActualInput },
+      Supplied
+    >,
+  ): WithDefinedInitialData<
+    SuppliedQueryOptions<
+      InputQueryOptions<ActualInput, Data, Error, Selected, Key, SkippedKey>,
+      Supplied,
+      AdapterOptions
+    >,
+    Data
+  >
+  <
+    Selected = Data,
+    ActualInput extends Input = Input,
+    Supplied extends object = UninferredBuilderOptions,
+  >(
+    options: ExactBuilderOptions<
+      WithUndefinedInitialData<
+        QueryInput<
+          Data,
+          Error,
+          Selected,
+          InputQueryOptions<ActualInput, Data, Error, Selected, Key, SkippedKey>['queryKey'],
+          AdapterOptions
+        >,
+        Data
+      > & { readonly input: ActualInput },
+      Supplied
+    >,
+  ): SuppliedQueryOptions<
+    InputQueryOptions<ActualInput, Data, Error, Selected, Key, SkippedKey>,
+    Supplied,
+    AdapterOptions
+  >
+}
+
 export type UnaryQueryBuilder<
   Input,
   Data,
@@ -86,67 +221,72 @@ export type UnaryQueryBuilder<
   Key extends QueryKey,
   SkippedKey extends QueryKey,
   AdapterOptions = unknown,
-> = void extends Input
+  Inputless extends boolean = void extends Input ? true : false,
+> = Inputless extends true
   ? {
       <Selected = Data>(
-        options: WithDefinedInitialData<
-          QueryInput<Data, Error, Selected, Key, AdapterOptions>,
-          Data
-        >,
-      ): WithDefinedInitialData<QueryOptions<Data, Error, Selected, Key>, Data>
-      <Selected = Data>(
-        options?: WithUndefinedInitialData<
-          QueryInput<Data, Error, Selected, Key, AdapterOptions>,
-          Data
+        options?: undefined,
+      ): SuppliedQueryOptions<
+        QueryOptions<Data, Error, Selected, Key>,
+        Record<never, never>,
+        AdapterOptions
+      >
+      <Selected = Data, Supplied extends object = UninferredBuilderOptions>(
+        options: ExactBuilderOptions<
+          WithDefinedInitialData<QueryInput<Data, Error, Selected, Key, AdapterOptions>, Data>,
+          Supplied
         >,
-      ): QueryOptions<Data, Error, Selected, Key>
-    }
-  : {
-      <Selected = Data>(
-        options: WithDefinedInitialData<
-          QueryInput<Data, Error, Selected, Key, AdapterOptions>,
-          Data
-        > & { readonly input: Input },
-      ): WithDefinedInitialData<QueryOptions<Data, Error, Selected, Key>, Data>
-      <Selected = Data>(
-        options: WithUndefinedInitialData<
-          QueryInput<Data, Error, Selected, Key, AdapterOptions>,
-          Data
-        > & { readonly input: Input },
-      ): QueryOptions<Data, Error, Selected, Key>
-      <Selected = Data>(
-        options: WithDefinedInitialData<
-          Omit<QueryOptions<Data, Error, Selected, SkippedKey, SkipToken>, OwnedQueryOption>,
-          Data
-        > &
-          AdapterOptions & { readonly input: SkipToken },
-      ): WithDefinedInitialData<QueryOptions<Data, Error, Selected, SkippedKey, SkipToken>, Data>
-      <Selected = Data>(
-        options: WithUndefinedInitialData<
-          Omit<QueryOptions<Data, Error, Selected, SkippedKey, SkipToken>, OwnedQueryOption>,
-          Data
-        > &
-          AdapterOptions & { readonly input: SkipToken },
-      ): QueryOptions<Data, Error, Selected, SkippedKey, SkipToken>
-      <Selected = Data>(
-        options: WithDefinedInitialData<
-          Omit<ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>, OwnedQueryOption>,
-          Data
-        > &
-          AdapterOptions & { readonly input: Input | SkipToken },
       ): WithDefinedInitialData<
-        ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>,
+        SuppliedQueryOptions<QueryOptions<Data, Error, Selected, Key>, Supplied, AdapterOptions>,
         Data
       >
-      <Selected = Data>(
-        options: WithUndefinedInitialData<
-          Omit<ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>, OwnedQueryOption>,
-          Data
-        > &
-          AdapterOptions & { readonly input: Input | SkipToken },
-      ): ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>
-      (token: SkipToken): QueryOptions<Data, Error, Data, SkippedKey, SkipToken>
+      <Selected = Data, Supplied extends object = UninferredBuilderOptions>(
+        options?: ExactBuilderOptions<
+          WithUndefinedInitialData<QueryInput<Data, Error, Selected, Key, AdapterOptions>, Data>,
+          Supplied
+        >,
+      ): SuppliedQueryOptions<QueryOptions<Data, Error, Selected, Key>, Supplied, AdapterOptions>
     }
+  : InputQueryBuilder<SkipToken, Data, Error, Key, SkippedKey, AdapterOptions> &
+      InputQueryBuilder<Input, Data, Error, Key, SkippedKey, AdapterOptions> & {
+        <Selected = Data, Supplied extends object = UninferredBuilderOptions>(
+          options: ExactBuilderOptions<
+            WithDefinedInitialData<
+              Omit<
+                ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>,
+                OwnedQueryOption
+              >,
+              Data
+            > &
+              AdapterOptions & { readonly input: Input | SkipToken },
+            Supplied
+          >,
+        ): WithDefinedInitialData<
+          SuppliedQueryOptions<
+            ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>,
+            Supplied,
+            AdapterOptions
+          >,
+          Data
+        >
+        <Selected = Data, Supplied extends object = UninferredBuilderOptions>(
+          options: ExactBuilderOptions<
+            WithUndefinedInitialData<
+              Omit<
+                ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>,
+                OwnedQueryOption
+              >,
+              Data
+            > &
+              AdapterOptions & { readonly input: Input | SkipToken },
+            Supplied
+          >,
+        ): SuppliedQueryOptions<
+          ConditionalQueryOptions<Data, Error, Selected, Key | SkippedKey>,
+          Supplied,
+          AdapterOptions
+        >
+      }
 
 export type InfiniteInput<
   Data,
@@ -164,22 +304,21 @@ export type InfiniteOptions<
   Selected,
   Key extends QueryKey,
   PageParam,
-  Fn = QueryFunction<Data, Key, PageParam>,
+  Fn = QueryFunction<Data, QueryKey, PageParam>,
 > = InfiniteInput<Data, Error, Selected, Key, PageParam> & {
   readonly queryFn: Fn
   readonly queryKey: Key
-  readonly queryKeyHashFn: QueryKeyHashFunction<Key>
 }
 
-/** Tags concrete infinite keys with their cached pages and inferred page parameter. */
 export type InfiniteQueryKey<
   Input,
   Data,
   Error,
   OperationKey extends readonly JsonValue[],
   PageParam = unknown,
+  Inputless extends boolean = void extends Input ? true : false,
 > = DataTag<
-  void extends Input ? OperationKey : readonly [...OperationKey, JsonValue],
+  Inputless extends true ? OperationKey : readonly [...OperationKey, JsonValue],
   InfiniteData<Data, PageParam>,
   Error
 >
@@ -192,15 +331,16 @@ export type MappedInfiniteInput<
   Selected,
   PageParam,
   AdapterOptions,
+  Inputless extends boolean,
 > = InfiniteInput<
   Data,
   Error,
   Selected,
-  InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam>,
+  InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless>,
   PageParam,
   AdapterOptions
 > &
-  (void extends Input ? unknown : { readonly input: (pageParam: PageParam) => Input })
+  (Inputless extends true ? unknown : { readonly input: (pageParam: PageParam) => Input })
 
 export type ConditionalInfiniteOptions<
   Data,
@@ -214,102 +354,188 @@ export type ConditionalInfiniteOptions<
   Selected,
   Key,
   PageParam,
-  QueryFunction<Data, Key, PageParam> | SkipToken
+  QueryFunction<Data, QueryKey, PageParam> | SkipToken
 >
 
-/** Owns infinite-query inference while adapters supply request, data, error, and operation keys. */
 export type InfiniteQueryBuilder<
   Input,
   Data,
   Error,
   OperationKey extends readonly JsonValue[],
   AdapterOptions = unknown,
+  Inputless extends boolean = void extends Input ? true : false,
 > = {
-  <PageParam, Selected = InfiniteData<Data, PageParam>>(
-    options: WithDefinedInitialData<
-      MappedInfiniteInput<Input, Data, Error, OperationKey, Selected, PageParam, AdapterOptions>,
-      InfiniteData<Data, PageParam>
+  <
+    PageParam,
+    Selected = InfiniteData<Data, PageParam>,
+    Supplied extends object = UninferredBuilderOptions,
+  >(
+    options: ExactBuilderOptions<
+      WithDefinedInitialData<
+        MappedInfiniteInput<
+          Input,
+          Data,
+          Error,
+          OperationKey,
+          Selected,
+          PageParam,
+          AdapterOptions,
+          Inputless
+        >,
+        InfiniteData<Data, PageParam>
+      >,
+      Supplied
     >,
   ): WithDefinedInitialData<
+    SuppliedQueryOptions<
+      InfiniteOptions<
+        Data,
+        Error,
+        Selected,
+        InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless>,
+        PageParam
+      >,
+      Supplied,
+      AdapterOptions
+    >,
+    InfiniteData<Data, PageParam>
+  >
+  <
+    PageParam,
+    Selected = InfiniteData<Data, PageParam>,
+    Supplied extends object = UninferredBuilderOptions,
+  >(
+    options: ExactBuilderOptions<
+      WithUndefinedInitialData<
+        MappedInfiniteInput<
+          Input,
+          Data,
+          Error,
+          OperationKey,
+          Selected,
+          PageParam,
+          AdapterOptions,
+          Inputless
+        >,
+        InfiniteData<Data, PageParam>
+      >,
+      Supplied
+    >,
+  ): SuppliedQueryOptions<
     InfiniteOptions<
       Data,
       Error,
       Selected,
-      InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam>,
+      InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless>,
       PageParam
     >,
-    InfiniteData<Data, PageParam>
-  >
-  <PageParam, Selected = InfiniteData<Data, PageParam>>(
-    options: WithUndefinedInitialData<
-      MappedInfiniteInput<Input, Data, Error, OperationKey, Selected, PageParam, AdapterOptions>,
-      InfiniteData<Data, PageParam>
-    >,
-  ): InfiniteOptions<
-    Data,
-    Error,
-    Selected,
-    InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam>,
-    PageParam
+    Supplied,
+    AdapterOptions
   >
-} & (void extends Input
+} & (Inputless extends true
   ? unknown
   : {
-      <PageParam, Selected = InfiniteData<Data, PageParam>>(
-        options: WithDefinedInitialData<
-          InfiniteInput<Data, Error, Selected, OperationKey, PageParam, AdapterOptions>,
-          InfiniteData<Data, PageParam>
-        > & { readonly input: SkipToken },
+      <
+        PageParam,
+        Selected = InfiniteData<Data, PageParam>,
+        Supplied extends object = UninferredBuilderOptions,
+      >(
+        options: ExactBuilderOptions<
+          WithDefinedInitialData<
+            InfiniteInput<Data, Error, Selected, OperationKey, PageParam, AdapterOptions>,
+            InfiniteData<Data, PageParam>
+          > & { readonly input: SkipToken },
+          Supplied
+        >,
       ): WithDefinedInitialData<
-        InfiniteOptions<Data, Error, Selected, OperationKey, PageParam, SkipToken>,
+        SuppliedQueryOptions<
+          InfiniteOptions<Data, Error, Selected, OperationKey, PageParam, SkipToken>,
+          Supplied,
+          AdapterOptions
+        >,
         InfiniteData<Data, PageParam>
       >
-      <PageParam, Selected = InfiniteData<Data, PageParam>>(
-        options: WithUndefinedInitialData<
-          InfiniteInput<Data, Error, Selected, OperationKey, PageParam, AdapterOptions>,
-          InfiniteData<Data, PageParam>
-        > & { readonly input: SkipToken },
-      ): InfiniteOptions<Data, Error, Selected, OperationKey, PageParam, SkipToken>
-      <PageParam, Selected = InfiniteData<Data, PageParam>>(
-        options: WithDefinedInitialData<
-          InfiniteInput<
+      <
+        PageParam,
+        Selected = InfiniteData<Data, PageParam>,
+        Supplied extends object = UninferredBuilderOptions,
+      >(
+        options: ExactBuilderOptions<
+          WithUndefinedInitialData<
+            InfiniteInput<Data, Error, Selected, OperationKey, PageParam, AdapterOptions>,
+            InfiniteData<Data, PageParam>
+          > & { readonly input: SkipToken },
+          Supplied
+        >,
+      ): SuppliedQueryOptions<
+        InfiniteOptions<Data, Error, Selected, OperationKey, PageParam, SkipToken>,
+        Supplied,
+        AdapterOptions
+      >
+      <
+        PageParam,
+        Selected = InfiniteData<Data, PageParam>,
+        Supplied extends object = UninferredBuilderOptions,
+      >(
+        options: ExactBuilderOptions<
+          WithDefinedInitialData<
+            InfiniteInput<
+              Data,
+              Error,
+              Selected,
+              | InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless>
+              | OperationKey,
+              PageParam,
+              AdapterOptions
+            >,
+            InfiniteData<Data, PageParam>
+          > & { readonly input: ((pageParam: PageParam) => Input) | SkipToken },
+          Supplied
+        >,
+      ): WithDefinedInitialData<
+        SuppliedQueryOptions<
+          ConditionalInfiniteOptions<
             Data,
             Error,
             Selected,
-            InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam> | OperationKey,
-            PageParam,
-            AdapterOptions
+            InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless> | OperationKey,
+            PageParam
           >,
-          InfiniteData<Data, PageParam>
-        > & { readonly input: ((pageParam: PageParam) => Input) | SkipToken },
-      ): WithDefinedInitialData<
+          Supplied,
+          AdapterOptions
+        >,
+        InfiniteData<Data, PageParam>
+      >
+      <
+        PageParam,
+        Selected = InfiniteData<Data, PageParam>,
+        Supplied extends object = UninferredBuilderOptions,
+      >(
+        options: ExactBuilderOptions<
+          WithUndefinedInitialData<
+            InfiniteInput<
+              Data,
+              Error,
+              Selected,
+              | InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless>
+              | OperationKey,
+              PageParam,
+              AdapterOptions
+            >,
+            InfiniteData<Data, PageParam>
+          > & { readonly input: ((pageParam: PageParam) => Input) | SkipToken },
+          Supplied
+        >,
+      ): SuppliedQueryOptions<
         ConditionalInfiniteOptions<
           Data,
           Error,
           Selected,
-          InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam> | OperationKey,
+          InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam, Inputless> | OperationKey,
           PageParam
         >,
-        InfiniteData<Data, PageParam>
-      >
-      <PageParam, Selected = InfiniteData<Data, PageParam>>(
-        options: WithUndefinedInitialData<
-          InfiniteInput<
-            Data,
-            Error,
-            Selected,
-            InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam> | OperationKey,
-            PageParam,
-            AdapterOptions
-          >,
-          InfiniteData<Data, PageParam>
-        > & { readonly input: ((pageParam: PageParam) => Input) | SkipToken },
-      ): ConditionalInfiniteOptions<
-        Data,
-        Error,
-        Selected,
-        InfiniteQueryKey<Input, Data, Error, OperationKey, PageParam> | OperationKey,
-        PageParam
+        Supplied,
+        AdapterOptions
       >
     })
 
@@ -321,7 +547,6 @@ export type MutationOptions<Data, Error, Input, Key extends QueryKey, OnMutateRe
   readonly mutationKey: Key
 }
 
-/** Owns mutation callback inference while adapters supply their request and execution types. */
 export type MutationBuilder<Data, Error, Input, Key extends QueryKey, AdapterOptions = unknown> = <
   OnMutateResult = unknown,
 >(
@@ -329,7 +554,6 @@ export type MutationBuilder<Data, Error, Input, Key extends QueryKey, AdapterOpt
     AdapterOptions,
 ) => MutationOptions<Data, Error, Input, Key, OnMutateResult>
 
-// Generic function comparison tests exact type identity, not a callable API.
 /* oxlint-disable typescript/no-unnecessary-type-parameters */
 export type HasSeenType<A, Seen> = Seen extends unknown
   ? (<T>() => T extends A ? 1 : 2) extends <T>() => T extends Seen ? 1 : 2
@@ -338,7 +562,6 @@ export type HasSeenType<A, Seen> = Seen extends unknown
   : never
 /* oxlint-enable typescript/no-unnecessary-type-parameters */
 
-/** Recursively detects explicit redacted values in a decoded value. */
 export type ContainsRedacted<A, Seen = never> =
   A extends Redacted.Redacted<unknown>
     ? true
diff --git a/src/core/utility-tree.ts b/src/core/utility-tree.ts
index 048663f..5571986 100644
--- a/src/core/utility-tree.ts
+++ b/src/core/utility-tree.ts
@@ -1,11 +1,12 @@
-import { skipToken } from '@tanstack/query-core'
-import type { QueryFunction, QueryKey } from '@tanstack/query-core'
+import { replaceEqualDeep, skipToken } from '@tanstack/query-core'
+import type { QueryFunctionContext } from '@tanstack/query-core'
 import { Effect, Exit, Predicate } from 'effect'
 import type { Cause } from 'effect'
 
 import type {
   BufferedOperation,
   OperationDescription,
+  QueryPreparation,
   RuntimeKeyEncoder,
   StreamingOperation,
   TreeErrors,
@@ -22,6 +23,8 @@ const reservedPathSegments = new Set([
   'key',
   'liveKey',
   'liveOptions',
+  'metadataKey',
+  'metadataOptions',
   'mutationKey',
   'mutationOptions',
   'prototype',
@@ -54,11 +57,9 @@ const canonicalizeArray = (value: unknown[], seen: WeakSet<object>): JsonValue =
     if (!Object.hasOwn(value, index)) {
       throw new TypeError('Key values must not contain sparse arrays')
     }
-    // canonicalize is initialized before any query tree is constructed.
     // oxlint-disable-next-line eslint/no-use-before-define
     copy.push(canonicalize(value[index], seen))
   }
-  // Shared references are valid JSON; only references on the active path form cycles.
   seen.delete(value)
   return Object.freeze(copy)
 }
@@ -74,7 +75,6 @@ const canonicalizeObject = (value: Record<string, unknown>, seen: WeakSet<object
     if (key === '__proto__' || key === 'constructor') {
       throw new TypeError('Key objects must not contain __proto__ or constructor properties')
     }
-    // Every enumerated member must remain JSON-safe, including getter side effects.
     // oxlint-disable-next-line eslint/no-use-before-define
     copy[key] = canonicalize(value[key], seen)
   }
@@ -82,7 +82,6 @@ const canonicalizeObject = (value: Record<string, unknown>, seen: WeakSet<object
   return Object.freeze(copy)
 }
 
-// Copying prevents caller mutation; sorting makes equivalent objects hash identically.
 const canonicalize = (value: unknown, seen = new WeakSet()): JsonValue => {
   if (value === null || Predicate.isString(value) || Predicate.isBoolean(value)) {
     return value
@@ -108,9 +107,7 @@ const canonicalize = (value: unknown, seen = new WeakSet()): JsonValue => {
   return canonicalizeObject(value, seen)
 }
 
-const freezeKey = (parts: readonly (JsonValue | string)[]) => Object.freeze([...parts])
-
-const hashCanonicalKey = (queryKey: QueryKey): string => JSON.stringify(queryKey)
+const freezeKey = (parts: JsonValue[]) => Object.freeze(parts)
 
 const normalizePrefix = (
   prefix: readonly [JsonValue, ...JsonValue[]],
@@ -121,8 +118,6 @@ const normalizePrefix = (
   }
 
   try {
-    // SAFETY: prefix is checked to be a nonempty array; canonicalize preserves arrays
-    // while validating and freezing every JSON value recursively.
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     return canonicalize(prefix) as readonly JsonValue[]
   } catch (error) {
@@ -130,7 +125,6 @@ const normalizePrefix = (
   }
 }
 
-// Validate the entire plan before allocating branches or preparing any request.
 const planPaths = (operations: readonly OperationDescription[], errors: TreeErrors) => {
   const branchPaths = new Map<string, readonly string[]>()
   const leafPaths = new Set<string>()
@@ -167,14 +161,13 @@ const planPaths = (operations: readonly OperationDescription[], errors: TreeErro
       }
     }
     leafPaths.add(pathKey)
-    // SAFETY: The empty path was rejected above before recording this plan.
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     plan.push({ operation, segments: segments as readonly [string, ...string[]] })
   }
   return plan
 }
 
-const execute = async <Operation extends UnaryQueryOperation>(
+const execute = async <Operation extends UnaryQueryOperation | 'metadata'>(
   description: {
     readonly invoke: UnaryOperation['invoke']
     readonly executionError: (operation: Operation, cause: Cause.Cause<unknown>) => Error
@@ -185,11 +178,8 @@ const execute = async <Operation extends UnaryQueryOperation>(
   requestOptions?: unknown,
   signal?: AbortSignal,
 ) => {
-  // The transport contract preserves arbitrary caller errors and Context services.
   // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
   const effect = description.invoke(input, requestOptions)
-  // Await outside the Exit branch so a runner rejection passes through untouched.
-  // The erased transport channels retain the caller's errors and service requirements.
   // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
   const exit = await runPromiseExit(effect, signal === undefined ? undefined : { signal })
 
@@ -197,30 +187,27 @@ const execute = async <Operation extends UnaryQueryOperation>(
     throw description.executionError(operation, exit.cause)
   }
 
-  // TanStack rejects successful undefined query data; mutations keep it unchanged.
   return operation !== 'mutation' && exit.value === undefined ? null : exit.value
 }
 
-const defineKey = (target: Record<string, unknown>, parts: readonly (JsonValue | string)[]) => {
-  const key = freezeKey(parts)
-  target['key'] = () => key
-}
-
-// One preparation produces both the retained execution input and its immutable key.
 const prepareQuery = (
   description: UnaryOperation | StreamingOperation,
   input: unknown,
   operationKey: readonly JsonValue[],
   keyEncoder: RuntimeKeyEncoder | undefined,
+  identity: readonly JsonValue[] = [],
 ): PreparedQuery => {
   if (description.input._tag === 'Inputless') {
-    return { input: undefined, key: operationKey }
+    return {
+      input: undefined,
+      key: identity.length === 0 ? operationKey : freezeKey([...operationKey, ...identity]),
+    }
   }
   const prepared = description.input.prepare(input, keyEncoder)
   try {
     return {
       input: prepared.input,
-      key: freezeKey([...operationKey, canonicalize(prepared.keyValue)]),
+      key: freezeKey([...operationKey, canonicalize(prepared.keyValue), ...identity]),
     }
   } catch (error) {
     throw description.input.invalidKey(error)
@@ -228,10 +215,15 @@ const prepareQuery = (
 }
 
 const prepareQueryOptions = (description: OperationDescription, argument: unknown) => {
-  const options: Record<string, unknown> =
-    argument === skipToken
-      ? { input: skipToken }
-      : { ...(Predicate.isObject(argument) ? argument : undefined) }
+  if (argument !== undefined && !Predicate.isObject(argument)) {
+    throw new TypeError('Query options must be an object')
+  }
+  const options = { ...argument }
+  for (const option of ['queryKeyHashFn', 'queryHash'] as const) {
+    if (Object.hasOwn(options, option)) {
+      throw description.unsupportedQueryHash(option)
+    }
+  }
   const { input } = options
   delete options['input']
   const requestOptions = description.takeOptions(options)
@@ -242,36 +234,35 @@ const finalizeQueryOptions = <QueryFn>(
   options: Record<string, unknown>,
   queryKey: readonly JsonValue[],
   queryFn: QueryFn,
-) => {
-  // Query Core prefers an explicit hash over the generated hash function.
-  delete options['queryHash']
-  return {
-    ...options,
-    // Owned fields follow user options so callers cannot replace keys or runners.
-    queryFn,
-    queryKey,
-    queryKeyHashFn: hashCanonicalKey,
-  }
-}
+) => ({
+  ...options,
+  queryFn,
+  queryKey,
+})
 
 const createQueryBuilders = (
   description: UnaryOperation | StreamingOperation,
   operationKey: readonly JsonValue[],
   keyEncoder: RuntimeKeyEncoder | undefined,
-  prepareExecution: (
+  prepareOptions: (
     options: Record<string, unknown>,
     requestOptions: unknown,
-  ) => (input: unknown) => QueryFunction,
+    input: unknown,
+  ) => QueryPreparation,
+  prepareIdentity?: (options: Record<string, unknown>) => readonly JsonValue[],
 ) => ({
-  key: (input?: unknown) => prepareQuery(description, input, operationKey, keyEncoder).key,
+  key: (input?: unknown, policy?: Record<string, unknown>) => {
+    const options = description.input._tag === 'Inputless' ? input : policy
+    const identity = prepareIdentity?.(Predicate.isObject(options) ? { ...options } : {}) ?? []
+    return prepareQuery(description, input, operationKey, keyEncoder, identity).key
+  },
   options: (argument?: unknown) => {
     const { input, options, requestOptions } = prepareQueryOptions(description, argument)
-    // Stream policy is consumed and validated even when execution will be skipped.
-    const makeQuery = prepareExecution(options, requestOptions)
+    const { identity, makeQuery } = prepareOptions(options, requestOptions, input)
     if (description.input._tag !== 'Inputless' && input === skipToken) {
       return finalizeQueryOptions(options, operationKey, skipToken)
     }
-    const prepared = prepareQuery(description, input, operationKey, keyEncoder)
+    const prepared = prepareQuery(description, input, operationKey, keyEncoder, identity)
     return finalizeQueryOptions(options, prepared.key, makeQuery(prepared.input))
   },
 })
@@ -294,17 +285,11 @@ const createInfiniteBuilders = (
     }
 
     const { initialPageParam } = options
-    const inputForPage =
-      description.input._tag === 'Inputless'
-        ? () => {
-            // Inputless operations do not construct a page payload.
-          }
-        : input
+    // oxlint-disable-next-line unicorn/no-useless-undefined
+    const inputForPage = description.input._tag === 'Inputless' ? () => undefined : input
     if (!Predicate.isFunction(inputForPage)) {
       throw new TypeError('Infinite query input must be a page input function')
     }
-    // SAFETY: The function guard above validates callability; the adapter validates
-    // the returned payload through the operation's declaration before execution.
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     const pageInput = inputForPage as (pageParam: unknown) => unknown
     const initialInput = pageInput(initialPageParam)
@@ -358,76 +343,135 @@ const createMutationBuilders = (
   return { mutationKey: () => mutationKey, mutationOptions }
 }
 
-const createMutationLeaf = (
-  description: BufferedOperation,
-  keyParts: readonly (JsonValue | string)[],
+type RuntimeStructuralSharing = (previous: unknown, data: unknown) => unknown
+
+const isStructuralSharing = (policy: unknown): policy is RuntimeStructuralSharing =>
+  Predicate.isFunction(policy)
+
+const shareQueryData = (previous: unknown, data: unknown, policy: unknown) => {
+  if (policy === false) {
+    return data
+  }
+  if (isStructuralSharing(policy)) {
+    return policy(previous, data)
+  }
+  return replaceEqualDeep(previous, data)
+}
+
+const prepareMetadataExecution = (
+  description: NonNullable<UnaryOperation['metadata']>,
+  options: Record<string, unknown>,
   runPromiseExit: RunPromiseExit<unknown>,
+  requestOptions: unknown,
+  skipped: boolean,
 ) => {
-  const operationKey = freezeKey(keyParts)
-  return Object.freeze({
-    key: () => operationKey,
-    ...createMutationBuilders(description, operationKey, runPromiseExit),
-  })
+  const hasLocalPolicy = Object.hasOwn(options, 'structuralSharing')
+  const localPolicy = options['structuralSharing']
+  const policies = new WeakMap<object, unknown>()
+  if (!skipped) {
+    options['structuralSharing'] = (previous: unknown, data: unknown) => {
+      const produced = Predicate.isObject(data) && policies.has(data)
+      const policy = produced ? policies.get(data) : localPolicy
+      const shared = shareQueryData(previous, data, policy)
+      return produced ? description.finalizeData(shared) : shared
+    }
+  }
+  return (input: unknown) =>
+    async ({ client, queryKey, signal }: QueryFunctionContext) => {
+      const policy = hasLocalPolicy
+        ? localPolicy
+        : client.defaultQueryOptions({ queryKey }).structuralSharing
+      const data = await execute(
+        description,
+        'metadata',
+        input,
+        runPromiseExit,
+        requestOptions,
+        signal,
+      )
+      if (Predicate.isObject(data)) {
+        policies.set(data, policy)
+      }
+      return data
+    }
 }
 
-const createUnaryLeaf = (
+const createUnaryBuilders = (
   description: UnaryOperation,
-  keyParts: readonly (JsonValue | string)[],
+  operationKey: readonly JsonValue[],
   keyEncoder: RuntimeKeyEncoder | undefined,
   runPromiseExit: RunPromiseExit<unknown>,
 ) => {
-  const operationKey = freezeKey(keyParts)
   const queryOperationKey = freezeKey([...operationKey, 'query'])
   const query = createQueryBuilders(
     description,
     queryOperationKey,
     keyEncoder,
-    (_options, requestOptions) =>
-      (input) =>
-      async ({ signal }: { readonly signal: AbortSignal }) =>
-        execute(description, 'query', input, runPromiseExit, requestOptions, signal),
+    (_options, requestOptions) => ({
+      identity: [],
+      makeQuery:
+        (input) =>
+        async ({ signal }) =>
+          execute(description, 'query', input, runPromiseExit, requestOptions, signal),
+    }),
   )
+  const { metadata } = description
+  const metadataQuery =
+    metadata === undefined
+      ? undefined
+      : createQueryBuilders(
+          description,
+          freezeKey([...operationKey, 'metadata']),
+          keyEncoder,
+          (options, requestOptions, input) => ({
+            identity: [],
+            makeQuery: prepareMetadataExecution(
+              metadata,
+              options,
+              runPromiseExit,
+              requestOptions,
+              description.input._tag !== 'Inputless' && input === skipToken,
+            ),
+          }),
+        )
 
-  return Object.freeze({
+  return {
     ...createInfiniteBuilders(description, operationKey, keyEncoder, runPromiseExit),
-    key: () => operationKey,
     ...createMutationBuilders(description, operationKey, runPromiseExit),
     queryKey: query.key,
     queryOptions: query.options,
-  })
+    ...(metadataQuery === undefined
+      ? undefined
+      : { metadataKey: metadataQuery.key, metadataOptions: metadataQuery.options }),
+  }
 }
 
-const createStreamingLeaf = (
+const createStreamingBuilders = (
   description: StreamingOperation,
-  keyParts: readonly (JsonValue | string)[],
+  operationKey: readonly JsonValue[],
   keyEncoder: RuntimeKeyEncoder | undefined,
   runPromiseExit: RunPromiseExit<unknown>,
 ) => {
-  const operationKey = freezeKey(keyParts)
-  const liveOperationKey = freezeKey([...operationKey, 'live'])
-  const streamedOperationKey = freezeKey([...operationKey, 'streamed'])
-  const live = createQueryBuilders(
-    description,
-    liveOperationKey,
-    keyEncoder,
-    (options, requestOptions) =>
-      description.prepareStream(options, 'live', runPromiseExit, requestOptions),
-  )
-  const streamed = createQueryBuilders(
-    description,
-    streamedOperationKey,
-    keyEncoder,
-    (options, requestOptions) =>
-      description.prepareStream(options, 'streamed', runPromiseExit, requestOptions),
-  )
+  const createView = (operation: 'live' | 'streamed') => {
+    const prepare = (options: Record<string, unknown>, requestOptions: unknown) =>
+      description.prepareStream(options, operation, runPromiseExit, requestOptions)
+    return createQueryBuilders(
+      description,
+      freezeKey([...operationKey, operation]),
+      keyEncoder,
+      prepare,
+      (options) => prepare(options, undefined).identity,
+    )
+  }
+  const live = createView('live')
+  const streamed = createView('streamed')
 
-  return Object.freeze({
-    key: () => operationKey,
+  return {
     liveKey: live.key,
     liveOptions: live.options,
     streamedKey: streamed.key,
     streamedOptions: streamed.options,
-  })
+  }
 }
 
 const deepFreezeTree = (value: Record<string, unknown>) => {
@@ -483,8 +527,8 @@ const insertLeaf = (
     const candidate = Object.hasOwn(branch, segment) ? branch[segment] : undefined
     let child = Predicate.isObject(candidate) ? candidate : undefined
     if (child === undefined) {
-      child = {}
-      defineKey(child, [...prefix, ...segments.slice(0, index + 1)])
+      const key = freezeKey([...prefix, ...segments.slice(0, index + 1)])
+      child = { key: () => key }
       branch[segment] = child
     }
     branch = child
@@ -494,15 +538,16 @@ const insertLeaf = (
   if (leafName === undefined) {
     throw new TypeError('Validated operation paths must have a leaf')
   }
-  const keyParts = [...prefix, ...segments]
+  const operationKey = freezeKey([...prefix, ...segments])
+  let builders
   if (operation.kind === 'Mutation') {
-    branch[leafName] = createMutationLeaf(operation, keyParts, runPromiseExit)
-    return
+    builders = createMutationBuilders(operation, operationKey, runPromiseExit)
+  } else if (operation.kind === 'Streaming') {
+    builders = createStreamingBuilders(operation, operationKey, keyEncoder, runPromiseExit)
+  } else {
+    builders = createUnaryBuilders(operation, operationKey, keyEncoder, runPromiseExit)
   }
-  branch[leafName] =
-    operation.kind === 'Streaming'
-      ? createStreamingLeaf(operation, keyParts, keyEncoder, runPromiseExit)
-      : createUnaryLeaf(operation, keyParts, keyEncoder, runPromiseExit)
+  branch[leafName] = { key: () => operationKey, ...builders }
 }
 
 const createTree = (
@@ -511,8 +556,7 @@ const createTree = (
   keyEncoders: ReadonlyMap<string, RuntimeKeyEncoder>,
   runPromiseExit: RunPromiseExit<unknown>,
 ) => {
-  const tree: Record<string, unknown> = {}
-  defineKey(tree, prefix)
+  const tree = { key: () => prefix }
 
   for (const path of paths) {
     insertLeaf(tree, prefix, path, keyEncoders.get(path.operation.id), runPromiseExit)
@@ -536,8 +580,6 @@ export const createUtilityTree = (
   ])
   const paths = planPaths(operations, options.errors)
   validateKeyEncoders(operations, options.keyEncoders, options.errors)
-  // SAFETY: Public options require a runner when a client has remaining services;
-  // otherwise the captured client is fully provided and the default runner needs none.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   const runner = options.runPromiseExit ?? (Effect.runPromiseExit as RunPromiseExit<unknown>)
   return createTree(prefix, paths, options.keyEncoders, runner)
diff --git a/src/core/view-prefix.ts b/src/core/view-prefix.ts
new file mode 100644
index 0000000..57d1e79
--- /dev/null
+++ b/src/core/view-prefix.ts
@@ -0,0 +1,13 @@
+import type { QueryKey } from '@tanstack/query-core'
+
+import type { SupportedQueryView } from './inference'
+
+/** Selects every input and stream policy for one leaf's query view. */
+export const viewPrefix = <
+  const Key extends QueryKey,
+  Leaf extends { readonly key: () => Key },
+  View extends SupportedQueryView<Leaf>,
+>(
+  leaf: Leaf & { readonly key: () => Key },
+  view: View,
+): readonly [...Key, View] => Object.freeze([...leaf.key(), view])
diff --git a/src/http/create-utils.ts b/src/http/create-utils.ts
index ef1e3ee..bbb6003 100644
--- a/src/http/create-utils.ts
+++ b/src/http/create-utils.ts
@@ -5,7 +5,6 @@ import { createUtilityTree } from '../core/utility-tree'
 import { compileHttpOperations } from './operation'
 import type { CreateHttpApiQueryUtilsOptions, HttpApiQueryUtils } from './types'
 
-/** Derives a frozen utility tree from buffered endpoints and a caller-owned ready HTTP client. */
 export const createHttpApiQueryUtils = <
   const Api extends HttpApi.Constraint,
   const Prefix extends readonly [JsonValue, ...JsonValue[]],
@@ -14,8 +13,6 @@ export const createHttpApiQueryUtils = <
   api: Api,
   options: CreateHttpApiQueryUtilsOptions<Api, Prefix, Client>,
 ): HttpApiQueryUtils<Api, Prefix, Client> => {
-  // SAFETY: Api extends HttpApi.Constraint; this erases endpoint type parameters
-  // only for metadata traversal, preserving the original Api in the public result.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion, anti-slop/no-chained-type-assertions
   const runtimeApi = api as unknown as HttpApi.Top
   const { operations, errors, keyEncoders } = compileHttpOperations(
@@ -23,8 +20,6 @@ export const createHttpApiQueryUtils = <
     options.client,
     options.keyEncoders,
   )
-  // SAFETY: Public options require a runner when the ready client retains services;
-  // the runtime tree forwards the same runner without changing its Context.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   const runPromiseExit = options.runPromiseExit as RunPromiseExit<unknown> | undefined
   const tree = createUtilityTree(operations, {
@@ -34,8 +29,6 @@ export const createHttpApiQueryUtils = <
     runPromiseExit,
     errors,
   })
-  // SAFETY: The compiled operations retain this Api's endpoint identities and ready
-  // client; packed type fixtures verify its generated builder overloads and channels.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   return tree as HttpApiQueryUtils<Api, Prefix, Client>
 }
diff --git a/src/http/errors.ts b/src/http/errors.ts
index 49ea267..0d5fab5 100644
--- a/src/http/errors.ts
+++ b/src/http/errors.ts
@@ -8,8 +8,7 @@ export interface HttpApiEndpointIdentity {
   readonly method: string
 }
 
-/** TanStack operations supported by buffered HTTP endpoints. */
-export type HttpApiOperation = 'query' | 'infinite' | 'mutation'
+export type HttpApiOperation = 'query' | 'infinite' | 'mutation' | 'metadata' | 'streamed' | 'live'
 
 /** Stable codes for invalid HTTP utility configuration. */
 export type EffectHttpApiQueryConfigErrorCode =
@@ -19,6 +18,10 @@ export type EffectHttpApiQueryConfigErrorCode =
   | 'MissingKeyEncoder'
   | 'UnknownKeyEncoder'
   | 'UnsupportedEndpointMetadata'
+  | 'UnsupportedQueryHash'
+  | 'InvalidMaxChunks'
+  | 'InvalidRefetchMode'
+  | 'InvalidMaxEventSize'
 
 /** Stable codes for synchronous HTTP key failures. */
 export type EffectHttpApiQueryKeyErrorCode =
@@ -54,7 +57,27 @@ export class EffectHttpApiQueryError<E> extends Error implements HttpApiEndpoint
   }
 }
 
-/** Reports invalid HTTP projection, key configuration, or endpoint metadata. */
+export class EffectHttpApiQueryEmptyStreamError extends Error implements HttpApiEndpointIdentity {
+  readonly _tag = 'EffectHttpApiQueryEmptyStreamError'
+  readonly apiId: string
+  readonly groupId: string
+  readonly endpoint: string
+  readonly method: string
+  readonly operation = 'live'
+
+  constructor(identity: HttpApiEndpointIdentity) {
+    super(
+      `HTTP ${identity.method} ${identity.groupId}/${identity.endpoint} live stream completed without a value`,
+    )
+    this.name = 'EffectHttpApiQueryEmptyStreamError'
+    this.apiId = identity.apiId
+    this.groupId = identity.groupId
+    this.endpoint = identity.endpoint
+    this.method = identity.method
+  }
+}
+
+/** Reports invalid factory, builder, or stream cache configuration. */
 export class EffectHttpApiQueryConfigError extends Error {
   readonly _tag = 'EffectHttpApiQueryConfigError'
   readonly code: EffectHttpApiQueryConfigErrorCode
diff --git a/src/http/operation.ts b/src/http/operation.ts
index 82ca3d3..0459c57 100644
--- a/src/http/operation.ts
+++ b/src/http/operation.ts
@@ -1,9 +1,12 @@
-import { Predicate } from 'effect'
-import type { Effect } from 'effect'
+import { Effect, Predicate } from 'effect'
+import type { Cause } from 'effect'
+import type { Sse } from 'effect/encoding'
+import type { HttpClientResponse } from 'effect/http'
 import type { HttpApi } from 'effect/http-api'
 
 import type {
   MutationOperation,
+  StreamingOperation,
   RuntimeKeyEncoder,
   TreeErrors,
   UnaryOperation,
@@ -11,17 +14,43 @@ import type {
 import { EffectHttpApiQueryConfigError, EffectHttpApiQueryError } from './errors'
 import type { HttpApiEndpointIdentity } from './errors'
 import { createHttpRequest } from './request'
+import { createHttpStreamPreparation } from './streamed-query'
 
-type HttpOperation = (UnaryOperation | MutationOperation) & {
+type HttpOperation = (UnaryOperation | MutationOperation | StreamingOperation) & {
   readonly identity: HttpApiEndpointIdentity
 }
 
+type RuntimeHttpMethod = <Mode extends 'decoded-only' | 'decoded-and-response'>(
+  request: Record<string, unknown> & { readonly responseMode: Mode },
+) => Effect.Effect<
+  Mode extends 'decoded-and-response'
+    ? readonly [unknown, HttpClientResponse.HttpClientResponse]
+    : unknown,
+  unknown,
+  unknown
+>
+
 export interface CompiledHttpOperations {
-  readonly operations: readonly (UnaryOperation | MutationOperation)[]
+  readonly operations: readonly (UnaryOperation | MutationOperation | StreamingOperation)[]
   readonly errors: TreeErrors
   readonly keyEncoders: ReadonlyMap<string, RuntimeKeyEncoder>
 }
 
+const freezeMetadata = (data: unknown) => {
+  if (!Predicate.isObject(data)) {
+    return data
+  }
+  const { headers } = data
+  const snapshot =
+    Predicate.isObject(headers) &&
+    (!Object.isFrozen(headers) || Object.getPrototypeOf(headers) !== Object.prototype)
+      ? Object.freeze({ ...headers })
+      : headers
+  return Object.isFrozen(data) && snapshot === headers
+    ? data
+    : Object.freeze({ ...data, headers: snapshot })
+}
+
 const extractHttpEndpoints = (api: HttpApi.Top, client: unknown): readonly HttpOperation[] => {
   const operations: HttpOperation[] = []
   for (const group of Object.values(api.groups)) {
@@ -36,37 +65,78 @@ const extractHttpEndpoints = (api: HttpApi.Top, client: unknown): readonly HttpO
       if (request === undefined) {
         continue
       }
-      // SAFETY: The public client is tied to this Api. HttpApiClient mirrors group
-      // identifiers and topLevel placement, with the declaration's endpoint functions.
       // oxlint-disable-next-line typescript/no-unsafe-type-assertion
       const target = // oxlint-disable-next-line typescript/no-unsafe-type-assertion
         (group.topLevel ? client : (client as Record<string, unknown>)[group.identifier]) as Record<
           string,
-          (request: unknown) => Effect.Effect<unknown, unknown, unknown>
+          RuntimeHttpMethod
         >
-      operations.push({
-        ...request,
+      const invoke = <Mode extends 'decoded-only' | 'decoded-and-response'>(
+        requestInput: unknown,
+        responseMode: Mode,
+        sseOptions?: Sse.DecodeOptions,
+      ) => {
+        const method = target[endpoint.identifier]
+        if (method === undefined) {
+          throw new TypeError(`Missing HTTP client endpoint ${endpoint.identifier}`)
+        }
+        // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
+        return method.bind(target)({
+          ...(Predicate.isObject(requestInput) ? requestInput : undefined),
+          responseMode,
+          ...(sseOptions === undefined ? undefined : { sseOptions }),
+        })
+      }
+      const common = {
         identity,
         id: JSON.stringify([group.identifier, endpoint.identifier]),
         path: group.topLevel ? [endpoint.identifier] : [group.identifier, endpoint.identifier],
-        takeOptions: () => {
-          // HTTP has no adapter-owned options.
-        },
-        invoke: (requestInput) => {
-          const invoke = target[endpoint.identifier]
-          if (invoke === undefined) {
-            throw new TypeError(`Missing HTTP client endpoint ${endpoint.identifier}`)
-          }
-          // The ready client preserves caller errors and service requirements.
+        unsupportedQueryHash: (option: 'queryKeyHashFn' | 'queryHash') =>
+          new EffectHttpApiQueryConfigError(
+            'UnsupportedQueryHash',
+            `${option} must be configured through QueryClient defaults`,
+            identity,
+          ),
+        takeOptions: () => null,
+      }
+      if (request.kind === 'Streaming') {
+        operations.push({
+          ...common,
+          ...request,
+          kind: 'Streaming',
+          prepareStream: createHttpStreamPreparation(identity, (requestInput, sseOptions) =>
+            // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
+            invoke(requestInput, 'decoded-only', sseOptions),
+          ),
+        })
+      } else {
+        operations.push({
+          ...common,
+          ...request,
           // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
-          return invoke.call(target, {
-            ...(Predicate.isObject(requestInput) ? requestInput : undefined),
-            responseMode: 'decoded-only',
-          })
-        },
-        executionError: (operation, cause) =>
-          new EffectHttpApiQueryError(identity, operation, cause),
-      })
+          invoke: (requestInput) => invoke(requestInput, 'decoded-only'),
+          ...(request.kind === 'Unary'
+            ? {
+                metadata: {
+                  invoke: (requestInput: unknown) =>
+                    // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
+                    Effect.map(invoke(requestInput, 'decoded-and-response'), ([data, response]) =>
+                      freezeMetadata({
+                        data: data === undefined ? null : data,
+                        status: response.status,
+                        headers: response.headers,
+                      }),
+                    ),
+                  executionError: (operation: 'metadata', cause: Cause.Cause<unknown>) =>
+                    new EffectHttpApiQueryError(identity, operation, cause),
+                  finalizeData: freezeMetadata,
+                },
+              }
+            : undefined),
+          executionError: (operation, cause) =>
+            new EffectHttpApiQueryError(identity, operation, cause),
+        })
+      }
     }
   }
   return operations
@@ -111,7 +181,6 @@ const httpTreeErrors = (api: HttpApi.Top, operations: readonly HttpOperation[]):
   }
 }
 
-/** Binds declaration identities, endpoint projection, and encoder configuration together. */
 export const compileHttpOperations = (
   api: HttpApi.Top,
   client: unknown,
@@ -121,7 +190,7 @@ export const compileHttpOperations = (
   const errors = httpTreeErrors(api, operations)
   const encoderGroups = new Set(
     operations
-      .filter((operation) => operation.kind === 'Unary' && operation.input._tag === 'Input')
+      .filter((operation) => operation.kind !== 'Mutation' && operation.input._tag === 'Input')
       .map((operation) => operation.identity.groupId),
   )
   const keyEncoders = new Map<string, RuntimeKeyEncoder>()
@@ -135,8 +204,6 @@ export const compileHttpOperations = (
       throw new TypeError('HTTP key encoders must be grouped by endpoint')
     }
     for (const [endpoint, encoder] of Object.entries(endpoints)) {
-      // SAFETY: Public keyEncoders pairs each endpoint with a payload encoder;
-      // the runtime tree validates required callability and canonicalizes its result.
       // oxlint-disable-next-line typescript/no-unsafe-type-assertion
       keyEncoders.set(JSON.stringify([groupId, endpoint]), encoder as RuntimeKeyEncoder)
     }
diff --git a/src/http/request.ts b/src/http/request.ts
index 1b27fab..a01a3d3 100644
--- a/src/http/request.ts
+++ b/src/http/request.ts
@@ -7,7 +7,6 @@ import { createSchemaKeyEncoding } from '../core/schema-key'
 import { EffectHttpApiQueryConfigError, EffectHttpApiQueryKeyError } from './errors'
 import type { HttpApiEndpointIdentity } from './errors'
 
-// Codec conversion can wrap a branded schema; the brand remains on its inner schema.
 const multipartBrands = (schema: Schema.Top): ReadonlySet<string> => {
   const brands = new Set<string>()
   const visited = new WeakSet()
@@ -28,13 +27,14 @@ const multipartBrands = (schema: Schema.Top): ReadonlySet<string> => {
 
 export type HttpRequestDescription =
   | { readonly kind: 'Unary'; readonly input: OperationInput }
+  | { readonly kind: 'Streaming'; readonly input: OperationInput }
   | { readonly kind: 'Mutation' }
 
 const classifyEndpoint = (
   endpoint: HttpApiEndpoint.Top,
   identity: HttpApiEndpointIdentity,
 ):
-  | { readonly kind: 'Unary'; readonly schemas: readonly Schema.Top[] }
+  | { readonly kind: 'Unary' | 'Streaming'; readonly schemas: readonly Schema.Top[] }
   | { readonly kind: 'Mutation' }
   | undefined => {
   const payloads: Schema.Top[] = []
@@ -60,21 +60,32 @@ const classifyEndpoint = (
       payloads.push(schema)
     }
   }
-  if (
-    multipartStream ||
-    [...endpoint.success].some((schema) =>
-      Predicate.hasProperty(
-        HttpApiSchema.isWithHeaders(schema) ? schema.schema : schema,
-        '~effect/http-api/HttpApiSchema/Stream',
-      ),
-    )
-  ) {
+  if (multipartStream) {
     return undefined
   }
+  const successes = [...endpoint.success]
+  const streams = successes.filter((schema) =>
+    Predicate.hasProperty(
+      HttpApiSchema.isWithHeaders(schema) ? schema.schema : schema,
+      '~effect/http-api/HttpApiSchema/Stream',
+    ),
+  )
+  if (streams.length > 0) {
+    const [success] = successes
+    const body = HttpApiSchema.isWithHeaders(success) ? success.schema : success
+    if (
+      multipart ||
+      successes.length !== 1 ||
+      !Predicate.hasProperty(body, '_tag') ||
+      body._tag !== 'StreamSse'
+    ) {
+      return undefined
+    }
+    return { kind: 'Streaming', schemas: payloads }
+  }
   return multipart ? { kind: 'Mutation' } : { kind: 'Unary', schemas: payloads }
 }
 
-// HTTP omits undefined object members; arrays still undergo strict JSON validation.
 const omitUndefined = (value: unknown, seen = new WeakSet()): unknown => {
   if (!Predicate.isObjectOrArray(value)) {
     return value
@@ -85,28 +96,50 @@ const omitUndefined = (value: unknown, seen = new WeakSet()): unknown => {
   seen.add(value)
   let result: unknown = value
   if (Array.isArray(value)) {
-    result = value.map((item) => omitUndefined(item, seen))
+    let copy: unknown[] | undefined
+    for (let index = 0; index < value.length; index += 1) {
+      if (!Object.hasOwn(value, index)) {
+        throw new TypeError('Key values must not contain sparse arrays')
+      }
+      const item = value[index]
+      const next = omitUndefined(item, seen)
+      if (copy !== undefined) {
+        copy.push(next)
+      } else if (next !== item) {
+        copy = Array.from({ length: index }, (_, offset) => value[offset])
+        copy.push(next)
+      }
+    }
+    result = copy ?? value
   } else if (
     Object.getPrototypeOf(value) === Object.prototype ||
     Object.getPrototypeOf(value) === null
   ) {
-    result = Object.fromEntries(
-      Object.entries(value)
-        .filter(([, item]) => item !== undefined)
-        .map(([name, item]) => [name, omitUndefined(item, seen)]),
-    )
+    let copy: [string, unknown][] | undefined
+    const entries = Object.entries(value)
+    for (const [index, [name, item]] of entries.entries()) {
+      if (item === undefined) {
+        copy ??= entries.slice(0, index)
+      } else {
+        const next = omitUndefined(item, seen)
+        if (next !== item) {
+          copy ??= entries.slice(0, index)
+        }
+        copy?.push([name, next])
+      }
+    }
+    result = copy === undefined ? value : Object.fromEntries(copy)
   }
   seen.delete(value)
   return result
 }
 
-const normalizeRequestKey = (value: unknown): unknown => {
+const normalizeRequestKey = (value: unknown) => {
   const request = omitUndefined(value)
   if (!Predicate.isObject(request)) {
     throw new TypeError('Encoded HTTP requests must be objects')
   }
   if (Predicate.isObject(request['headers'])) {
-    // SAFETY: Object.create(null) allocates an empty dictionary without a prototype.
     // oxlint-disable-next-line typescript/no-unsafe-assignment
     const headers: Record<string, unknown> = Object.create(null)
     for (const [name, headerValue] of Object.entries(request['headers'])) {
@@ -119,12 +152,11 @@ const normalizeRequestKey = (value: unknown): unknown => {
       }
       headers[lower] = headerValue
     }
-    request['headers'] = headers
+    return { ...request, headers }
   }
   return request
 }
 
-/** Retains buffered multipart mutations and omits streaming requests or responses. */
 export const createHttpRequest = (
   endpoint: HttpApiEndpoint.Top,
   identity: HttpApiEndpointIdentity,
@@ -148,7 +180,7 @@ export const createHttpRequest = (
     fields['payload'] = Schema.Union(payloads)
   }
   if (Object.keys(fields).length === 0) {
-    return { kind: 'Unary', input: { _tag: 'Inputless' } }
+    return { kind: classified.kind, input: { _tag: 'Inputless' } }
   }
   const schema = Schema.Struct(fields)
   const keyEncoding = createSchemaKeyEncoding(schema)
@@ -160,7 +192,7 @@ export const createHttpRequest = (
       cause,
     )
   return {
-    kind: 'Unary',
+    kind: classified.kind,
     input: {
       _tag: 'Input',
       requiresEncoder: payloads.length > 1 || keyEncoding.requiresEncoder,
diff --git a/src/http/streamed-query.ts b/src/http/streamed-query.ts
new file mode 100644
index 0000000..a2b13a1
--- /dev/null
+++ b/src/http/streamed-query.ts
@@ -0,0 +1,90 @@
+import { Effect, Predicate, Stream } from 'effect'
+import type { Sse } from 'effect/encoding'
+import { HttpApiSchema } from 'effect/http-api'
+
+import type { StreamingOperation } from '../core/operation'
+import { makeStreamQuery, prepareStreamPolicy } from '../core/streamed-query'
+import {
+  EffectHttpApiQueryConfigError,
+  EffectHttpApiQueryEmptyStreamError,
+  EffectHttpApiQueryError,
+} from './errors'
+import type { HttpApiEndpointIdentity } from './errors'
+
+const decoderOptions = (
+  identity: HttpApiEndpointIdentity,
+  options: Record<string, unknown>,
+): Sse.DecodeOptions & { readonly maxEventSize: number } => {
+  const { sseOptions } = options
+  const maxEventSize = Predicate.isObject(sseOptions) ? sseOptions['maxEventSize'] : undefined
+  const limit = maxEventSize === undefined ? 10 * 1024 * 1024 : maxEventSize
+  if (!Predicate.isNumber(limit) || !Number.isSafeInteger(limit) || limit <= 0) {
+    throw new EffectHttpApiQueryConfigError(
+      'InvalidMaxEventSize',
+      'sseOptions.maxEventSize must be a positive safe integer',
+      identity,
+    )
+  }
+  return Object.freeze({ maxEventSize: limit })
+}
+
+export const createHttpStreamPreparation =
+  (
+    identity: HttpApiEndpointIdentity,
+    invoke: (
+      input: unknown,
+      sseOptions: Sse.DecodeOptions,
+    ) => Effect.Effect<unknown, unknown, unknown>,
+  ): StreamingOperation['prepareStream'] =>
+  (options, operation, runPromiseExit) => {
+    const { policy, history } = prepareStreamPolicy(
+      options,
+      operation,
+      (code, message) => new EffectHttpApiQueryConfigError(code, message, identity),
+    )
+    const sseOptions = decoderOptions(identity, options)
+    delete options['sseOptions']
+    return {
+      identity: [
+        Object.freeze({
+          ...history,
+          maxEventSize: sseOptions.maxEventSize,
+        }),
+      ],
+      makeQuery: (input) =>
+        makeStreamQuery({
+          policy,
+          source: Stream.unwrap(
+            // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
+            Effect.suspend(() => invoke(input, sseOptions)).pipe(
+              Effect.map((response) => {
+                if (
+                  Predicate.hasProperty(response, 'body') &&
+                  Predicate.hasProperty(response, 'headers') &&
+                  Stream.isStream(response.body)
+                ) {
+                  return response.body.pipe(
+                    Stream.map((body) =>
+                      HttpApiSchema.withHeaders({ body, headers: response.headers }),
+                    ),
+                  )
+                }
+                if (!Stream.isStream(response)) {
+                  throw new TypeError('HTTP SSE clients must return a Stream')
+                }
+                return response
+              }),
+            ),
+          ),
+          executionError: (cause) => new EffectHttpApiQueryError(identity, operation, cause),
+          unsupportedHash: () =>
+            new EffectHttpApiQueryConfigError(
+              'UnsupportedQueryHash',
+              'Stream queries require consistent QueryClient hashing',
+              identity,
+            ),
+          emptyError: () => new EffectHttpApiQueryEmptyStreamError(identity),
+          runPromiseExit,
+        }),
+    }
+  }
diff --git a/src/http/types.ts b/src/http/types.ts
index 85c88e3..cb80a76 100644
--- a/src/http/types.ts
+++ b/src/http/types.ts
@@ -1,5 +1,6 @@
 import type { DataTag } from '@tanstack/query-core'
-import type { Brand, Effect, Schema } from 'effect'
+import type { Brand, Effect, Schema, Stream } from 'effect'
+import type { Sse } from 'effect/encoding'
 import type {
   HttpApi,
   HttpApiClient,
@@ -14,11 +15,18 @@ import type {
   InfiniteQueryKey,
   UnaryQueryBuilder,
   JsonValue,
+  KeyBuilder,
+  KeyEncoderRequirement,
   MutationBuilder,
   QueryData,
-  RunPromiseExit,
+  RunnerRequirement,
+  StreamedPolicyOptions,
 } from '../core/types'
-import type { EffectHttpApiQueryError } from './errors'
+import type {
+  EffectHttpApiQueryConfigError,
+  EffectHttpApiQueryEmptyStreamError,
+  EffectHttpApiQueryError,
+} from './errors'
 
 export type Groups<Api extends HttpApi.Constraint> =
   Api extends HttpApi.HttpApi<infer _Id, infer Group> ? Group : never
@@ -33,18 +41,26 @@ export type MultipartPayload =
   | Brand.Brand<HttpApiSchema.MultipartTypeId>
   | Brand.Brand<HttpApiSchema.MultipartStreamTypeId>
 
-/** Omits the complete endpoint when any success or multipart payload alternative streams. */
+export type SseEndpoint<Endpoint> = Endpoint extends HttpApiEndpoint.ConstraintRequest
+  ? [ResponseBody<Endpoint['~Success']>] extends [{ readonly _tag: 'StreamSse' }]
+    ? Endpoint
+    : never
+  : never
+
 export type Supported<Endpoint> = Endpoint extends HttpApiEndpoint.ConstraintRequest
-  ? [Extract<ResponseBody<Endpoint['~Success']>, HttpApiSchema.StreamSchema>] extends [never]
-    ? [
-        Extract<Endpoint['~Payload']['Type'], Brand.Brand<HttpApiSchema.MultipartStreamTypeId>>,
-      ] extends [never]
+  ? [
+      Extract<Endpoint['~Payload']['Type'], Brand.Brand<HttpApiSchema.MultipartStreamTypeId>>,
+    ] extends [never]
+    ? [Extract<ResponseBody<Endpoint['~Success']>, HttpApiSchema.StreamSchema>] extends [never]
       ? Endpoint
-      : never
+      : [SseEndpoint<Endpoint>] extends [never]
+        ? never
+        : [Extract<Endpoint['~Payload']['Type'], MultipartPayload>] extends [never]
+          ? Endpoint
+          : never
     : never
   : never
 
-/** Retains the endpoints whose requests can have canonical query identity. */
 export type Queryable<Endpoint> = Endpoint extends HttpApiEndpoint.ConstraintRequest
   ? [Extract<Endpoint['~Payload']['Type'], MultipartPayload>] extends [never]
     ? Endpoint
@@ -74,7 +90,6 @@ export type RequestFields<Endpoint extends HttpApiEndpoint.ConstraintRequest> =
   'responseMode' | 'sseOptions'
 >
 
-/** Uses decoded request fields while reserving response controls for the adapter. */
 export type Request<Endpoint extends HttpApiEndpoint.ConstraintRequest> =
   keyof RequestFields<Endpoint> extends never
     ? void
@@ -89,8 +104,6 @@ export type ClientGroup<Group, Client> = Group extends { readonly topLevel: true
   : Group extends HttpApiGroup.Constraint
     ? Member<Client, Group['identifier']>
     : never
-/** Exact identity keeps related response-only overloads from ending the traversal early. */
-// Generic function comparison distinguishes overloads by exact type identity.
 /* oxlint-disable typescript/no-unnecessary-type-parameters */
 export type SeenMethod<Method, Seen extends readonly unknown[]> = Seen extends readonly [
   infer First,
@@ -101,7 +114,6 @@ export type SeenMethod<Method, Seen extends readonly unknown[]> = Seen extends r
     : SeenMethod<Method, Rest>
   : false
 /* oxlint-enable typescript/no-unnecessary-type-parameters */
-/** Rotates overloads into a union so response-only calls cannot replace decoded execution. */
 export type MethodSignatures<
   Method,
   Partial = unknown,
@@ -120,8 +132,9 @@ export type MethodSignatures<
 export type DecodedEffect<
   Method,
   Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Mode extends 'decoded-only' | 'decoded-and-response' = 'decoded-only',
 > = Method extends (
-  request: RequestFields<Endpoint> & { readonly responseMode: 'decoded-only' },
+  request: RequestFields<Endpoint> & { readonly responseMode: Mode },
 ) => infer Result
   ? Result
   : never
@@ -129,16 +142,24 @@ export type ClientEffect<
   Group,
   Endpoint extends HttpApiEndpoint.ConstraintRequest,
   Client,
+  Mode extends 'decoded-only' | 'decoded-and-response' = 'decoded-only',
 > = DecodedEffect<
   MethodSignatures<Member<ClientGroup<Group, Client>, Endpoint['identifier']>>,
-  Endpoint
+  Endpoint,
+  Mode
 >
 export type ExposedEffects<Api extends HttpApi.Constraint, Client> =
   SupportedGroups<Api> extends infer Group
     ? Group extends HttpApiGroup.Constraint
       ? Supported<Endpoints<Group>> extends infer Endpoint
         ? Endpoint extends HttpApiEndpoint.ConstraintRequest
-          ? ClientEffect<Group, Endpoint, Client>
+          ?
+              | ClientEffect<Group, Endpoint, Client>
+              | ([Queryable<Endpoint>] extends [never]
+                  ? never
+                  : [SseEndpoint<Endpoint>] extends [never]
+                    ? ClientEffect<Group, Endpoint, Client, 'decoded-and-response'>
+                    : never)
           : never
         : never
       : never
@@ -167,7 +188,6 @@ export type ConcreteKey<
   QueryData<Success<Endpoint>>,
   Failure<ClientError>
 >
-/** Supplies HTTP request inference to the shared unary query builder. */
 export type QueryBuilder<
   Endpoint extends HttpApiEndpoint.ConstraintRequest,
   Key extends readonly JsonValue[],
@@ -180,6 +200,36 @@ export type QueryBuilder<
   readonly [...Key, 'query']
 >
 
+export type MetadataData<Endpoint extends HttpApiEndpoint.ConstraintRequest> = {
+  readonly data: QueryData<Success<Endpoint>>
+  readonly status: number
+  readonly headers: Readonly<Record<string, string>>
+}
+
+export type ConcreteMetadataKey<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+> = DataTag<
+  void extends Request<Endpoint>
+    ? readonly [...Key, 'metadata']
+    : readonly [...Key, 'metadata', JsonValue],
+  MetadataData<Endpoint>,
+  Failure<ClientError>
+>
+
+export type MetadataBuilder<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+> = UnaryQueryBuilder<
+  Request<Endpoint>,
+  MetadataData<Endpoint>,
+  Failure<ClientError>,
+  ConcreteMetadataKey<Endpoint, Key, ClientError>,
+  readonly [...Key, 'metadata']
+>
+
 export type ConcreteInfiniteKey<
   Endpoint extends HttpApiEndpoint.ConstraintRequest,
   Key extends readonly JsonValue[],
@@ -193,7 +243,6 @@ export type ConcreteInfiniteKey<
   PageParam
 >
 
-/** Supplies decoded HTTP requests to the shared infinite query builder. */
 export type InfiniteBuilder<
   Endpoint extends HttpApiEndpoint.ConstraintRequest,
   Key extends readonly JsonValue[],
@@ -220,24 +269,136 @@ export type MutationLeaf<
   >
 }
 
-export type Leaf<
+export type BufferedLeaf<
   Endpoint extends HttpApiEndpoint.ConstraintRequest,
   Key extends readonly JsonValue[],
   ClientError,
+  MetadataClientError = ClientError,
 > = MutationLeaf<Endpoint, Key, ClientError> &
   ([Queryable<Endpoint>] extends [never]
     ? unknown
     : {
-        readonly queryKey: void extends Request<Endpoint>
-          ? () => ConcreteKey<Endpoint, Key, ClientError>
-          : (input: Request<Endpoint>) => ConcreteKey<Endpoint, Key, ClientError>
+        readonly queryKey: KeyBuilder<
+          Request<Endpoint>,
+          ConcreteKey<Endpoint, Key, ClientError>,
+          void extends Request<Endpoint> ? true : false
+        >
         readonly queryOptions: QueryBuilder<Endpoint, Key, ClientError>
-        readonly infiniteKey: void extends Request<Endpoint>
-          ? () => ConcreteInfiniteKey<Endpoint, Key, ClientError>
-          : (input: Request<Endpoint>) => ConcreteInfiniteKey<Endpoint, Key, ClientError>
+        readonly metadataKey: KeyBuilder<
+          Request<Endpoint>,
+          ConcreteMetadataKey<Endpoint, Key, MetadataClientError>,
+          void extends Request<Endpoint> ? true : false
+        >
+        readonly metadataOptions: MetadataBuilder<Endpoint, Key, MetadataClientError>
+        readonly infiniteKey: KeyBuilder<
+          Request<Endpoint>,
+          ConcreteInfiniteKey<Endpoint, Key, ClientError>,
+          void extends Request<Endpoint> ? true : false
+        >
         readonly infiniteOptions: InfiniteBuilder<Endpoint, Key, ClientError>
       })
 
+export type StreamChunk<Value> =
+  Value extends HttpApiSchema.withHeaders<infer Body, infer Headers>
+    ? Body extends Stream.Stream<infer Chunk, infer _Error, infer _Services>
+      ? HttpApiSchema.withHeaders<Chunk, Headers>
+      : never
+    : Value extends Stream.Stream<infer Chunk, infer _Error, infer _Services>
+      ? Chunk
+      : never
+
+export type StreamFailure<Value> =
+  Value extends HttpApiSchema.withHeaders<infer Body, infer _Headers>
+    ? StreamFailure<Body>
+    : Value extends Stream.Stream<infer _Chunk, infer Error, infer _Services>
+      ? Error
+      : never
+
+export type HttpStreamPolicy = StreamedPolicyOptions & {
+  readonly sseOptions?: Sse.DecodeOptions | undefined
+}
+
+export type HttpStreamQueryError<Endpoint extends HttpApiEndpoint.ConstraintRequest, ClientError> =
+  | EffectHttpApiQueryConfigError
+  | Failure<ClientError | StreamFailure<Success<Endpoint>>>
+
+export type StreamedKey<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+> = DataTag<
+  readonly [...Key, 'streamed', ...JsonValue[]],
+  readonly StreamChunk<Success<Endpoint>>[],
+  HttpStreamQueryError<Endpoint, ClientError>
+>
+
+export type StreamedLeaf<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+> = {
+  readonly key: () => Key
+  readonly streamedKey: void extends Request<Endpoint>
+    ? (policy?: HttpStreamPolicy) => StreamedKey<Endpoint, Key, ClientError>
+    : (
+        input: Request<Endpoint>,
+        policy?: HttpStreamPolicy,
+      ) => StreamedKey<Endpoint, Key, ClientError>
+  readonly streamedOptions: UnaryQueryBuilder<
+    Request<Endpoint>,
+    readonly StreamChunk<Success<Endpoint>>[],
+    HttpStreamQueryError<Endpoint, ClientError>,
+    StreamedKey<Endpoint, Key, ClientError>,
+    readonly [...Key, 'streamed'],
+    HttpStreamPolicy
+  >
+}
+
+export type HttpLivePolicy = {
+  readonly sseOptions?: Sse.DecodeOptions | undefined
+}
+
+export type LiveFailure<Endpoint extends HttpApiEndpoint.ConstraintRequest, ClientError> =
+  | HttpStreamQueryError<Endpoint, ClientError>
+  | EffectHttpApiQueryEmptyStreamError
+
+export type LiveKey<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+> = DataTag<
+  readonly [...Key, 'live', ...JsonValue[]],
+  QueryData<StreamChunk<Success<Endpoint>>>,
+  LiveFailure<Endpoint, ClientError>
+>
+
+export type LiveLeaf<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+> = {
+  readonly liveKey: void extends Request<Endpoint>
+    ? (policy?: HttpLivePolicy) => LiveKey<Endpoint, Key, ClientError>
+    : (input: Request<Endpoint>, policy?: HttpLivePolicy) => LiveKey<Endpoint, Key, ClientError>
+  readonly liveOptions: UnaryQueryBuilder<
+    Request<Endpoint>,
+    QueryData<StreamChunk<Success<Endpoint>>>,
+    LiveFailure<Endpoint, ClientError>,
+    LiveKey<Endpoint, Key, ClientError>,
+    readonly [...Key, 'live'],
+    HttpLivePolicy
+  >
+}
+
+export type Leaf<
+  Endpoint extends HttpApiEndpoint.ConstraintRequest,
+  Key extends readonly JsonValue[],
+  ClientError,
+  MetadataClientError = ClientError,
+> = [SseEndpoint<Endpoint>] extends [never]
+  ? BufferedLeaf<Endpoint, Key, ClientError, MetadataClientError>
+  : StreamedLeaf<Endpoint, Key, ClientError> & LiveLeaf<Endpoint, Key, ClientError>
+
 /** An eager utility tree mirroring the ready HTTP client's literal properties. */
 export type HttpApiQueryUtils<
   Api extends HttpApi.Constraint,
@@ -254,7 +415,9 @@ export type HttpApiQueryUtils<
     readonly [Endpoint in Supported<Endpoints<Group>> as Endpoint['identifier']]: Leaf<
       Endpoint,
       EndpointKey<Api, Prefix, Group, Endpoint>,
-      Effect.Error<ClientEffect<Group, Endpoint, Client>>
+      | Effect.Error<ClientEffect<Group, Endpoint, Client>>
+      | StreamFailure<Effect.Success<ClientEffect<Group, Endpoint, Client>>>,
+      Effect.Error<ClientEffect<Group, Endpoint, Client, 'decoded-and-response'>>
     >
   }
 } & {
@@ -265,7 +428,11 @@ export type HttpApiQueryUtils<
   ]: Leaf<
     Endpoint,
     readonly [...Root<Api, Prefix>, Endpoint['identifier']],
-    Effect.Error<ClientEffect<{ readonly topLevel: true }, Endpoint, Client>>
+    | Effect.Error<ClientEffect<{ readonly topLevel: true }, Endpoint, Client>>
+    | StreamFailure<Effect.Success<ClientEffect<{ readonly topLevel: true }, Endpoint, Client>>>,
+    Effect.Error<
+      ClientEffect<{ readonly topLevel: true }, Endpoint, Client, 'decoded-and-response'>
+    >
   >
 }
 
@@ -339,20 +506,26 @@ export type Encoders<Api extends HttpApi.Constraint> = {
     Group in Exclude<EncoderGroups<Api>, RequiredEncoderGroups<Api>> as Group['identifier']
   ]?: GroupEncoders<Group>
 }
-export type EncoderOption<Api extends HttpApi.Constraint> = [EncoderGroups<Api>] extends [never]
-  ? { readonly keyEncoders?: never }
-  : [RequiredEncoderGroups<Api>] extends [never]
-    ? { readonly keyEncoders?: Encoders<Api> }
-    : { readonly keyEncoders: Encoders<Api> }
+export type EncoderOption<Api extends HttpApi.Constraint> = KeyEncoderRequirement<
+  EncoderGroups<Api>,
+  RequiredEncoderGroups<Api>,
+  Encoders<Api>
+>
+export type StreamServices<Value> =
+  Value extends HttpApiSchema.withHeaders<infer Body, infer _Headers>
+    ? StreamServices<Body>
+    : Value extends Stream.Stream<infer _Chunk, infer _Error, infer Services>
+      ? Services
+      : never
+
 export type ClientServices<Api extends HttpApi.Constraint, Client> =
   | HttpApiEndpoint.ClientServices<Supported<Endpoints<Groups<Api>>>>
   | HttpApiEndpoint.ErrorServicesDecode<Supported<Endpoints<Groups<Api>>>>
   | Effect.Services<ExposedEffects<Api, Client>>
-export type RunnerOption<Api extends HttpApi.Constraint, Client> = [
-  ClientServices<Api, Client>,
-] extends [never]
-  ? { readonly runPromiseExit?: RunPromiseExit }
-  : { readonly runPromiseExit: RunPromiseExit<ClientServices<Api, Client>> }
+  | StreamServices<Effect.Success<ExposedEffects<Api, Client>>>
+export type RunnerOption<Api extends HttpApi.Constraint, Client> = RunnerRequirement<
+  ClientServices<Api, Client>
+>
 
 /** Derives HTTP utilities while the caller retains client and runtime ownership. */
 export type CreateHttpApiQueryUtilsOptions<
diff --git a/src/index.ts b/src/index.ts
index 3c4358b..3e0cfac 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -5,24 +5,32 @@ export { skipToken } from '@tanstack/query-core'
 export { createRpcQueryUtils } from './rpc/create-utils'
 /** Creates the public HTTP utility tree. @api public */
 export { createHttpApiQueryUtils } from './http/create-utils'
+export { fetchStreamSnapshot } from './core/stream-snapshot'
+export type { StreamSnapshotOptions } from './core/stream-snapshot'
+export { viewPrefix } from './core/view-prefix'
+export { withMutationPolicy, withQueryPolicy } from './core/policy'
+export type { MutationPolicy, QueryPolicy } from './core/policy'
+export type {
+  InferInput,
+  InferMutationData,
+  InferMutationError,
+  InferQueryData,
+  InferQueryError,
+} from './core/inference'
 export {
   EffectHttpApiQueryConfigError,
+  EffectHttpApiQueryEmptyStreamError,
   EffectHttpApiQueryError,
   EffectHttpApiQueryKeyError,
   isEffectHttpApiQueryError,
 } from './http/errors'
 export type {
-  // fallow-ignore-next-line unused-type
   EffectHttpApiQueryConfigErrorCode,
-  // fallow-ignore-next-line unused-type
   EffectHttpApiQueryKeyErrorCode,
 } from './http/errors'
 export type {
-  // fallow-ignore-next-line unused-type
   CreateHttpApiQueryUtilsOptions,
-  // fallow-ignore-next-line unused-type
   HttpApiKeyEncoder,
-  // fallow-ignore-next-line unused-type
   HttpApiQueryUtils,
 } from './http/types'
 /** Errors raised by the public runtime API and guards for execution errors. @api public */
@@ -34,30 +42,16 @@ export {
   isEffectRpcQueryError,
 } from './rpc/errors'
 /** Stable error metadata exposed to downstream consumers. @api public */
-export type {
-  // fallow-ignore-next-line unused-type
-  EffectRpcQueryConfigErrorCode,
-  // fallow-ignore-next-line unused-type
-  EffectRpcQueryKeyErrorCode,
-} from './rpc/errors'
-export type {
-  JsonValue,
-  // fallow-ignore-next-line unused-type
-  QueryData,
-  RunPromiseExit,
-} from './core/types'
+export type { EffectRpcQueryConfigErrorCode, EffectRpcQueryKeyErrorCode } from './rpc/errors'
+export type { JsonValue, QueryData, RunPromiseExit } from './core/types'
 /** Types for annotating generated utilities and custom adapters. @api public */
 export type {
-  // fallow-ignore-next-line unused-type
   CreateRpcQueryUtilsOptions,
-  // fallow-ignore-next-line unused-type
   KeyEncoder,
-  // fallow-ignore-next-line unused-type
   RpcQueryUtils,
   StreamingRpcOptions,
   UnaryRpcOptions,
 } from './rpc/types'
 
 /** The type of Query Core's exact skip sentinel. @api public */
-// fallow-ignore-next-line unused-type
 export type { SkipToken } from '@tanstack/query-core'
diff --git a/src/rpc/create-utils.ts b/src/rpc/create-utils.ts
index 271e471..4fa8cb0 100644
--- a/src/rpc/create-utils.ts
+++ b/src/rpc/create-utils.ts
@@ -21,15 +21,10 @@ export const createRpcQueryUtils = <
   group: Group,
   options: CreateRpcQueryUtilsOptions<Group, Prefix, ClientError>,
 ): RpcQueryUtils<Group, Prefix, ClientError> => {
-  // SAFETY: Group is a RpcGroup.Any; this erases its member union only for runtime
-  // enumeration. The returned tree retains that union in the public generic type.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion, anti-slop/no-chained-type-assertions
   const runtimeGroup = group as unknown as RpcGroup.RpcGroup<Rpc.Any>
-  // SAFETY: options.client is tied to this same Group by CreateRpcQueryUtilsOptions.
   const client = options.client as RpcClient.RpcClient.Flat<Rpc.Any, ClientError>
   const rpcs = extractRpcs(runtimeGroup, client)
-  // SAFETY: Public options require a runner for any remaining client services.
-  // The runtime tree preserves this runner unchanged while erasing its Context type.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   const runPromiseExit = options.runPromiseExit as RunPromiseExit<unknown> | undefined
   const tree = createUtilityTree(rpcs, {
@@ -39,8 +34,6 @@ export const createRpcQueryUtils = <
     runPromiseExit,
     errors: rpcTreeErrors,
   })
-  // SAFETY: extractRpcs projects every Group member, preserving each tag/payload;
-  // compile-time packed fixtures verify the generated builder overloads and channels.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   return tree as RpcQueryUtils<Group, Prefix, ClientError>
 }
diff --git a/src/rpc/errors.ts b/src/rpc/errors.ts
index 5a3d337..354482f 100644
--- a/src/rpc/errors.ts
+++ b/src/rpc/errors.ts
@@ -1,13 +1,15 @@
 import type { Cause } from 'effect'
 
-/** Stable codes for errors raised while configuring an RPC utility tree or its builders. */
+/** Stable codes for invalid RPC utility configuration. */
 export type EffectRpcQueryConfigErrorCode =
   | 'InvalidMaxChunks'
+  | 'InvalidRefetchMode'
   | 'InvalidKeyPrefix'
   | 'InvalidRpcPath'
   | 'RpcPathCollision'
   | 'MissingKeyEncoder'
   | 'UnknownKeyEncoder'
+  | 'UnsupportedQueryHash'
 
 /** Stable codes for synchronous query-key preparation failures. */
 export type EffectRpcQueryKeyErrorCode =
@@ -73,7 +75,7 @@ export class EffectRpcQueryEmptyStreamError extends Error {
   }
 }
 
-/** Reports invalid factory or builder configuration synchronously. */
+/** Reports invalid factory, builder, or stream cache configuration. */
 export class EffectRpcQueryConfigError extends Error {
   /** Identifies this error without relying on `instanceof`. */
   readonly _tag = 'EffectRpcQueryConfigError'
diff --git a/src/rpc/operation.ts b/src/rpc/operation.ts
index 840f537..b74b05f 100644
--- a/src/rpc/operation.ts
+++ b/src/rpc/operation.ts
@@ -48,7 +48,6 @@ const createRpcInput = (definition: Rpc.AnyWithProps): OperationInput => {
           error,
         )
       }
-      // The ready client constructs this normalized payload again during execution.
       return { input: normalized, keyValue }
     },
   }
@@ -69,11 +68,15 @@ const describeRpc = <Rpcs extends Rpc.Any, ClientError>(
     id: rpcTag,
     path: rpcTag.split('.'),
     input: createRpcInput(definition),
+    unsupportedQueryHash: (option: 'queryKeyHashFn' | 'queryHash') =>
+      new EffectRpcQueryConfigError(
+        'UnsupportedQueryHash',
+        `${option} must be configured through QueryClient defaults`,
+        { rpcTag },
+      ),
     takeOptions: takeRpcOptions,
   }
   if (!RpcSchema.isStreamSchema(definition.successSchema)) {
-    // SAFETY: The ready client belongs to this group. Its tag selects this exact
-    // declaration's payload and unary result; never erases only the generic call site.
     return {
       ...identity,
       kind: 'Unary',
@@ -83,8 +86,6 @@ const describeRpc = <Rpcs extends Rpc.Any, ClientError>(
       executionError: (operation, cause) => new EffectRpcQueryError(rpcTag, operation, cause),
     }
   }
-  // SAFETY: RpcSchema identified this tag's streaming success schema; the client
-  // is from the same group, so this call returns that declaration's Stream.
   return {
     ...identity,
     kind: 'Streaming',
@@ -97,8 +98,6 @@ const describeRpc = <Rpcs extends Rpc.Any, ClientError>(
   }
 }
 
-// SAFETY: A RpcGroup stores complete runtime definitions for all its members;
-// AnyWithProps restores that SDK metadata surface after generic member erasure.
 export const extractRpcs = <Rpcs extends Rpc.Any, ClientError>(
   group: RpcGroup.RpcGroup<Rpcs>,
   client: RpcClient.RpcClient.Flat<Rpcs, ClientError>,
diff --git a/src/rpc/streamed-query.ts b/src/rpc/streamed-query.ts
index 27a9dec..11fd23f 100644
--- a/src/rpc/streamed-query.ts
+++ b/src/rpc/streamed-query.ts
@@ -1,23 +1,13 @@
-import { experimental_streamedQuery } from '@tanstack/query-core'
-import type { QueryFunctionContext } from '@tanstack/query-core'
-import { Cause, Exit, Predicate, Stream } from 'effect'
+import { Stream } from 'effect'
 
 import type { StreamingOperation } from '../core/operation'
-import type { RunPromiseExit } from '../core/types'
+import { makeStreamQuery, prepareStreamPolicy } from '../core/streamed-query'
 import {
   EffectRpcQueryConfigError,
   EffectRpcQueryEmptyStreamError,
   EffectRpcQueryError,
 } from './errors'
-import type { StreamRefetchMode, StreamingRpcOptions } from './types'
-
-type StreamQueryPolicy =
-  | {
-      readonly maxChunks?: number
-      readonly _tag: 'Accumulated'
-      readonly refetchMode?: StreamRefetchMode
-    }
-  | { readonly _tag: 'Live' }
+import type { StreamingRpcOptions } from './types'
 
 export interface RpcStreamInvocation {
   readonly tag: string
@@ -27,183 +17,31 @@ export interface RpcStreamInvocation {
   ) => Stream.Stream<unknown, unknown, unknown>
 }
 
-interface MakeStreamQueryOptions {
-  readonly rpcOptions: StreamingRpcOptions | undefined
-  readonly input: unknown
-  readonly policy: StreamQueryPolicy
-  readonly rpc: RpcStreamInvocation
-  readonly runPromiseExit: RunPromiseExit<unknown>
-}
-
-const streamQueryIterable = <A>(
-  source: AsyncIterable<A>,
-  signal: AbortSignal,
-  liveRpcTag: string | undefined,
-): AsyncIterable<A> => ({
-  [Symbol.asyncIterator]() {
-    const iterator = source[Symbol.asyncIterator]()
-    let closePromise: Promise<IteratorResult<A>> | undefined
-    let emitted = false
-    // This callback runs after the listener has been initialized below.
-    const detach = () => {
-      // oxlint-disable-next-line eslint/no-use-before-define
-      signal.removeEventListener('abort', onAbort)
-    }
-    const close = async () => {
-      closePromise ??= (async () => {
-        try {
-          return (await iterator.return?.()) ?? { done: true, value: undefined }
-        } finally {
-          detach()
-        }
-      })()
-      return closePromise
-    }
-    const onAbort = () => {
-      // Abort listeners are synchronous; attach cleanup rejection handling immediately.
-      // oxlint-disable-next-line promise/prefer-await-to-then
-      void close().catch(() => {
-        // The pending iterator pull or explicit return reports failures to Query Core.
-      })
-    }
-    signal.addEventListener('abort', onAbort, { once: true })
-
-    return {
-      async next() {
-        let result: IteratorResult<A>
-        if (signal.aborted) {
-          result = await close()
-        } else {
-          try {
-            result = await iterator.next()
-          } catch (error) {
-            detach()
-            throw error
-          }
-        }
-        if (result.done === true) {
-          detach()
-          if (!emitted && liveRpcTag !== undefined) {
-            throw new EffectRpcQueryEmptyStreamError(liveRpcTag)
-          }
-        }
-        emitted = true
-        return result
-      },
-      return: close,
-      async throw(cause?: unknown) {
-        detach()
-        if (iterator.throw !== undefined) {
-          return await iterator.throw(cause)
-        }
-        await close()
-        throw cause
-      },
-    }
-  },
-})
-
-/** Adapts one Effect stream invocation to an accumulated or latest-value Query Core function. */
-const makeStreamQuery = ({
-  input,
-  policy,
-  rpc,
-  rpcOptions,
-  runPromiseExit,
-}: MakeStreamQueryOptions) => {
-  const operation = policy._tag === 'Live' ? 'live' : 'streamed'
-  const streamFn = async ({ signal }: { readonly signal: AbortSignal }) => {
-    const stream = rpc.invoke(input, rpcOptions).pipe(
-      Stream.catchCauseIf(
-        (cause) => !Cause.hasInterruptsOnly(cause),
-        (cause) => Stream.fail(new EffectRpcQueryError(rpc.tag, operation, cause)),
-      ),
-    )
-    // Capture the runner's Context so iterator pulls use the caller-owned runtime.
-    // The injected runner provides the erased caller-owned service requirements.
-    // oxlint-disable-next-line effecttsgo/any-unknown-in-error-context
-    const exit = await runPromiseExit(Stream.toAsyncIterableEffect(stream), { signal })
-    if (Exit.isFailure(exit)) {
-      throw new EffectRpcQueryError(rpc.tag, operation, exit.cause)
-    }
-    return streamQueryIterable(exit.value, signal, policy._tag === 'Live' ? rpc.tag : undefined)
-  }
-
-  if (policy._tag === 'Live') {
-    return experimental_streamedQuery({
-      initialValue: undefined,
-      reducer: (_latest: unknown, value: unknown) => value,
-      streamFn,
-    })
-  }
-
-  const { maxChunks, refetchMode = 'reset' } = policy
-  if (maxChunks === undefined) {
-    return experimental_streamedQuery({ refetchMode, streamFn })
-  }
-
-  return async (context: QueryFunctionContext) => {
-    const reset =
-      refetchMode === 'reset' &&
-      context.client
-        .getQueryCache()
-        .find({ queryKey: context.queryKey, exact: true })
-        ?.isFetched() === true
-    let emitted = false
-    const initialValue: unknown[] = []
-    const queryFn = experimental_streamedQuery({
-      initialValue,
-      reducer: (values: unknown[], value: unknown) => {
-        // Query Core restores initialData on reset; a refetch starts a fresh accumulation.
-        const history = reset && !emitted ? [] : values
-        emitted = true
-        return [...history.slice(Math.max(0, history.length + 1 - maxChunks)), value]
-      },
-      refetchMode,
-      streamFn,
-    })
-    const result = await queryFn(context)
-    return reset && !emitted ? [] : result
-  }
-}
-
-/** Owns policy validation and execution for both accumulated and live queries. */
 export const createStreamPreparation =
   (rpc: RpcStreamInvocation): StreamingOperation['prepareStream'] =>
   (options, operation, runPromiseExit, requestOptions) => {
-    // SAFETY: Public streamedOptions restricts this field to StreamRefetchMode;
-    // the options copy changes neither its value nor its contract.
-    // oxlint-disable-next-line typescript/no-unsafe-type-assertion
-    const refetchMode = options['refetchMode'] as StreamRefetchMode | undefined
-    delete options['refetchMode']
-    const { maxChunks } = options
-    delete options['maxChunks']
-    // Preparation also runs for skipped queries; invalid policy fails synchronously.
-    if (
-      maxChunks !== undefined &&
-      (!Predicate.isNumber(maxChunks) || !Number.isSafeInteger(maxChunks) || maxChunks <= 0)
-    ) {
-      throw new EffectRpcQueryConfigError(
-        'InvalidMaxChunks',
-        'maxChunks must be a positive safe integer',
-        { rpcTag: rpc.tag },
-      )
-    }
-    const policy: StreamQueryPolicy =
-      operation === 'live' ? { _tag: 'Live' } : { _tag: 'Accumulated' }
-    if (policy._tag === 'Accumulated') {
-      Object.assign(policy, refetchMode === undefined ? undefined : { refetchMode })
-      Object.assign(policy, maxChunks === undefined ? undefined : { maxChunks })
-    }
-    // SAFETY: takeRpcOptions extracted this unchanged from the typed public options.
+    const { policy, history } = prepareStreamPolicy(
+      options,
+      operation,
+      (code, message) => new EffectRpcQueryConfigError(code, message, { rpcTag: rpc.tag }),
+    )
     // oxlint-disable-next-line typescript/no-unsafe-type-assertion
     const rpcOptions = requestOptions as StreamingRpcOptions | undefined
-    return (input) =>
-      makeStreamQuery({
-        input,
-        rpcOptions,
-        policy,
-        rpc,
-        runPromiseExit,
-      })
+    return {
+      identity: history === undefined ? [] : [Object.freeze(history)],
+      makeQuery: (input) =>
+        makeStreamQuery({
+          policy,
+          source: Stream.suspend(() => rpc.invoke(input, rpcOptions)),
+          executionError: (cause) => new EffectRpcQueryError(rpc.tag, operation, cause),
+          unsupportedHash: () =>
+            new EffectRpcQueryConfigError(
+              'UnsupportedQueryHash',
+              'Stream queries require consistent QueryClient hashing',
+              { rpcTag: rpc.tag },
+            ),
+          emptyError: () => new EffectRpcQueryEmptyStreamError(rpc.tag),
+          runPromiseExit,
+        }),
+    }
   }
diff --git a/src/rpc/types.ts b/src/rpc/types.ts
index 70f3044..2a71ab3 100644
--- a/src/rpc/types.ts
+++ b/src/rpc/types.ts
@@ -1,5 +1,5 @@
 import type { DataTag, QueryKey } from '@tanstack/query-core'
-import type { Context, Schema } from 'effect'
+import type { Context, Schema, SchemaAST } from 'effect'
 import type { Headers } from 'effect/http'
 import type { Rpc, RpcClient, RpcGroup, RpcSchema } from 'effect/rpc'
 
@@ -9,11 +9,18 @@ import type {
   InfiniteQueryKey,
   UnaryQueryBuilder,
   JsonValue,
+  KeyBuilder,
+  KeyEncoderRequirement,
   QueryData,
-  RunPromiseExit,
+  RunnerRequirement,
   MutationBuilder,
+  StreamedPolicyOptions,
 } from '../core/types'
-import type { EffectRpcQueryEmptyStreamError, EffectRpcQueryError } from './errors'
+import type {
+  EffectRpcQueryConfigError,
+  EffectRpcQueryEmptyStreamError,
+  EffectRpcQueryError,
+} from './errors'
 
 /** Request-local options for unary queries, infinite queries, and mutations. */
 export interface UnaryRpcOptions {
@@ -23,10 +30,11 @@ export interface UnaryRpcOptions {
   readonly discard?: never
   /** Stream adaptation belongs to the package. */
   readonly asQueue?: never
+  readonly streamBufferSize?: never
 }
 
 /** Request-local options for accumulated-stream and live queries. */
-export interface StreamingRpcOptions extends UnaryRpcOptions {
+export interface StreamingRpcOptions extends Omit<UnaryRpcOptions, 'streamBufferSize'> {
   readonly streamBufferSize?: number | undefined
 }
 
@@ -37,10 +45,8 @@ export type RpcOptionsInput<Options = UnaryRpcOptions> = {
 /** Converts a normalized RPC payload into a synchronous, JSON-safe key value. */
 export type KeyEncoder<R extends Rpc.Any> = (payload: Rpc.Payload<R>) => JsonValue
 
-/** Extracts the literal RPC union retained by a group. */
 export type RpcsOf<Group extends RpcGroup.Any> = RpcGroup.Rpcs<Group>
 
-/** Extracts the payload Schema retained by an RPC definition. */
 export type PayloadSchema<R extends Rpc.Any> =
   R extends Rpc.Rpc<
     infer _Tag,
@@ -53,43 +59,45 @@ export type PayloadSchema<R extends Rpc.Any> =
     ? Payload
     : never
 
-/** Retains only streaming RPC definitions. */
+export type PayloadlessRpc<R extends Rpc.Any> = [PayloadSchema<R>['ast']] extends [SchemaAST.Void]
+  ? true
+  : false
+
 export type StreamingRpc<R extends Rpc.Any> =
   Rpc.SuccessSchema<R> extends RpcSchema.Stream<Schema.Top, Schema.Top> ? R : never
 
-/** Selects RPCs whose query keys include constructed payload identity. */
 export type PayloadBearingRpcs<Group extends RpcGroup.Any> =
   RpcsOf<Group> extends infer R
     ? R extends Rpc.Any
-      ? void extends Rpc.PayloadConstructor<R>
+      ? PayloadlessRpc<R> extends true
         ? never
         : R
       : never
     : never
 
-/** Extracts failures introduced by client-side RPC middleware. */
 export type ClientMiddlewareError<R extends Rpc.Any> =
   R extends Rpc.Rpc<string, Schema.Top, Schema.Top, Schema.Top, infer Middleware, unknown>
     ? Middleware['~ClientError']
     : never
 
-/** Every typed failure that can reach an RPC client call. */
 export type RpcFailure<R extends Rpc.Any, ClientError> =
   | Rpc.Error<R>
   | ClientMiddlewareError<R>
   | ClientError
 
-/** Every typed failure that can reach a streaming RPC consumer. */
 export type RpcStreamFailure<R extends Rpc.Any, ClientError> =
   | Rpc.ErrorExit<R>
   | ClientMiddlewareError<R>
   | ClientError
 
+export type RpcStreamQueryError<R extends Rpc.Any, ClientError> =
+  | EffectRpcQueryConfigError
+  | EffectRpcQueryError<RpcStreamFailure<R, ClientError>>
+
 export type RpcLiveError<R extends Rpc.Any, ClientError> =
   | EffectRpcQueryEmptyStreamError
-  | EffectRpcQueryError<RpcStreamFailure<R, ClientError>>
+  | RpcStreamQueryError<R, ClientError>
 
-/** Splits a literal dotted RPC tag into its path tuple. */
 export type Segments<Tag extends string> = Tag extends `${infer Head}.${infer Tail}`
   ? readonly [Head, ...Segments<Tail>]
   : readonly [Tag]
@@ -120,13 +128,12 @@ export type LiveOperationKey<Prefix extends readonly JsonValue[], R extends Rpc.
   'live',
 ]
 
-/** A payload-specific key carrying Query Core's inferred data and error tags. */
 export type ConcreteQueryKey<
   Prefix extends readonly JsonValue[],
   R extends Rpc.Any,
   ClientError,
 > = DataTag<
-  void extends Rpc.PayloadConstructor<R>
+  PayloadlessRpc<R> extends true
     ? QueryOperationKey<Prefix, R>
     : readonly [...QueryOperationKey<Prefix, R>, JsonValue],
   QueryData<Rpc.Success<R>>,
@@ -138,7 +145,6 @@ export type MutationKey<Prefix extends readonly JsonValue[], R extends Rpc.Any>
   'mutation',
 ]
 
-/** Supplies RPC inference to the shared unary query builder. */
 export type QueryOptionsBuilder<
   R extends Rpc.Any,
   Prefix extends readonly JsonValue[],
@@ -149,15 +155,20 @@ export type QueryOptionsBuilder<
   EffectRpcQueryError<RpcFailure<R, ClientError>>,
   ConcreteQueryKey<Prefix, R, ClientError>,
   QueryOperationKey<Prefix, R>,
-  RpcOptionsInput
+  RpcOptionsInput,
+  PayloadlessRpc<R>
 >
 
-export type QueryKeyBuilder<R extends Rpc.Any, Prefix extends readonly JsonValue[], ClientError> =
-  void extends Rpc.PayloadConstructor<R>
-    ? () => ConcreteQueryKey<Prefix, R, ClientError>
-    : (input: Rpc.PayloadConstructor<R>) => ConcreteQueryKey<Prefix, R, ClientError>
+export type QueryKeyBuilder<
+  R extends Rpc.Any,
+  Prefix extends readonly JsonValue[],
+  ClientError,
+> = KeyBuilder<
+  Rpc.PayloadConstructor<R>,
+  ConcreteQueryKey<Prefix, R, ClientError>,
+  PayloadlessRpc<R>
+>
 
-/** A payload-specific infinite key carrying Query Core's inferred data and error tags. */
 export type ConcreteInfiniteKey<
   Prefix extends readonly JsonValue[],
   R extends Rpc.Any,
@@ -168,10 +179,10 @@ export type ConcreteInfiniteKey<
   QueryData<Rpc.Success<R>>,
   EffectRpcQueryError<RpcFailure<R, ClientError>>,
   InfiniteOperationKey<Prefix, R>,
-  PageParam
+  PageParam,
+  PayloadlessRpc<R>
 >
 
-/** Supplies RPC payload and request-local options to the shared infinite query builder. */
 export type InfiniteOptionsBuilder<
   R extends Rpc.Any,
   Prefix extends readonly JsonValue[],
@@ -181,57 +192,44 @@ export type InfiniteOptionsBuilder<
   QueryData<Rpc.Success<R>>,
   EffectRpcQueryError<RpcFailure<R, ClientError>>,
   InfiniteOperationKey<Prefix, R>,
-  RpcOptionsInput
+  RpcOptionsInput,
+  PayloadlessRpc<R>
 >
 
 export type InfiniteKeyBuilder<
   R extends Rpc.Any,
   Prefix extends readonly JsonValue[],
   ClientError,
-> =
-  void extends Rpc.PayloadConstructor<R>
-    ? () => ConcreteInfiniteKey<Prefix, R, ClientError>
-    : (input: Rpc.PayloadConstructor<R>) => ConcreteInfiniteKey<Prefix, R, ClientError>
+> = KeyBuilder<
+  Rpc.PayloadConstructor<R>,
+  ConcreteInfiniteKey<Prefix, R, ClientError>,
+  PayloadlessRpc<R>
+>
 
-/** The accumulated data cached for a streaming RPC. */
 export type StreamedData<R extends Rpc.Any> = readonly Rpc.SuccessChunk<R>[]
 
-/** A payload-specific accumulated-stream key carrying Query Core's inferred tags. */
 export type ConcreteStreamedKey<
   Prefix extends readonly JsonValue[],
   R extends Rpc.Any,
   ClientError,
 > = DataTag<
-  void extends Rpc.PayloadConstructor<R>
-    ? StreamedOperationKey<Prefix, R>
-    : readonly [...StreamedOperationKey<Prefix, R>, JsonValue],
+  readonly [...StreamedOperationKey<Prefix, R>, ...JsonValue[]],
   StreamedData<R>,
-  EffectRpcQueryError<RpcStreamFailure<R, ClientError>>
+  RpcStreamQueryError<R, ClientError>
 >
 
-/** A payload-specific latest-value key carrying Query Core's inferred tags. */
 export type ConcreteLiveKey<
   Prefix extends readonly JsonValue[],
   R extends Rpc.Any,
   ClientError,
 > = DataTag<
-  void extends Rpc.PayloadConstructor<R>
+  PayloadlessRpc<R> extends true
     ? LiveOperationKey<Prefix, R>
     : readonly [...LiveOperationKey<Prefix, R>, JsonValue],
-  Rpc.SuccessChunk<R>,
+  QueryData<Rpc.SuccessChunk<R>>,
   RpcLiveError<R, ClientError>
 >
 
-export type StreamRefetchMode = 'append' | 'replace' | 'reset'
-
-export type StreamedPolicyOptions = {
-  /** Controls whether a refetch clears, appends to, or replaces accumulated data. */
-  readonly refetchMode?: StreamRefetchMode
-  /** Retains at most this many newest elements; must be a positive safe integer. */
-  readonly maxChunks?: number
-}
-
-/** Shares query inference across accumulated and live queries, including conditional inputs. */
 export type StreamingQueryBuilder<
   Input,
   Data,
@@ -239,13 +237,15 @@ export type StreamingQueryBuilder<
   Key extends QueryKey,
   SkippedKey extends QueryKey,
   Policy = unknown,
+  Inputless extends boolean = void extends Input ? true : false,
 > = UnaryQueryBuilder<
   Input,
   Data,
   Error,
   Key,
   SkippedKey,
-  Policy & RpcOptionsInput<StreamingRpcOptions>
+  Policy & RpcOptionsInput<StreamingRpcOptions>,
+  Inputless
 >
 
 export type StreamedOptionsBuilder<
@@ -255,10 +255,11 @@ export type StreamedOptionsBuilder<
 > = StreamingQueryBuilder<
   Rpc.PayloadConstructor<R>,
   StreamedData<R>,
-  EffectRpcQueryError<RpcStreamFailure<R, ClientError>>,
+  RpcStreamQueryError<R, ClientError>,
   ConcreteStreamedKey<Prefix, R, ClientError>,
   StreamedOperationKey<Prefix, R>,
-  StreamedPolicyOptions
+  StreamedPolicyOptions,
+  PayloadlessRpc<R>
 >
 
 export type LiveOptionsBuilder<
@@ -267,14 +268,24 @@ export type LiveOptionsBuilder<
   ClientError,
 > = StreamingQueryBuilder<
   Rpc.PayloadConstructor<R>,
-  Rpc.SuccessChunk<R>,
+  QueryData<Rpc.SuccessChunk<R>>,
   RpcLiveError<R, ClientError>,
   ConcreteLiveKey<Prefix, R, ClientError>,
-  LiveOperationKey<Prefix, R>
+  LiveOperationKey<Prefix, R>,
+  unknown,
+  PayloadlessRpc<R>
+>
+
+export type StreamKeyBuilder<R extends Rpc.Any, Key> = KeyBuilder<
+  Rpc.PayloadConstructor<R>,
+  Key,
+  PayloadlessRpc<R>
 >
 
-export type StreamKeyBuilder<R extends Rpc.Any, Key> =
-  void extends Rpc.PayloadConstructor<R> ? () => Key : (input: Rpc.PayloadConstructor<R>) => Key
+export type StreamedKeyBuilder<R extends Rpc.Any, Key> =
+  PayloadlessRpc<R> extends true
+    ? (policy?: StreamedPolicyOptions) => Key
+    : (input: Rpc.PayloadConstructor<R>, policy?: StreamedPolicyOptions) => Key
 
 /** The key and option builders exposed at one streaming RPC path. */
 export interface RpcStreamLeaf<
@@ -288,14 +299,10 @@ export interface RpcStreamLeaf<
   /** Builds a semantic key for the latest-value view of the stream. */
   readonly liveKey: StreamKeyBuilder<R, ConcreteLiveKey<Prefix, R, ClientError>>
 
-  /**
-   * Builds latest-value query options. A stream that completes before its first value fails with
-   * {@link EffectRpcQueryEmptyStreamError}.
-   */
   readonly liveOptions: LiveOptionsBuilder<R, Prefix, ClientError>
 
   /** Builds a semantic key for the accumulated view of the stream. */
-  readonly streamedKey: StreamKeyBuilder<R, ConcreteStreamedKey<Prefix, R, ClientError>>
+  readonly streamedKey: StreamedKeyBuilder<R, ConcreteStreamedKey<Prefix, R, ClientError>>
 
   /** Builds accumulated streamed-query options with Query Core refetch semantics. */
   readonly streamedOptions: StreamedOptionsBuilder<R, Prefix, ClientError>
@@ -331,7 +338,6 @@ export interface RpcQueryLeaf<R extends Rpc.Any, Prefix extends readonly JsonVal
   readonly queryOptions: QueryOptionsBuilder<R, Prefix, ClientError>
 }
 
-// Each tag becomes one nested object; intersections merge siblings at shared branches.
 export type PathTree<
   Tag extends string,
   R extends Rpc.Any,
@@ -343,7 +349,6 @@ export type PathTree<
       Record<
         Head,
         {
-          /** Returns the immutable key prefix for this RPC namespace. */
           readonly key: () => readonly [...Prefix, 'rpc', ...Path, Head]
         } & PathTree<Tail, R, Prefix, ClientError, readonly [...Path, Head]>
       >
@@ -357,7 +362,6 @@ export type PathTree<
       >
     >
 
-/** Merges every projected RPC path into one nested utility object. */
 export type UnionToIntersection<Union> = (
   Union extends unknown ? (value: Union) => void : never
 ) extends (value: infer Intersection) => void
@@ -380,16 +384,16 @@ export type RpcQueryUtils<
     : never
 >
 
-/** Whether default synchronous encoding is unsafe or requires Effect services. */
 export type NeedsKeyEncoder<R extends Rpc.Any> = [PayloadSchema<R>['EncodingServices']] extends [
   never,
 ]
-  ? true extends ContainsRedacted<Rpc.Payload<R>>
-    ? true
-    : false
+  ? PayloadSchema<R>['ast'] extends SchemaAST.Any | SchemaAST.Unknown
+    ? false
+    : true extends ContainsRedacted<Rpc.Payload<R>>
+      ? true
+      : false
   : true
 
-/** Selects RPCs whose default key encoding is unsafe or cannot run synchronously. */
 export type RequiredEncoderRpcs<Group extends RpcGroup.Any> =
   PayloadBearingRpcs<Group> extends infer R
     ? R extends Rpc.Any
@@ -399,7 +403,6 @@ export type RequiredEncoderRpcs<Group extends RpcGroup.Any> =
       : never
     : never
 
-/** An exact encoder map requiring entries for unsafe payloads or those needing encoding services. */
 export type KeyEncoders<Group extends RpcGroup.Any> = {
   readonly [R in RequiredEncoderRpcs<Group> as R['_tag']]: KeyEncoder<R>
 } & Partial<{
@@ -409,35 +412,16 @@ export type KeyEncoders<Group extends RpcGroup.Any> = {
 }>
 
 /** Makes the encoder map optional only when no RPC requires an override. */
-export type KeyEncoderOption<Group extends RpcGroup.Any> = [PayloadBearingRpcs<Group>] extends [
-  never,
-]
-  ? { readonly keyEncoders?: never }
-  : [RequiredEncoderRpcs<Group>] extends [never]
-    ? {
-        /** Overrides synchronous semantic encoding for selected RPC payloads. */
-        readonly keyEncoders?: KeyEncoders<Group>
-      }
-    : {
-        /**
-         * Supplies safe synchronous identity for payloads that need encoding services or contain
-         * redacted values.
-         */
-        readonly keyEncoders: KeyEncoders<Group>
-      }
+export type KeyEncoderOption<Group extends RpcGroup.Any> = KeyEncoderRequirement<
+  PayloadBearingRpcs<Group>,
+  RequiredEncoderRpcs<Group>,
+  KeyEncoders<Group>
+>
 
 /** Requires a custom runner when client-side Schema services remain. */
-export type RunnerOption<Group extends RpcGroup.Any> = [Rpc.ServicesClient<RpcsOf<Group>>] extends [
-  never,
-]
-  ? {
-      /** Overrides service-free execution; defaults to `Effect.runPromiseExit`. */
-      readonly runPromiseExit?: RunPromiseExit
-    }
-  : {
-      /** Runs RPC Effects that retain client-side Schema services. */
-      readonly runPromiseExit: RunPromiseExit<Rpc.ServicesClient<RpcsOf<Group>>>
-    }
+export type RunnerOption<Group extends RpcGroup.Any> = RunnerRequirement<
+  Rpc.ServicesClient<RpcsOf<Group>>
+>
 
 /** Configuration for deriving a utility tree from an Effect RPC group. */
 export type CreateRpcQueryUtilsOptions<
diff --git a/tests/cache-recipes.test.ts b/tests/cache-recipes.test.ts
new file mode 100644
index 0000000..0c903cf
--- /dev/null
+++ b/tests/cache-recipes.test.ts
@@ -0,0 +1,424 @@
+import { User } from '@effect-api-query/contracts'
+import { it } from '@effect/vitest'
+import { MutationObserver, QueryClient } from '@tanstack/query-core'
+import { Cause, Effect, Exit, Result, Schema, Scope, Stream } from 'effect'
+import { HttpServer } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiBuilder,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiTest,
+} from 'effect/http-api'
+import { Reactivity } from 'effect/reactivity'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import { describe, expect, it as test } from 'vite-plus/test'
+
+import {
+  createHttpApiQueryUtils,
+  createRpcQueryUtils,
+  isEffectHttpApiQueryError,
+  isEffectRpcQueryError,
+} from '#effect-api-query'
+import type { EffectHttpApiQueryError, EffectRpcQueryError } from '#effect-api-query'
+
+import { captureFailure } from './fixtures/async.ts'
+import { makeRpcTestClient } from './fixtures/effect-rpc.ts'
+import { makeControlledUserWrites } from './fixtures/optimistic-users.ts'
+import { makeUserEventConsumer } from './fixtures/user-events.ts'
+import { Profile } from './types/docs-hydration-rich.ts'
+import {
+  Cursor,
+  HistoryElement,
+  prepareViewHydration,
+  prepareViewSnapshot,
+  ProfilePage,
+  SnapshotDecoding,
+  SnapshotEncoding,
+} from './types/docs-hydration-views.ts'
+
+describe('cache recipes', () => {
+  test('refreshes event cursors once and defers gaps until an overlapping write settles', async () => {
+    const queryClient = new QueryClient()
+    const fixture = await Effect.runPromise(makeControlledUserWrites(queryClient))
+    const scope = Scope.makeUnsafe()
+    const reactivity = Effect.runSync(Reactivity.make)
+    const { application } = fixture
+    const { rpcQuery, httpQuery } = application
+    const ada = new User({ id: 1, name: 'Ada', locale: 'en' })
+    const key = rpcQuery.users.get.queryKey({ id: 1, locale: 'en' })
+    const diagnostic = rpcQuery.diagnostics.status.queryKey()
+    fixture.seed([ada])
+    queryClient.setQueryData(key, ada)
+    queryClient.setQueryData(diagnostic, { started: 0, interrupted: 0 })
+    queryClient.setQueryData(rpcQuery.users.list.queryKey(), [ada])
+    queryClient.setQueryData(httpQuery.users.list.queryKey(), [ada])
+    let finish: (() => Promise<void>) | undefined
+    try {
+      const consumer = await Effect.runPromise(
+        makeUserEventConsumer(application, reactivity).pipe(Scope.provide(scope)),
+      )
+      const event = {
+        schema: 'users.v1',
+        ownerKey: consumer.ownerKey,
+        cursor: 1,
+        kind: 'user.changed',
+        id: 1,
+        locale: 'en',
+      } as const
+      await expect(Effect.runPromise(consumer.deliver(event))).resolves.toBe(true)
+      await consumer.flush()
+      expect(queryClient.getQueryState(key)?.isInvalidated).toBe(true)
+      queryClient.setQueryData(key, ada)
+      await expect(Effect.runPromise(consumer.deliver(event))).resolves.toBe(false)
+      await consumer.flush()
+      expect(queryClient.getQueryState(key)?.isInvalidated).toBe(false)
+      const mutation = new MutationObserver(queryClient, application.userWrites.rpcCreate()).mutate(
+        {
+          name: 'Grace',
+        },
+      )
+      const creation = await fixture.nextCreate()
+      finish = async () => {
+        await creation.succeed(new User({ id: 2, name: 'Grace', locale: 'en' }))
+        await mutation
+      }
+      await expect(Effect.runPromise(consumer.deliver({ ...event, cursor: 3 }))).resolves.toBe(true)
+      await consumer.flush()
+      expect(queryClient.getQueryState(key)?.isInvalidated).toBe(false)
+      await finish()
+      await consumer.flush()
+      expect(queryClient.getQueryState(key)?.isInvalidated).toBe(true)
+      expect(queryClient.getQueryState(diagnostic)?.isInvalidated).toBe(false)
+      expect(consumer.cursor()).toBe(3)
+      await expect(Effect.runPromise(consumer.resume(false))).resolves.toBe(0)
+      await consumer.flush()
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+      queryClient.setQueryData(key, ada)
+      reactivity.invalidateUnsafe([consumer.reactivityKeys.all])
+      await consumer.flush()
+      expect(queryClient.getQueryState(key)?.isInvalidated).toBe(false)
+      await expect(Effect.runPromise(consumer.deliver({ ...event, cursor: 4 }))).resolves.toBe(
+        false,
+      )
+    } finally {
+      await finish?.()
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+      await application.dispose()
+    }
+  })
+
+  it.effect(
+    'hydrates undefined history elements and rich infinite page parameters with paired codecs',
+    () =>
+      Effect.gen(function* () {
+        const profile = new Profile({
+          name: 'Ada',
+          credits: 9_007_199_254_740_993n,
+          avatar: new Uint8Array([0, 1, 255]),
+        })
+        const group = RpcGroup.make(
+          Rpc.make('watch', { success: HistoryElement, stream: true }),
+          Rpc.make('latest', { success: Schema.UndefinedOr(Profile), stream: true }),
+          Rpc.make('page', { payload: { offset: Schema.BigIntFromString }, success: ProfilePage }),
+        )
+        const client = yield* makeRpcTestClient(group, {
+          watch: () => Stream.make(profile, undefined, null),
+          latest: () => Stream.succeed(undefined),
+          page: () => Effect.succeed({ rows: [profile], next: null }),
+        })
+        const history = createRpcQueryUtils(group, {
+          client,
+          keyPrefix: ['hydration-views', 'history'],
+        }).watch.streamedOptions()
+        const infinite = createRpcQueryUtils(group, {
+          client,
+          keyPrefix: ['hydration-views', 'infinite'],
+        }).page.infiniteOptions({
+          initialPageParam: new Cursor({ offset: 0n }),
+          input: (cursor) => ({ offset: cursor.offset }),
+          getNextPageParam: () => {},
+        })
+        const latest = createRpcQueryUtils(group, {
+          client,
+          keyPrefix: ['hydration-views', 'live'],
+        }).latest.liveOptions()
+        const refreshed = new Profile({ name: 'Grace', credits: 42n, avatar: new Uint8Array([7]) })
+        let browserReads = 0
+        const browserClient = yield* makeRpcTestClient(group, {
+          watch: () => {
+            browserReads += 1
+            return Stream.make(refreshed, undefined, null)
+          },
+          latest: () => {
+            browserReads += 1
+            return Stream.succeed(refreshed)
+          },
+          page: () =>
+            Effect.sync(() => {
+              browserReads += 1
+              return { rows: [refreshed], next: null }
+            }),
+        })
+        const browserHistory = createRpcQueryUtils(group, {
+          client: browserClient,
+          keyPrefix: ['hydration-views', 'history'],
+        }).watch.streamedOptions()
+        const browserLatest = createRpcQueryUtils(group, {
+          client: browserClient,
+          keyPrefix: ['hydration-views', 'live'],
+        }).latest.liveOptions()
+        const browserInfinite = createRpcQueryUtils(group, {
+          client: browserClient,
+          keyPrefix: ['hydration-views', 'infinite'],
+        }).page.infiniteOptions({
+          initialPageParam: new Cursor({ offset: 0n }),
+          input: (cursor) => ({ offset: cursor.offset }),
+          getNextPageParam: () => {},
+        })
+        const server = new QueryClient()
+        const browser = new QueryClient()
+        try {
+          yield* Effect.promise(async () => await server.query(history))
+          yield* Effect.promise(async () => await server.infiniteQuery(infinite))
+          expect(yield* Effect.promise(async () => await server.query(latest))).toBeNull()
+          const json = yield* prepareViewSnapshot(server).pipe(
+            Effect.provideService(SnapshotEncoding, { beforeEncode: Effect.void }),
+          )
+          yield* prepareViewHydration(browser, json).pipe(
+            Effect.provideService(SnapshotDecoding, { beforeDecode: Effect.void }),
+          )
+          const restored = browser.getQueryData(history.queryKey)
+          expect(restored?.slice(1)).toStrictEqual([undefined, null])
+          const first = restored?.[0]
+          expect(first).toBeInstanceOf(Profile)
+          if (!(first instanceof Profile)) {
+            throw new TypeError('Expected a decoded Profile')
+          }
+          expect(first.summary()).toBe('Ada: 9007199254740993 credits')
+          expect(first.avatar).toStrictEqual(new Uint8Array([0, 1, 255]))
+          const page = browser.getQueryData(infinite.queryKey)
+          expect(page?.pageParams[0]).toBeInstanceOf(Cursor)
+          expect(page?.pageParams[0]?.isStart()).toBe(true)
+          expect(page?.pages[0]?.rows[0]?.summary()).toBe('Ada: 9007199254740993 credits')
+          expect(browser.getQueryData(browserLatest.queryKey)).toBeNull()
+          expect(browserReads).toBe(0)
+          const newHistory = yield* Effect.promise(async () => await browser.query(browserHistory))
+          const newPages = yield* Effect.promise(
+            async () => await browser.infiniteQuery(browserInfinite),
+          )
+          const newLatest = yield* Effect.promise(async () => await browser.query(browserLatest))
+          expect(newHistory?.slice(1)).toStrictEqual([undefined, null])
+          const [newFirst] = newHistory
+          if (!(newFirst instanceof Profile) || !(newLatest instanceof Profile)) {
+            throw new TypeError('Expected browser-refetched Profile instances')
+          }
+          expect(newFirst.summary()).toBe('Grace: 42 credits')
+          expect(newFirst.avatar).toStrictEqual(new Uint8Array([7]))
+          expect(newPages.pageParams[0]).toBeInstanceOf(Cursor)
+          expect(newPages.pageParams[0]?.isStart()).toBe(true)
+          expect(newPages.pages[0]?.rows[0]?.summary()).toBe('Grace: 42 credits')
+          expect(newLatest.summary()).toBe('Grace: 42 credits')
+          expect(browserReads).toBe(3)
+        } finally {
+          server.clear()
+          browser.clear()
+        }
+      }),
+  )
+})
+
+it.effect.each(['eventual-success', 'retry-exhausted', 'not-found', 'disabled'] as const)(
+  'bounds generated RPC and HTTP query attempts for %s',
+  (scenario) =>
+    Effect.gen(function* () {
+      const errors = Schema.Literals(['retry-later', 'not-found'])
+      const failure: typeof errors.Type = scenario === 'not-found' ? 'not-found' : 'retry-later'
+      const failures = scenario === 'eventual-success' ? 2 : Infinity
+      const group = RpcGroup.make(Rpc.make('read', { success: Schema.String, error: errors }))
+      const api = HttpApi.make('retry-recipe').add(
+        HttpApiGroup.make('items').add(
+          HttpApiEndpoint.get('read', '/read', { success: Schema.String, error: errors }),
+        ),
+      )
+      const attempts = { rpc: 0, http: 0 }
+      const read = (adapter: 'rpc' | 'http') =>
+        Effect.suspend(() => {
+          attempts[adapter] += 1
+          return attempts[adapter] <= failures ? Effect.fail(failure) : Effect.succeed('server')
+        })
+      const rpcClient = yield* makeRpcTestClient(group, { read: () => read('rpc') })
+      const httpClient = yield* HttpApiTest.groups(api, ['items']).pipe(
+        Effect.provide(
+          HttpApiBuilder.group(api, 'items', (handlers) =>
+            handlers.handle('read', () => read('http')),
+          ),
+        ),
+      )
+      const rpc = createRpcQueryUtils(group, { client: rpcClient, keyPrefix: ['retry-rpc'] })
+      const http = createHttpApiQueryUtils(api, { client: httpClient, keyPrefix: ['retry-http'] })
+      for (const adapter of ['rpc', 'http'] as const) {
+        const retryCounts: number[] = []
+        const delayIndexes: number[] = []
+        const retry = (
+          count: number,
+          error: EffectRpcQueryError<unknown> | EffectHttpApiQueryError<unknown>,
+        ) => {
+          retryCounts.push(count)
+          if ((!isEffectRpcQueryError(error) && !isEffectHttpApiQueryError(error)) || count >= 2) {
+            return false
+          }
+          const reason = Cause.findError(error.cause)
+          return Result.isSuccess(reason) && reason.success === 'retry-later'
+        }
+        const policy = {
+          retry: scenario === 'disabled' ? false : retry,
+          retryDelay: (index: number) => {
+            delayIndexes.push(index)
+            return 0
+          },
+        }
+        const queryClient = new QueryClient()
+        try {
+          const result = yield* Effect.promise(
+            async () =>
+              await captureFailure(
+                adapter === 'rpc'
+                  ? queryClient.query(rpc.read.queryOptions(policy))
+                  : queryClient.query(http.items.read.queryOptions(policy)),
+              ),
+          )
+          const expectedAttempts = scenario === 'not-found' || scenario === 'disabled' ? 1 : 3
+          expect(attempts[adapter]).toBe(expectedAttempts)
+          const expectedCallbacks = {
+            disabled: { retries: [], delays: [0] },
+            'not-found': { retries: [0], delays: [0] },
+            'eventual-success': { retries: [0, 1], delays: [0, 1] },
+            'retry-exhausted': { retries: [0, 1, 2], delays: [0, 1, 2] },
+          }[scenario]
+          expect(retryCounts).toStrictEqual(expectedCallbacks.retries)
+          expect(delayIndexes).toStrictEqual(expectedCallbacks.delays)
+          if (scenario === 'eventual-success') {
+            expect(result).toBe('server')
+          } else {
+            expect(result).toMatchObject({
+              _tag: adapter === 'rpc' ? 'EffectRpcQueryError' : 'EffectHttpApiQueryError',
+            })
+          }
+        } finally {
+          queryClient.clear()
+        }
+      }
+    }).pipe(Effect.provide(HttpServer.layerServices)),
+)
+
+it.effect('merges global, registered and call-site defaults for native RPC and HTTP reads', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(
+      Rpc.make('users.read', {
+        payload: { id: Schema.Int },
+        success: Schema.String,
+      }),
+    )
+    const api = HttpApi.make('defaults-recipe').add(
+      HttpApiGroup.make('users').add(
+        HttpApiEndpoint.get('read', '/read/:id', {
+          params: { id: Schema.Int },
+          success: Schema.String,
+        }),
+      ),
+    )
+    const calls = { rpc: 0, http: 0 }
+    const read = (adapter: 'rpc' | 'http') =>
+      Effect.sync(() => {
+        calls[adapter] += 1
+        return 'server'
+      })
+    const rpcClient = yield* makeRpcTestClient(group, { 'users.read': () => read('rpc') })
+    const httpClient = yield* HttpApiTest.groups(api, ['users']).pipe(
+      Effect.provide(
+        HttpApiBuilder.group(api, 'users', (handlers) =>
+          handlers.handle('read', () => read('http')),
+        ),
+      ),
+    )
+    const rpc = createRpcQueryUtils(group, { client: rpcClient, keyPrefix: ['defaults-rpc'] })
+    const http = createHttpApiQueryUtils(api, { client: httpClient, keyPrefix: ['defaults-http'] })
+    for (const adapter of ['rpc', 'http'] as const) {
+      const queryClient = new QueryClient({
+        defaultOptions: {
+          queries: { staleTime: 30_000, gcTime: 600_000, retry: false },
+        },
+      })
+      const rootKey = adapter === 'rpc' ? rpc.key() : http.key()
+      const branchKey = adapter === 'rpc' ? rpc.users.key() : http.users.key()
+      const leafKey = adapter === 'rpc' ? rpc.users.read.key() : http.users.read.key()
+      const key =
+        adapter === 'rpc'
+          ? rpc.users.read.queryKey({ id: 1 })
+          : http.users.read.queryKey({ params: { id: 1 } })
+      queryClient.setQueryDefaults(rootKey, {
+        staleTime: 60_000,
+        queryKeyHashFn: (queryKey) => `defaults:${JSON.stringify(queryKey)}`,
+      })
+      queryClient.setQueryDefaults(branchKey, { retry: 2 })
+      queryClient.setQueryDefaults([...leafKey, 'query'], { staleTime: 120_000 })
+      try {
+        expect(
+          yield* Effect.promise(async () =>
+            adapter === 'rpc'
+              ? await queryClient.query(rpc.users.read.queryOptions({ input: { id: 1 } }))
+              : await queryClient.query(
+                  http.users.read.queryOptions({ input: { params: { id: 1 } } }),
+                ),
+          ),
+        ).toBe('server')
+        expect(
+          queryClient.getQueryCache().find({ queryKey: key, exact: true })?.options,
+        ).toMatchObject({
+          staleTime: 120_000,
+          gcTime: 600_000,
+          retry: 2,
+        })
+        queryClient.setQueryData(key, 'native')
+        expect(
+          yield* Effect.promise(async () =>
+            adapter === 'rpc'
+              ? await queryClient.query(rpc.users.read.queryOptions({ input: { id: 1 } }))
+              : await queryClient.query(
+                  http.users.read.queryOptions({ input: { params: { id: 1 } } }),
+                ),
+          ),
+        ).toBe('native')
+        expect(calls[adapter]).toBe(1)
+        expect(
+          yield* Effect.promise(async () =>
+            adapter === 'rpc'
+              ? await queryClient.query(
+                  rpc.users.read.queryOptions({ input: { id: 1 }, staleTime: 0, retry: false }),
+                )
+              : await queryClient.query(
+                  http.users.read.queryOptions({
+                    input: { params: { id: 1 } },
+                    staleTime: 0,
+                    retry: false,
+                  }),
+                ),
+          ),
+        ).toBe('server')
+        expect(
+          queryClient.getQueryCache().find({ queryKey: key, exact: true })?.options,
+        ).toMatchObject({
+          staleTime: 0,
+          gcTime: 600_000,
+          retry: false,
+        })
+        expect(calls[adapter]).toBe(2)
+        expect(queryClient.getQueryData(key)).toBe('server')
+        expect(queryClient.getQueryCache().getAll()).toHaveLength(1)
+      } finally {
+        queryClient.clear()
+      }
+    }
+  }).pipe(Effect.provide(HttpServer.layerServices)),
+)
diff --git a/tests/create-http-api-query-utils.test.ts b/tests/create-http-api-query-utils.test.ts
index 110ac86..15fe35b 100644
--- a/tests/create-http-api-query-utils.test.ts
+++ b/tests/create-http-api-query-utils.test.ts
@@ -87,7 +87,6 @@ describe(createHttpApiQueryUtils, () => {
     const utils = createHttpApiQueryUtils(Api, { client, keyPrefix: ['shared'] })
     const queryClient = new QueryClient()
     try {
-      // SAFETY: Undeclared response controls are injected to verify that decoded-only execution cannot be overridden.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       await expect(
         queryClient.query(
@@ -100,7 +99,6 @@ describe(createHttpApiQueryUtils, () => {
       const mutation = queryClient
         .getMutationCache()
         .build(queryClient, utils.users.create.mutationOptions())
-      // SAFETY: Undeclared response controls are injected to verify that decoded-only execution cannot be overridden.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       await expect(
         mutation.execute({
@@ -259,7 +257,6 @@ describe(createHttpApiQueryUtils, () => {
       ),
     )
     const calls: unknown[] = []
-    // SAFETY: This mock records arbitrary invocation values so request ownership can be asserted without changing the input.
     /* oxlint-disable anti-slop/no-unknown-parameters */
     const client = {
       'users.v1': {
@@ -274,7 +271,6 @@ describe(createHttpApiQueryUtils, () => {
       },
     }
     /* oxlint-enable anti-slop/no-unknown-parameters */
-    // SAFETY: The mock implements only the endpoint under test, and its invocation and result are asserted below.
     /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
     const utils = createHttpApiQueryUtils(api, {
       client: client as unknown as HttpApiClient.ForApi<typeof api>,
@@ -298,15 +294,6 @@ describe(createHttpApiQueryUtils, () => {
         'health.check',
         'query',
       ])
-      expect(Object.keys(utils['health.check'])).toStrictEqual([
-        'infiniteKey',
-        'infiniteOptions',
-        'key',
-        'mutationKey',
-        'mutationOptions',
-        'queryKey',
-        'queryOptions',
-      ])
       expect(Object.isFrozen(utils)).toBe(true)
       expect(Object.isFrozen(utils['users.v1'])).toBe(true)
     } finally {
@@ -372,7 +359,6 @@ describe(createHttpApiQueryUtils, () => {
     )
     const cause = Cause.combine(Cause.fail('denied'), Cause.die(new Error('defect')))
     const client = { actions: { fail: () => Effect.failCause(cause) } }
-    // SAFETY: The mock implements only the endpoint under test, and its invocation and result are asserted below.
     /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
     const utils = createHttpApiQueryUtils(api, {
       client: client as unknown as HttpApiClient.ForApi<typeof api>,
@@ -397,7 +383,6 @@ describe(createHttpApiQueryUtils, () => {
       }
       expect(error.cause).toBe(cause)
       const rejection = new Error('runner')
-      // SAFETY: The mock implements only the endpoint under test, and its invocation and result are asserted below.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const rejected = createHttpApiQueryUtils(api, {
         client: client as unknown as HttpApiClient.ForApi<typeof api>,
@@ -431,7 +416,6 @@ describe(createHttpApiQueryUtils, () => {
         success: Schema.String,
       }),
     )
-    // SAFETY: This one-RPC fixture returns the declared string; this test compares only its cached key partition.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     const rpc = createRpcQueryUtils(group, {
       client: (() => Effect.succeed('rpc')) as never,
@@ -475,7 +459,6 @@ describe(createHttpApiQueryUtils, () => {
         }),
       ),
     )
-    // SAFETY: A required encoder is deliberately omitted to verify the synchronous configuration-error boundary.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     expect(() =>
       createHttpApiQueryUtils(api, {
@@ -549,7 +532,6 @@ describe(createHttpApiQueryUtils, () => {
     })
     input.payload.name = 'Grace'
     expect(key.at(-1)).toMatchObject({ payload: { name: 'Ada' } })
-    // SAFETY: A string replaces the decoded numeric parameter to verify synchronous request encoding fails.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     expect(() => utils.users.save.queryKey({ ...input, params: { id: 'raw' } } as never)).toThrow(
       expect.objectContaining({ code: 'RequestEncodingFailed', endpoint: 'save' }),
@@ -563,7 +545,6 @@ describe(createHttpApiQueryUtils, () => {
     expect(() => unsafe.users.save.queryKey(input)).toThrow(
       expect.objectContaining({ code: 'InvalidKeyValue' }),
     )
-    // SAFETY: An empty prefix deliberately violates the nonempty tuple contract to verify configuration rejection.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     expect(() =>
       createHttpApiQueryUtils(api, {
@@ -572,7 +553,6 @@ describe(createHttpApiQueryUtils, () => {
       } as never),
     ).toThrow(expect.objectContaining({ code: 'InvalidKeyPrefix' }))
     /* oxlint-enable typescript/no-unsafe-type-assertion */
-    // SAFETY: Undeclared encoders deliberately exercise atomic validation of the encoder map.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     expect(() =>
       createHttpApiQueryUtils(api, {
diff --git a/tests/create-rpc-query-utils-configuration.test.ts b/tests/create-rpc-query-utils-configuration.test.ts
index fb113d8..26719cd 100644
--- a/tests/create-rpc-query-utils-configuration.test.ts
+++ b/tests/create-rpc-query-utils-configuration.test.ts
@@ -16,7 +16,6 @@ const unusedClient = Effect.fn('TestRpc.unusedClient')(function* () {
   return yield* Effect.die('configuration tests must not execute RPCs')
 })
 
-// SAFETY: This key-only client fixture always fails if executed; it never runs an RPC.
 /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
 const unusedClientFor = <Group extends RpcGroup.Any>(_group: Group) =>
   unusedClient as unknown as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<Group>>
@@ -191,7 +190,6 @@ describe('createRpcQueryUtils configuration', () => {
     const First = Rpc.make('duplicates.read', { success: Schema.Literal('first') })
     const Duplicate = Rpc.make('duplicates.read', { success: Schema.Literal('second') })
     const duplicateGroup = RpcGroup.make(First)
-    // SAFETY: The test mutates the upstream request map to simulate duplicate paths the normal API prevents.
     /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
     const requests = duplicateGroup.requests as unknown as Map<string, Rpc.Any>
     /* oxlint-enable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
@@ -227,7 +225,6 @@ describe('createRpcQueryUtils configuration', () => {
       return null
     }
     for (const rpcTag of ['health.ping', 'events.watch', 'unknown.read']) {
-      // SAFETY: Undeclared encoders deliberately exercise synchronous configuration validation.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const options = {
         client: unusedClientFor(unsupportedGroup),
@@ -252,12 +249,10 @@ describe('createRpcQueryUtils configuration', () => {
   it.effect('reports non-JSON encoder output with a stable key error', () =>
     Effect.gen(function* () {
       const client = yield* makeClient()
-      // SAFETY: Invalid JSON encoder output is deliberate so key generation can reject it before execution.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const utils = createRpcQueryUtils(group, {
         client,
         keyEncoders: {
-          // The cast simulates an encoder that violates its declared JSON contract at runtime.
           'users.get': () => ({ invalid: undefined }) as unknown as JsonValue,
         },
         keyPrefix: ['app'] as const,
@@ -340,7 +335,6 @@ describe('createRpcQueryUtils configuration', () => {
       const client = yield* makeRpcTestClient(secretGroup, {
         'secrets.read': () => Effect.succeed('ok'),
       })
-      // SAFETY: A required encoder is deliberately omitted to verify synchronous configuration rejection.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const unsafeOptions = {
         client,
@@ -390,7 +384,6 @@ describe('createRpcQueryUtils configuration', () => {
     for (const payload of [Secret, Schema.Struct({ nested: Schema.Array(Secret) }), Encoded]) {
       const rpcGroup = RpcGroup.make(Rpc.make('read', { payload, success: Schema.String }))
       type Options = CreateRpcQueryUtilsOptions<typeof rpcGroup, readonly ['app']>
-      // SAFETY: Undeclared encoders deliberately exercise synchronous configuration validation.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const options = {
         client: unusedClientFor(rpcGroup),
@@ -409,6 +402,62 @@ describe('createRpcQueryUtils configuration', () => {
     }
   })
 
+  it('retries suspended schema inspection after an earlier construction failure', () => {
+    let ready = false
+    const Payload = Schema.suspend(() => {
+      if (!ready) {
+        throw new Error('Payload is unavailable')
+      }
+      return Schema.Struct({ id: Schema.Int })
+    })
+    const rpcGroup = RpcGroup.make(Rpc.make('read', { payload: Payload }))
+    const options = { client: unusedClientFor(rpcGroup), keyPrefix: ['app'] as const }
+
+    expect(() => createRpcQueryUtils(rpcGroup, options)).toThrow(
+      expect.objectContaining({ code: 'MissingKeyEncoder' }),
+    )
+
+    ready = true
+    const utils = createRpcQueryUtils(rpcGroup, options)
+    expect(utils.read.queryKey({ id: 1 })).toStrictEqual(['app', 'rpc', 'read', 'query', { id: 1 }])
+  })
+
+  it('requires safe encoders throughout mutually recursive redacted schemas', () => {
+    interface RootValue {
+      readonly branches: readonly BranchValue[]
+      readonly secret: Redacted.Redacted
+    }
+    interface BranchValue {
+      readonly roots: readonly RootValue[]
+    }
+    const Root = Schema.Struct({
+      // oxlint-disable-next-line eslint/no-use-before-define
+      branches: Schema.Array(Schema.suspend((): Schema.Codec<BranchValue> => Branch)),
+      secret: Schema.Redacted(Schema.String),
+    })
+    const Branch = Schema.Struct({
+      roots: Schema.Array(Schema.suspend((): Schema.Codec<RootValue> => Root)),
+    })
+    const rootGroup = RpcGroup.make(Rpc.make('root', { payload: Root }))
+    const branchGroup = RpcGroup.make(Rpc.make('branch', { payload: Branch }))
+
+    createRpcQueryUtils(rootGroup, {
+      client: unusedClientFor(rootGroup),
+      keyEncoders: { root: () => 'safe' },
+      keyPrefix: ['app'],
+    })
+
+    /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
+    const options = {
+      client: unusedClientFor(branchGroup),
+      keyPrefix: ['app'],
+    } as unknown as CreateRpcQueryUtilsOptions<typeof branchGroup, readonly ['app']>
+    /* oxlint-enable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
+    expect(() => createRpcQueryUtils(branchGroup, options)).toThrow(
+      expect.objectContaining({ code: 'MissingKeyEncoder' }),
+    )
+  })
+
   it('keeps ordinary recursive schemas usable', () => {
     interface Tree {
       readonly name: string
@@ -455,7 +504,6 @@ describe('createRpcQueryUtils configuration', () => {
       const client = yield* makeRpcTestClient(servicefulGroup, {
         'encoding.serviceful': () => Effect.succeed('ok'),
       })
-      // SAFETY: A required encoder is deliberately omitted to verify synchronous configuration rejection.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const unsafeOptions = {
         client,
@@ -470,7 +518,6 @@ describe('createRpcQueryUtils configuration', () => {
         }),
       )
 
-      // SAFETY: Only key generation is exercised here; the deliberately omitted execution runner cannot be called.
       /* oxlint-disable anti-slop/no-chained-type-assertions, typescript/no-unsafe-type-assertion */
       const safeOptions = {
         client,
@@ -539,7 +586,6 @@ describe('createRpcQueryUtils configuration', () => {
           success: Schema.String,
         }),
       )
-      // SAFETY: The parsed fixture deliberately contains unsafe object keys so key validation can reject them.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       const unsafe = JSON.parse(`{"${property}":null}`) as JsonValue
       /* oxlint-enable typescript/no-unsafe-type-assertion */
@@ -566,7 +612,6 @@ describe('createRpcQueryUtils configuration', () => {
 
   it.effect('rejects an own __proto__ property defined by an encoder', () =>
     Effect.gen(function* () {
-      // SAFETY: The fixture deliberately defines an own __proto__ property to exercise key rejection.
       const encoded = Object.defineProperty({}, '__proto__', {
         enumerable: true,
         value: 'semantic-value',
diff --git a/tests/create-rpc-query-utils-execution.test.ts b/tests/create-rpc-query-utils-execution.test.ts
index f5e05cb..9f95577 100644
--- a/tests/create-rpc-query-utils-execution.test.ts
+++ b/tests/create-rpc-query-utils-execution.test.ts
@@ -8,7 +8,6 @@ import {
 } from '@tanstack/query-core'
 import { Context, Deferred, Effect, Equal, Exit, Schema } from 'effect'
 import { Rpc, RpcGroup } from 'effect/rpc'
-import { once } from 'node:events'
 
 import {
   createRpcQueryUtils,
@@ -261,7 +260,7 @@ describe('createRpcQueryUtils execution boundaries', () => {
       })
       const options = utils.health.ping.queryOptions()
 
-      expect(Object.keys(options).sort()).toStrictEqual(['queryFn', 'queryKey', 'queryKeyHashFn'])
+      expect(Object.keys(options).sort()).toStrictEqual(['queryFn', 'queryKey'])
       expect(yield* Effect.promise(async () => await new QueryClient().query(options))).toBeNull()
     }),
   )
@@ -282,7 +281,6 @@ describe('createRpcQueryUtils execution boundaries', () => {
         client,
         keyPrefix: ['app'] as const,
       })
-      // SAFETY: A numeric value deliberately violates the RPC string schema to test synchronous key preparation.
       /* oxlint-disable anti-slop/no-chained-type-assertions, anti-slop/no-known-value-widening, typescript/no-unsafe-type-assertion */
       const invalidInput = { value: 42 } as unknown as { readonly value: string }
       /* oxlint-enable anti-slop/no-chained-type-assertions, anti-slop/no-known-value-widening, typescript/no-unsafe-type-assertion */
@@ -546,7 +544,6 @@ describe('createRpcQueryUtils execution boundaries', () => {
       })
 
       const options = utils.profiles.update.mutationOptions()
-      // SAFETY: A numeric value deliberately violates the RPC string schema to test mutation execution failures.
       /* oxlint-disable anti-slop/no-chained-type-assertions, anti-slop/no-known-value-widening, typescript/no-unsafe-type-assertion */
       const invalidVariables = { name: 42 } as unknown as { readonly name: string }
       /* oxlint-enable anti-slop/no-chained-type-assertions, anti-slop/no-known-value-widening, typescript/no-unsafe-type-assertion */
@@ -667,12 +664,27 @@ describe('createRpcQueryUtils execution boundaries', () => {
     Effect.gen(function* () {
       let querySignal: AbortSignal | undefined
       let mutationReceivedOptions: boolean | undefined
+      const runPromise = Effect.runPromiseWith(yield* Effect.context())
       const runPromiseExit: RunPromiseExit = async (effect, options) => {
         if (options?.signal === undefined) {
           mutationReceivedOptions = options !== undefined
         } else {
-          querySignal = options.signal
-          await once(options.signal, 'abort')
+          const { signal } = options
+          querySignal = signal
+          await runPromise(
+            Effect.callback((resume) => {
+              const onAbort = () => {
+                resume(Effect.void)
+              }
+              signal.addEventListener('abort', onAbort, { once: true })
+              if (signal.aborted) {
+                onAbort()
+              }
+              return Effect.sync(() => {
+                signal.removeEventListener('abort', onAbort)
+              })
+            }),
+          )
         }
         return await Effect.runPromiseExit(effect, options)
       }
diff --git a/tests/create-rpc-query-utils-keys.test.ts b/tests/create-rpc-query-utils-keys.test.ts
index 5a0ef18..440b231 100644
--- a/tests/create-rpc-query-utils-keys.test.ts
+++ b/tests/create-rpc-query-utils-keys.test.ts
@@ -40,7 +40,6 @@ describe('createRpcQueryUtils semantic keys', () => {
         ).toStrictEqual({ ...user, name: 'Updated' })
         expect(queryClient.getQueryCache().findAll({ queryKey: utils.key() })).toHaveLength(1)
         const hydrated = new QueryClient()
-        // SAFETY: The input comes from Query Core dehydration; this test intentionally verifies JSON serialization and hydration.
         /* oxlint-disable typescript/no-unsafe-type-assertion, unicorn/prefer-structured-clone */
         hydrate(
           hydrated,
@@ -323,7 +322,6 @@ describe('createRpcQueryUtils semantic keys', () => {
         keyPrefix: ['app'] as const,
       })
 
-      // SAFETY: An invalid literal payload exercises construction failure without retaining the supplied secret.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       const construction = captureKeyError(() =>
         utils.errors.construction.queryKey({ secret: 'do-not-retain' as 'expected' }),
@@ -358,7 +356,6 @@ describe('createRpcQueryUtils semantic keys', () => {
     ]
 
     for (const keyPrefix of invalidPrefixes) {
-      // SAFETY: Invalid runtime prefixes deliberately bypass the tuple contract; client execution is never reached.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       expect(() =>
         createRpcQueryUtils(group, {
diff --git a/tests/create-rpc-query-utils-server-local.test.ts b/tests/create-rpc-query-utils-server-local.test.ts
new file mode 100644
index 0000000..cb75b3c
--- /dev/null
+++ b/tests/create-rpc-query-utils-server-local.test.ts
@@ -0,0 +1,255 @@
+import { CancelledError, QueryClient } from '@tanstack/query-core'
+import { Cause, Context, Deferred, Effect, Exit, Layer, Schema, Scope } from 'effect'
+import { Rpc, RpcClient, RpcGroup, RpcMiddleware } from 'effect/rpc'
+import { describe, expect, it, vi } from 'vite-plus/test'
+
+import { createRpcQueryUtils, isEffectRpcQueryError } from '#effect-api-query'
+
+import { makeServerLocalRpcClient } from '../examples/server/src/server-local-rpc.ts'
+import { captureFailure } from './fixtures/async.ts'
+
+describe('server-local ready-client construction', () => {
+  it('executes a production decoded-message client without calling the network fetch boundary', async () => {
+    const networkFetch = vi
+      .spyOn(globalThis, 'fetch')
+      .mockRejectedValue(new Error('Network disabled'))
+    const scope = Scope.makeUnsafe()
+    try {
+      class Profile extends Schema.Class<Profile>('ServerLocalProfile')({
+        name: Schema.String,
+      }) {
+        greeting(): string {
+          return `Hello, ${this.name}`
+        }
+      }
+      const Read = Rpc.make('profiles.read', {
+        payload: {
+          name: Schema.String.pipe(Schema.withConstructorDefault(Effect.succeed('Ada'))),
+        },
+        success: Profile,
+      })
+      const group = RpcGroup.make(Read)
+      const handlers = group.toLayer({
+        'profiles.read': ({ name }) => Effect.succeed(new Profile({ name })),
+      })
+      const client = await Effect.runPromise(
+        makeServerLocalRpcClient(group).pipe(Effect.provide(handlers), Scope.provide(scope)),
+      )
+      const queryClient = new QueryClient()
+      const utils = createRpcQueryUtils(group, { client, keyPrefix: ['local'] })
+      const profile = await queryClient.query(utils.profiles.read.queryOptions({ input: {} }))
+      expect(profile.greeting()).toBe('Hello, Ada')
+      expect(networkFetch).not.toHaveBeenCalled()
+    } finally {
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+      networkFetch.mockRestore()
+    }
+  })
+
+  it('isolates server-owned services and authenticated headers between concurrent local request scopes', async () => {
+    class RequestOwner extends Context.Service<RequestOwner, { readonly name: string }>()(
+      'effect-api-query/tests/ServerLocalRequestOwner',
+    ) {}
+    class Authorization extends RpcMiddleware.Service<Authorization>()(
+      'effect-api-query/tests/ServerLocalAuthorization',
+      { error: Schema.Literal('unauthorized') },
+    ) {}
+    const Read = Rpc.make('owner.read', { success: Schema.String }).middleware(Authorization)
+    const group = RpcGroup.make(Read)
+    const handlers = group.toLayer({
+      'owner.read': Effect.fnUntraced(function* () {
+        return (yield* RequestOwner).name
+      }),
+    })
+    const authorization = Layer.effect(
+      Authorization,
+      Effect.gen(function* () {
+        const owner = yield* RequestOwner
+        return Authorization.of((effect, { headers }) =>
+          headers['x-owner'] === owner.name ? effect : Effect.fail('unauthorized' as const),
+        )
+      }),
+    )
+    const firstScope = Scope.makeUnsafe()
+    const secondScope = Scope.makeUnsafe()
+    try {
+      const first = await Effect.runPromise(
+        makeServerLocalRpcClient(group).pipe(
+          Effect.provide(Layer.mergeAll(handlers, authorization)),
+          Effect.provideService(RequestOwner, { name: 'first-owner' }),
+          Scope.provide(firstScope),
+        ),
+      )
+      const second = await Effect.runPromise(
+        makeServerLocalRpcClient(group).pipe(
+          Effect.provide(Layer.mergeAll(handlers, authorization)),
+          Effect.provideService(RequestOwner, { name: 'second-owner' }),
+          Scope.provide(secondScope),
+        ),
+      )
+      const firstQueryClient = new QueryClient()
+      const secondQueryClient = new QueryClient()
+      const firstUtils = createRpcQueryUtils(group, {
+        client: first,
+        keyPrefix: ['local', 'first-owner'],
+        runPromiseExit: async (effect, options) =>
+          Effect.runPromiseExit(
+            RpcClient.withHeaders(effect, { 'x-owner': 'first-owner' }).pipe(
+              Effect.provideService(RequestOwner, { name: 'second-owner' }),
+            ),
+            options,
+          ),
+      })
+      const secondUtils = createRpcQueryUtils(group, {
+        client: second,
+        keyPrefix: ['local', 'second-owner'],
+        runPromiseExit: async (effect, options) =>
+          Effect.runPromiseExit(
+            RpcClient.withHeaders(effect, { 'x-owner': 'second-owner' }).pipe(
+              Effect.provideService(RequestOwner, { name: 'first-owner' }),
+            ),
+            options,
+          ),
+      })
+      await expect(
+        Promise.all([
+          firstQueryClient.query(firstUtils.owner.read.queryOptions()),
+          secondQueryClient.query(secondUtils.owner.read.queryOptions()),
+        ]),
+      ).resolves.toStrictEqual(['first-owner', 'second-owner'])
+      expect(
+        secondQueryClient.getQueryData(firstUtils.owner.read.queryOptions().queryKey),
+      ).toBeUndefined()
+      await expect(Effect.runPromise(Effect.flip(first('owner.read', undefined)))).resolves.toBe(
+        'unauthorized',
+      )
+      await expect(
+        Effect.runPromise(
+          Effect.flip(first('owner.read', undefined, { headers: { 'x-owner': 'second-owner' } })),
+        ),
+      ).resolves.toBe('unauthorized')
+
+      await Effect.runPromise(Scope.close(firstScope, Exit.void))
+      const disposed = await Effect.runPromiseExit(
+        first('owner.read', undefined, { headers: { 'x-owner': 'first-owner' } }),
+      )
+      expect(Exit.isFailure(disposed) && Cause.hasInterrupts(disposed.cause)).toBe(true)
+      await expect(
+        Effect.runPromise(
+          second('owner.read', undefined, { headers: { 'x-owner': 'second-owner' } }),
+        ),
+      ).resolves.toBe('second-owner')
+    } finally {
+      await Promise.all([
+        Effect.runPromise(Scope.close(firstScope, Exit.void)),
+        Effect.runPromise(Scope.close(secondScope, Exit.void)),
+      ])
+    }
+  })
+
+  it('preserves complete declared failure, defect, and interruption Causes through the local ready client', async () => {
+    const Fail = Rpc.make('diagnostics.fail', {
+      success: Schema.String,
+      error: Schema.Literal('declared-failure'),
+    })
+    const group = RpcGroup.make(Fail)
+    const cause = Cause.combine(
+      Cause.fail('declared-failure' as const),
+      Cause.combine(Cause.die(new Error('local defect')), Cause.interrupt(123)),
+    )
+    let failureCause = cause
+    const scope = Scope.makeUnsafe()
+    try {
+      const client = await Effect.runPromise(
+        makeServerLocalRpcClient(group).pipe(
+          Effect.provide(
+            group.toLayer({ 'diagnostics.fail': () => Effect.failCause(failureCause) }),
+          ),
+          Scope.provide(scope),
+        ),
+      )
+      const direct = await Effect.runPromiseExit(client('diagnostics.fail', undefined))
+      if (Exit.isSuccess(direct)) {
+        throw new Error('Expected the local client to fail')
+      }
+      expect(direct.cause.reasons.map((reason) => reason._tag)).toStrictEqual([
+        'Fail',
+        'Die',
+        'Interrupt',
+      ])
+      expect(Cause.interruptors(direct.cause)).toStrictEqual(new Set([123]))
+      let queryCause: Cause.Cause<unknown> | undefined
+      const utils = createRpcQueryUtils(group, {
+        client,
+        keyPrefix: ['local'],
+        runPromiseExit: async (effect, options) => {
+          const exit = await Effect.runPromiseExit(effect, options)
+          if (Exit.isFailure(exit)) {
+            queryCause = exit.cause
+          }
+          return exit
+        },
+      })
+      const error = await captureFailure(
+        new QueryClient().query(utils.diagnostics.fail.queryOptions()),
+      )
+      if (!isEffectRpcQueryError(error)) {
+        throw new Error('Expected a query execution error')
+      }
+      expect(queryCause).toBeDefined()
+      expect(error.cause).toBe(queryCause)
+      expect(
+        error.cause.reasons.filter(Cause.isFailReason).map((reason) => reason.error),
+      ).toStrictEqual(['declared-failure'])
+      failureCause = Cause.combine(
+        Cause.fail('declared-failure' as const),
+        Cause.die('fatal defect'),
+      )
+      const fatal = await captureFailure(
+        new QueryClient().query(utils.diagnostics.fail.queryOptions()),
+      )
+      if (!isEffectRpcQueryError(fatal)) {
+        throw new Error('Expected the fatal local query to return its failed Exit')
+      }
+      expect(fatal.cause).toBe(queryCause)
+      expect(fatal.cause.reasons.map((reason) => reason._tag)).toStrictEqual(['Fail', 'Die'])
+    } finally {
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+
+  it('delivers query cancellation to a local handler and releases its request-owned resource', async () => {
+    const started = Deferred.makeUnsafe<undefined>()
+    const released = Deferred.makeUnsafe<undefined>()
+    const Wait = Rpc.make('diagnostics.wait', { success: Schema.String })
+    const group = RpcGroup.make(Wait)
+    const scope = Scope.makeUnsafe()
+    try {
+      const client = await Effect.runPromise(
+        makeServerLocalRpcClient(group).pipe(
+          Effect.provide(
+            group.toLayer({
+              'diagnostics.wait': Effect.fnUntraced(function* () {
+                yield* Effect.acquireRelease(Deferred.succeed(started, undefined), () =>
+                  Deferred.succeed(released, undefined),
+                )
+                return yield* Effect.never
+              }),
+            }),
+          ),
+          Scope.provide(scope),
+        ),
+      )
+      const queryClient = new QueryClient()
+      const utils = createRpcQueryUtils(group, { client, keyPrefix: ['local'] })
+      const options = utils.diagnostics.wait.queryOptions()
+      const failure = captureFailure(queryClient.query(options))
+      await Effect.runPromise(Deferred.await(started))
+      await queryClient.cancelQueries({ queryKey: options.queryKey, exact: true })
+      await expect(failure).resolves.toBeInstanceOf(CancelledError)
+      await Effect.runPromise(Deferred.await(released))
+    } finally {
+      await Effect.runPromise(Scope.close(scope, Exit.void))
+    }
+  })
+})
diff --git a/tests/create-rpc-query-utils-stream-baseline.test.ts b/tests/create-rpc-query-utils-stream-baseline.test.ts
new file mode 100644
index 0000000..cb28554
--- /dev/null
+++ b/tests/create-rpc-query-utils-stream-baseline.test.ts
@@ -0,0 +1,338 @@
+import { NodeServices } from '@effect/platform-node'
+import { describe, expect, it } from '@effect/vitest'
+import { QueryClient } from '@tanstack/query-core'
+import {
+  Array as EffectArray,
+  Config,
+  ConfigProvider,
+  Crypto,
+  Effect,
+  FileSystem,
+  Option,
+  Path,
+  Predicate,
+  Schema,
+  Stream,
+} from 'effect'
+import { Hex } from 'effect/encoding'
+import { Rpc, RpcGroup, RpcTest } from 'effect/rpc'
+import { afterAll } from 'vitest'
+
+import { createRpcQueryUtils } from '#effect-api-query'
+
+import { decodeUtf8 } from '../scripts/decode-utf8.mts'
+
+const SampleSchema = Schema.Struct({
+  version: Schema.Finite,
+  reading: Schema.Struct({ unit: Schema.Literal('items'), value: Schema.Finite }),
+  labels: Schema.Array(Schema.String),
+})
+type Sample = typeof SampleSchema.Type
+type Value = number | Sample
+type Data = Value | null | readonly Value[]
+const Watch = Rpc.make('samples.watch', {
+  payload: { workload: Schema.Literals(['numbers', 'objects']) },
+  success: Schema.Union([Schema.Finite, SampleSchema]),
+  stream: true,
+})
+const group = RpcGroup.make(Watch)
+const values = [0, 1, 2, 3, 4, 5, 6, 7].flatMap((value) => Array.from({ length: 8 }, () => value))
+
+const modes = [
+  { view: 'unlimited', maxChunks: undefined },
+  { view: 'bounded-4', maxChunks: 4 },
+  { view: 'bounded-16', maxChunks: 16 },
+  { view: 'live', maxChunks: undefined },
+] as const
+const cases = (['numbers', 'objects'] as const).flatMap((workload) =>
+  modes.flatMap((mode) =>
+    ([true, false] as const).map((structuralSharing) => ({ workload, ...mode, structuralSharing })),
+  ),
+)
+type Case = (typeof cases)[number]
+
+const retainedValues = (data: Data | undefined): readonly Value[] => {
+  if (data === undefined || data === null) {
+    return []
+  }
+  return EffectArray.isArray<Data>(data) ? data : [data]
+}
+
+const versionOf = (value: Value) => (Predicate.isNumber(value) ? value : value.version)
+
+const observedObjects = () => {
+  const samples = new WeakSet<Sample>()
+  const readings = new WeakSet<Sample['reading']>()
+  const labels = new WeakSet<Sample['labels']>()
+  let sampleReferences = 0
+  let readingReferences = 0
+  let labelArrayReferences = 0
+  const observe = (data: Data | undefined) => {
+    for (const value of retainedValues(data)) {
+      if (!Predicate.isNumber(value)) {
+        if (!samples.has(value)) {
+          samples.add(value)
+          sampleReferences += 1
+        }
+        if (!readings.has(value.reading)) {
+          readings.add(value.reading)
+          readingReferences += 1
+        }
+        if (!labels.has(value.labels)) {
+          labels.add(value.labels)
+          labelArrayReferences += 1
+        }
+      }
+    }
+  }
+  return {
+    observe,
+    result: () => ({ sampleReferences, readingReferences, labelArrayReferences }),
+  }
+}
+
+const measure = Effect.fnUntraced(function* (scenario: Case) {
+  let sourceEmissions = 0
+  let finalized = false
+  const client = yield* RpcTest.makeClient(group, { flatten: true }).pipe(
+    Effect.provide(
+      group.toLayer({
+        'samples.watch': ({ workload }) =>
+          Stream.fromIterable(values).pipe(
+            Stream.map((version): Value => {
+              sourceEmissions += 1
+              return workload === 'numbers'
+                ? version
+                : {
+                    version,
+                    reading: { unit: 'items', value: version },
+                    labels: ['west', 'current'],
+                  }
+            }),
+            Stream.ensuring(
+              Effect.sync(() => {
+                finalized = true
+              }),
+            ),
+          ),
+      }),
+    ),
+  )
+  const queryClient = new QueryClient()
+  const leaf = createRpcQueryUtils(group, {
+    client,
+    keyPrefix: ['stream-baseline'],
+  }).samples.watch
+  const input = { workload: scenario.workload }
+  const queryKey =
+    scenario.view === 'live'
+      ? leaf.liveKey(input)
+      : leaf.streamedKey(input, { maxChunks: scenario.maxChunks })
+  const objects = observedObjects()
+  let cacheNotifications = 0
+  let cacheUpdates = 0
+  let dataWrites = 0
+  let manualDataWrites = 0
+  let fetchCompletionWrites = 0
+  let dataReferenceChanges = 0
+  let publishedArrayReferences = 0
+  let changedReferenceElementSlots = 0
+  let dataWriteElementSlots = 0
+  let maxRetainedValues = 0
+  let previous: Data | undefined
+  let firstPublication: Data | undefined
+  const arrays = new WeakSet<readonly Value[]>()
+  const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
+    cacheNotifications += 1
+    if (event.type === 'updated') {
+      cacheUpdates += 1
+      if (event.action.type === 'success') {
+        dataWrites += 1
+        if (event.action.manual === true) {
+          manualDataWrites += 1
+        } else {
+          fetchCompletionWrites += 1
+        }
+        const current = queryClient.getQueryData<Data>(queryKey)
+        firstPublication ??= current
+        const retained = retainedValues(current).length
+        dataWriteElementSlots += retained
+        maxRetainedValues = Math.max(maxRetainedValues, retained)
+        if (!Object.is(previous, current)) {
+          dataReferenceChanges += 1
+          changedReferenceElementSlots += retained
+          if (EffectArray.isArray<Data | undefined>(current) && !arrays.has(current)) {
+            arrays.add(current)
+            publishedArrayReferences += 1
+          }
+        }
+        objects.observe(current)
+        previous = current
+      }
+    }
+  })
+  try {
+    const data = yield* Effect.promise(async () =>
+      scenario.view === 'live'
+        ? await queryClient.query(
+            leaf.liveOptions({ input, structuralSharing: scenario.structuralSharing }),
+          )
+        : await queryClient.query(
+            leaf.streamedOptions({
+              input,
+              maxChunks: scenario.maxChunks,
+              structuralSharing: scenario.structuralSharing,
+            }),
+          ),
+    )
+    const retained = retainedValues(data)
+    return {
+      ...scenario,
+      data,
+      sourceEmissions,
+      finalized,
+      cacheNotifications,
+      cacheUpdates,
+      dataWrites,
+      manualDataWrites,
+      fetchCompletionWrites,
+      dataReferenceChanges,
+      lifecycleUpdates: cacheUpdates - dataWrites,
+      equalReferenceWrites: dataWrites - dataReferenceChanges,
+      publishedArrayReferences,
+      changedReferenceElementSlots,
+      dataWriteElementSlots,
+      maxRetainedValues,
+      retainedValues: retained.length,
+      retainedVersions: retained.map(versionOf),
+      firstPublicationVersions: retainedValues(firstPublication).map(versionOf),
+      ...objects.result(),
+      retainedSampleReferences: new Set(retained.filter((value) => !Predicate.isNumber(value)))
+        .size,
+    }
+  } finally {
+    unsubscribe()
+    queryClient.clear()
+  }
+})
+
+const baselineCase = {
+  workload: 'numbers',
+  view: 'bounded-4',
+  maxChunks: 4,
+  structuralSharing: true,
+} as const
+
+const manifestVersion = Effect.fnUntraced(function* (name: string) {
+  const fs = yield* FileSystem.FileSystem
+  const path = yield* Path.Path
+  const manifest = yield* Schema.decodeEffect(
+    Schema.fromJsonString(Schema.Struct({ version: Schema.String })),
+  )(
+    decodeUtf8(
+      yield* fs.readFile(
+        yield* path.fromFileUrl(new URL(`../node_modules/${name}/package.json`, import.meta.url)),
+      ),
+    ),
+  )
+  return manifest.version
+})
+
+const context = Effect.fnUntraced(function* () {
+  const fs = yield* FileSystem.FileSystem
+  const path = yield* Path.Path
+  const crypto = yield* Crypto.Crypto
+  const directory = yield* path.fromFileUrl(new URL('../src/', import.meta.url))
+  const sources = (yield* fs.readDirectory(directory, { recursive: true }))
+    .filter((source) => source.endsWith('.ts'))
+    .sort((left, right) => left.localeCompare(right))
+  const parts: Uint8Array[] = []
+  for (const source of sources) {
+    parts.push(new TextEncoder().encode(source), yield* fs.readFile(path.join(directory, source)))
+  }
+  const bytes = new Uint8Array(parts.reduce((size, part) => size + part.byteLength, 0))
+  let offset = 0
+  for (const part of parts) {
+    bytes.set(part, offset)
+    offset += part.byteLength
+  }
+  return {
+    node: process.version,
+    platform: process.platform,
+    arch: process.arch,
+    effect: yield* manifestVersion('effect'),
+    queryCore: yield* manifestVersion('@tanstack/query-core'),
+    vitest: yield* manifestVersion('vitest'),
+    sourceSha256: Hex.encode(yield* crypto.digest('SHA-256', bytes)),
+    fixtureSha256: Hex.encode(
+      yield* crypto.digest(
+        'SHA-256',
+        yield* fs.readFile(yield* path.fromFileUrl(new URL(import.meta.url))),
+      ),
+    ),
+    readyClient: 'RpcTest.makeClient, in-memory no-serialization, default stream buffer',
+    execution: 'fresh QueryClient, finite initial fetch, default reset policy, no observers',
+    workload: '64 emissions: versions 0 through 7, each repeated eight times',
+  }
+})
+
+const reports: Omit<Effect.Success<ReturnType<typeof measure>>, 'data'>[] = []
+
+describe('stream baseline', () => {
+  afterAll(async () => {
+    await Effect.runPromise(
+      Effect.gen(function* () {
+        const output = Option.getOrUndefined(
+          yield* Config.String('STREAM_MEASURE')
+            .pipe(Config.option)
+            .parse(ConfigProvider.fromEnv({ preserveEmptyStrings: true })),
+        )
+        if (output !== undefined && output !== '') {
+          const fs = yield* FileSystem.FileSystem
+          yield* fs.writeFileString(
+            output,
+            `${JSON.stringify({ context: yield* context(), measurements: reports }, null, 2)}\n`,
+          )
+        }
+      }).pipe(Effect.provide(NodeServices.layer)),
+    )
+  })
+  it.live('does not treat structurally equal history writes as new data references', () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const measurement = yield* measure(baselineCase)
+        expect(measurement.dataReferenceChanges).toBeLessThan(measurement.dataWrites)
+      }),
+    ),
+  )
+  it.live.each(cases)('$workload $view structuralSharing=$structuralSharing', (scenario) =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const measurement = yield* measure(scenario)
+        let expected = values
+        if (scenario.view === 'live') {
+          expected = [7]
+        } else if (scenario.maxChunks === 4) {
+          expected = [7, 7, 7, 7]
+        } else if (scenario.maxChunks === 16) {
+          expected = [6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7]
+        }
+        expect(measurement.retainedVersions).toStrictEqual(expected)
+        expect(measurement.firstPublicationVersions).toStrictEqual([0])
+        expect(measurement.sourceEmissions).toBe(64)
+        expect(measurement.finalized).toBe(true)
+        expect(measurement.maxRetainedValues).toBe(expected.length)
+        if (
+          Option.isSome(
+            yield* Config.String('STREAM_MEASURE')
+              .pipe(Config.option)
+              .parse(ConfigProvider.fromEnv({ preserveEmptyStrings: true })),
+          )
+        ) {
+          const { data: _data, ...report } = measurement
+          reports.push(report)
+        }
+      }),
+    ),
+  )
+})
diff --git a/tests/create-rpc-query-utils-stream-cache.test.ts b/tests/create-rpc-query-utils-stream-cache.test.ts
new file mode 100644
index 0000000..df7439d
--- /dev/null
+++ b/tests/create-rpc-query-utils-stream-cache.test.ts
@@ -0,0 +1,266 @@
+import { it } from '@effect/vitest'
+import { QueryClient, QueryObserver } from '@tanstack/query-core'
+import { Deferred, Effect, Schema, Stream } from 'effect'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import { expect } from 'vite-plus/test'
+
+import { createRpcQueryUtils } from '#effect-api-query'
+
+import { makeRpcTestClient } from './fixtures/effect-rpc.ts'
+import { waitForQueryState } from './fixtures/query-cache.ts'
+
+it.effect('normalizes live emissions while preserving accumulated undefined elements', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(
+      Rpc.make('watch', {
+        success: Schema.UndefinedOr(Schema.NullOr(Schema.String)),
+        stream: true,
+      }),
+    )
+    let values: readonly (string | null | undefined)[] = []
+    const client = yield* makeRpcTestClient(group, { watch: () => Stream.fromIterable(values) })
+    const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['values'] })
+    const queryClient = new QueryClient()
+    yield* Effect.addFinalizer(() =>
+      Effect.sync(() => {
+        queryClient.clear()
+      }),
+    )
+    for (const emissions of [[null], [undefined], ['first', undefined]] as const) {
+      values = emissions
+      const recorded: unknown[] = []
+      const options = rpc.watch.liveOptions()
+      const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
+        if (event.type === 'updated' && event.action.type === 'success') {
+          recorded.push(event.query.state.data)
+        }
+      })
+      try {
+        expect(yield* Effect.promise(async () => await queryClient.query(options))).toBeNull()
+        expect(queryClient.getQueryData(options.queryKey)).toBeNull()
+        if (emissions.length === 2) {
+          expect(recorded.slice(0, 2)).toStrictEqual(['first', null])
+        }
+      } finally {
+        unsubscribe()
+      }
+      expect(
+        yield* Effect.promise(async () => await queryClient.query(rpc.watch.streamedOptions())),
+      ).toStrictEqual(emissions)
+      queryClient.clear()
+    }
+  }),
+)
+
+it.effect.each(['global', 'prefix'] as const)(
+  'uses %s hashing for native reads, writes, and an open stream first publication',
+  (mode) =>
+    Effect.gen(function* () {
+      const group = RpcGroup.make(
+        Rpc.make('read', { success: Schema.String }),
+        Rpc.make('watch', { success: Schema.Undefined, stream: true }),
+      )
+      const finalized = yield* Deferred.make<undefined>()
+      let closed = 0
+      const client = yield* makeRpcTestClient(group, {
+        read: () => Effect.succeed('server'),
+        watch: () =>
+          Stream.succeed(undefined).pipe(
+            Stream.concat(Stream.never),
+            Stream.ensuring(
+              Effect.sync(() => {
+                closed += 1
+              }).pipe(
+                Effect.flatMap(() =>
+                  closed === 2 ? Deferred.succeed(finalized, undefined) : Effect.void,
+                ),
+              ),
+            ),
+          ),
+      })
+      const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['hashing'] })
+      const queryClient = new QueryClient({
+        defaultOptions: {
+          queries: {
+            queryKeyHashFn: (key) => `global:${JSON.stringify(key)}`,
+            retry: false,
+            staleTime: Infinity,
+          },
+        },
+      })
+      if (mode === 'prefix') {
+        queryClient.setQueryDefaults(rpc.key(), {
+          queryKeyHashFn: (key) => `prefix:${JSON.stringify(key)}`,
+        })
+      }
+      const options = rpc.watch.liveOptions()
+      const observer = new QueryObserver(queryClient, options)
+      const unsubscribe = observer.subscribe(() => {})
+      const history = new QueryObserver(queryClient, rpc.watch.streamedOptions())
+      const stopHistory = history.subscribe(() => {})
+      try {
+        yield* waitForQueryState(
+          queryClient,
+          () =>
+            observer.getCurrentResult().status === 'success' &&
+            history.getCurrentResult().status === 'success',
+        )
+        expect(observer.getCurrentResult()).toMatchObject({ data: null, fetchStatus: 'fetching' })
+        expect(queryClient.getQueryData(rpc.watch.liveKey())).toBeNull()
+        expect(history.getCurrentResult()).toMatchObject({
+          data: [undefined],
+          fetchStatus: 'fetching',
+        })
+        expect(queryClient.getQueryData(rpc.watch.streamedKey())).toStrictEqual([undefined])
+        queryClient.setQueryData(rpc.watch.liveKey(), null)
+        queryClient.setQueryData(rpc.watch.streamedKey(), [undefined, undefined])
+        expect(queryClient.getQueryData(rpc.watch.streamedKey())).toStrictEqual([
+          undefined,
+          undefined,
+        ])
+        expect(
+          yield* Effect.promise(async () => await queryClient.query(rpc.read.queryOptions())),
+        ).toBe('server')
+        queryClient.setQueryData(rpc.read.queryKey(), 'native')
+        expect(
+          yield* Effect.promise(async () => await queryClient.query(rpc.read.queryOptions())),
+        ).toBe('native')
+        const pages = rpc.read.infiniteOptions({
+          initialPageParam: 0,
+          getNextPageParam: () => {},
+        })
+        expect(
+          yield* Effect.promise(async () => await queryClient.infiniteQuery(pages)),
+        ).toStrictEqual({ pages: ['server'], pageParams: [0] })
+        queryClient.setQueryData(rpc.read.infiniteKey(), {
+          pages: ['native'],
+          pageParams: [0],
+        })
+        expect(
+          yield* Effect.promise(async () => await queryClient.infiniteQuery(pages)),
+        ).toStrictEqual({ pages: ['native'], pageParams: [0] })
+        expect(queryClient.getQueryCache().getAll()).toHaveLength(4)
+        expect(
+          queryClient
+            .getQueryCache()
+            .getAll()
+            .every((query) => query.queryHash.startsWith(`${mode}:`)),
+        ).toBe(true)
+      } finally {
+        unsubscribe()
+        stopHistory()
+        yield* Effect.promise(async () => {
+          await queryClient.cancelQueries()
+        })
+        yield* Deferred.await(finalized)
+        queryClient.clear()
+      }
+    }),
+)
+
+it.effect('keeps concurrent retention views independent through completion', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(Rpc.make('watch', { success: Schema.Int, stream: true }))
+    const release = yield* Deferred.make<undefined>()
+    const client = yield* makeRpcTestClient(group, {
+      watch: () =>
+        Stream.make(1, 2, 3, 4).pipe(
+          Stream.concat(Stream.fromEffect(Deferred.await(release).pipe(Effect.as(5)))),
+        ),
+    })
+    const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['retention'] })
+    const queryClient = new QueryClient()
+    const narrow = new QueryObserver(queryClient, rpc.watch.streamedOptions({ maxChunks: 2 }))
+    const wide = new QueryObserver(queryClient, rpc.watch.streamedOptions({ maxChunks: 4 }))
+    const stopNarrow = narrow.subscribe(() => {})
+    const stopWide = wide.subscribe(() => {})
+    try {
+      yield* waitForQueryState(
+        queryClient,
+        () =>
+          narrow.getCurrentResult().data?.at(-1) === 4 &&
+          wide.getCurrentResult().data?.at(-1) === 4,
+      )
+      expect(narrow.getCurrentResult().data).toStrictEqual([3, 4])
+      expect(wide.getCurrentResult().data).toStrictEqual([1, 2, 3, 4])
+      yield* Deferred.succeed(release, undefined)
+      yield* waitForQueryState(
+        queryClient,
+        () =>
+          narrow.getCurrentResult().fetchStatus === 'idle' &&
+          wide.getCurrentResult().fetchStatus === 'idle',
+      )
+      expect(narrow.getCurrentResult().data).toStrictEqual([4, 5])
+      expect(wide.getCurrentResult().data).toStrictEqual([2, 3, 4, 5])
+      expect(queryClient.getQueryCache().getAll()).toHaveLength(2)
+    } finally {
+      stopNarrow()
+      stopWide()
+      queryClient.clear()
+    }
+  }),
+)
+
+it.effect.each([{ order: [4, 2] }, { order: [2, 4] }] as const)(
+  'fetches retention views in order $order and invalidates exact versus broad policies',
+  ({ order }) =>
+    Effect.gen(function* () {
+      const group = RpcGroup.make(Rpc.make('watch', { success: Schema.Int, stream: true }))
+      let calls = 0
+      const client = yield* makeRpcTestClient(group, {
+        watch: () => {
+          calls += 1
+          return Stream.make(1, 2, 3, 4)
+        },
+      })
+      const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['retention-order'] })
+      const queryClient = new QueryClient({ defaultOptions: { queries: { staleTime: Infinity } } })
+      try {
+        for (const maxChunks of order) {
+          expect(
+            yield* Effect.promise(
+              async () => await queryClient.query(rpc.watch.streamedOptions({ maxChunks })),
+            ),
+          ).toStrictEqual(maxChunks === 2 ? [3, 4] : [1, 2, 3, 4])
+        }
+        const narrow = rpc.watch.streamedKey({ maxChunks: 2 })
+        const wide = rpc.watch.streamedKey({ maxChunks: 4 })
+        const append = rpc.watch.streamedOptions({ maxChunks: 2, refetchMode: 'append' })
+        yield* Effect.promise(async () => await queryClient.query(append))
+        yield* Effect.promise(async () => await queryClient.query(rpc.watch.liveOptions()))
+        queryClient.setQueryData(['unrelated'], 42)
+        yield* Effect.promise(async () => {
+          await queryClient.invalidateQueries({
+            queryKey: narrow,
+            exact: true,
+            refetchType: 'none',
+          })
+        })
+        expect(queryClient.getQueryState(narrow)?.isInvalidated).toBe(true)
+        expect(queryClient.getQueryState(wide)?.isInvalidated).toBe(false)
+        expect(queryClient.getQueryState(append.queryKey)?.isInvalidated).toBe(false)
+        queryClient.setQueryData(narrow, [3, 4])
+        yield* Effect.promise(async () => {
+          await queryClient.invalidateQueries({
+            queryKey: [...rpc.watch.key(), 'streamed'],
+            refetchType: 'none',
+          })
+        })
+        for (const key of [narrow, wide, append.queryKey]) {
+          expect(queryClient.getQueryState(key)?.isInvalidated).toBe(true)
+        }
+        expect(queryClient.getQueryState(rpc.watch.liveKey())?.isInvalidated).toBe(false)
+        yield* Effect.promise(async () => {
+          await queryClient.invalidateQueries({ queryKey: rpc.watch.key(), refetchType: 'none' })
+        })
+        expect(queryClient.getQueryState(rpc.watch.liveKey())?.isInvalidated).toBe(true)
+        expect(queryClient.getQueryState(['unrelated'])?.isInvalidated).toBe(false)
+        expect(queryClient.getQueryData(narrow)).toStrictEqual([3, 4])
+        expect(queryClient.getQueryData(wide)).toStrictEqual([1, 2, 3, 4])
+        expect(queryClient.getQueryCache().getAll()).toHaveLength(5)
+        expect(calls).toBe(4)
+      } finally {
+        queryClient.clear()
+      }
+    }),
+)
diff --git a/tests/create-rpc-query-utils-stream-hashing.test.ts b/tests/create-rpc-query-utils-stream-hashing.test.ts
new file mode 100644
index 0000000..afa5487
--- /dev/null
+++ b/tests/create-rpc-query-utils-stream-hashing.test.ts
@@ -0,0 +1,469 @@
+/* oxlint-disable vitest/no-standalone-expect */
+import { it } from '@effect/vitest'
+import {
+  experimental_streamedQuery,
+  hashKey,
+  QueryClient,
+  QueryObserver,
+} from '@tanstack/query-core'
+import type { QueryFunction, QueryKey } from '@tanstack/query-core'
+import { Effect, Predicate, Schema, Stream } from 'effect'
+import { HttpClient, HttpClientResponse } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiClient,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiSchema,
+} from 'effect/http-api'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import { expect } from 'vite-plus/test'
+
+import { createHttpApiQueryUtils, createRpcQueryUtils } from '#effect-api-query'
+
+import { makeRpcTestClient } from './fixtures/effect-rpc.ts'
+
+const cases = (['global', 'prefix'] as const).flatMap((hashing) =>
+  (['native', 'custom'] as const).flatMap((initialHash) =>
+    (['earlier', 'later'] as const).flatMap((order) =>
+      (['reset', 'append', 'replace', 'live'] as const).map((view) => ({
+        hashing,
+        initialHash,
+        order,
+        view,
+      })),
+    ),
+  ),
+)
+
+const verifyHashGuard = Effect.fnUntraced(function* <Data>(
+  options: { readonly queryKey: QueryKey; readonly queryFn: QueryFunction<Data> },
+  historicalData: Data,
+  currentData: Data,
+  expectedData: Data,
+  hashing: 'global' | 'prefix',
+  initialHash: 'native' | 'custom',
+  order: 'earlier' | 'later',
+  identity: Readonly<Record<string, string>>,
+  executions: () => number,
+) {
+  const initialDefaults = {
+    retry: false as const,
+    ...(initialHash === 'custom'
+      ? { queryKeyHashFn: (key: QueryKey) => `old:${JSON.stringify(key)}` }
+      : undefined),
+  }
+  const defaults = {
+    retry: false as const,
+    queryKeyHashFn: (key: QueryKey) => `new:${JSON.stringify(key)}`,
+  }
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: initialDefaults },
+  })
+  if (order === 'later') {
+    queryClient.setDefaultOptions({ queries: defaults })
+    queryClient.setQueryData(options.queryKey, currentData)
+    queryClient.setDefaultOptions({ queries: initialDefaults })
+  }
+  queryClient.setQueryData(options.queryKey, historicalData)
+  const observer = new QueryObserver(queryClient, { ...options, enabled: false })
+  const unsubscribe = observer.subscribe(() => {})
+  const historical = observer.getCurrentQuery()
+  const historicalState = { ...historical.state }
+  if (hashing === 'global') {
+    queryClient.setDefaultOptions({ queries: defaults })
+  } else {
+    queryClient.setQueryDefaults(options.queryKey, defaults)
+  }
+  try {
+    yield* Effect.promise(async () => {
+      await expect(queryClient.query(options)).rejects.toMatchObject({
+        ...identity,
+        code: 'UnsupportedQueryHash',
+      })
+    })
+    expect(historical.state).toStrictEqual(historicalState)
+    expect(executions()).toBe(0)
+    queryClient.setQueryData(options.queryKey, currentData)
+    const current = queryClient.getQueryCache().get(defaults.queryKeyHashFn(options.queryKey))
+    const currentState = { ...current?.state }
+    yield* Effect.promise(async () => {
+      await expect(observer.refetch({ throwOnError: true })).rejects.toMatchObject({
+        ...identity,
+        code: 'UnsupportedQueryHash',
+      })
+    })
+    expect(current?.state).toStrictEqual(currentState)
+    expect(historical.state).toMatchObject({ data: historicalData, fetchStatus: 'idle' })
+    expect(executions()).toBe(0)
+    unsubscribe()
+    queryClient.getQueryCache().remove(historical)
+    expect(yield* Effect.promise(async () => await queryClient.query(options))).toStrictEqual(
+      expectedData,
+    )
+    expect(executions()).toBe(1)
+  } finally {
+    unsubscribe()
+    yield* Effect.promise(async () => {
+      await queryClient.cancelQueries()
+    })
+    queryClient.clear()
+  }
+})
+
+it.effect.each(cases)(
+  'rejects $initialHash to $hashing hash changes with $order history in RPC $view streams',
+  ({ hashing, initialHash, order, view }) =>
+    Effect.gen(function* () {
+      const group = RpcGroup.make(Rpc.make('watch', { success: Schema.Int, stream: true }))
+      let executions = 0
+      const client = yield* makeRpcTestClient(group, {
+        watch: () => {
+          executions += 1
+          return Stream.succeed(2)
+        },
+      })
+      const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['stream-hashing'] })
+      const identity = { _tag: 'EffectRpcQueryConfigError', rpcTag: 'watch' }
+      const verification =
+        view === 'live'
+          ? verifyHashGuard(
+              rpc.watch.liveOptions(),
+              1,
+              3,
+              2,
+              hashing,
+              initialHash,
+              order,
+              identity,
+              () => executions,
+            )
+          : verifyHashGuard(
+              rpc.watch.streamedOptions({ refetchMode: view }),
+              [1],
+              [3],
+              view === 'append' ? [3, 2] : [2],
+              hashing,
+              initialHash,
+              order,
+              identity,
+              () => executions,
+            )
+      yield* verification
+    }),
+)
+
+const foreignCases = (['rpc', 'http'] as const).flatMap((adapter) =>
+  (['family', 'constant', 'bigint', 'cycle'] as const).flatMap((foreign) =>
+    (['reset', 'append', 'replace', 'live'] as const).map((view) => ({ adapter, foreign, view })),
+  ),
+)
+
+interface ForeignCycle {
+  self?: ForeignCycle
+}
+
+const nativeStreamFn = () => Stream.toAsyncIterable(Stream.succeed(2))
+
+const verifyForeignHash = Effect.fnUntraced(function* <Data>(
+  options: { readonly queryKey: QueryKey; readonly queryFn: QueryFunction<Data> },
+  nativeQueryFn: QueryFunction<Data>,
+  initialData: Data,
+  expectedData: Data,
+  foreign: 'family' | 'constant' | 'bigint' | 'cycle',
+) {
+  const results: Data[] = []
+  for (const queryFn of [options.queryFn, nativeQueryFn]) {
+    const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    queryClient.setQueryData(options.queryKey, initialData)
+    queryClient.setQueryDefaults(['foreign'], {
+      queryKeyHashFn: (key) => {
+        if (foreign !== 'family') {
+          return 'foreign:constant'
+        }
+        const [, input] = key
+        if (!Predicate.isObject(input) || !Predicate.isNumber(input['id'])) {
+          throw new TypeError('Foreign keys require an id')
+        }
+        return `foreign:${input['id']}`
+      },
+    })
+    const cycle: ForeignCycle = {}
+    cycle.self = cycle
+    const objectInput = foreign === 'cycle' ? cycle : { id: 1 }
+    const foreignKey = ['foreign', foreign === 'bigint' ? 1n : objectInput]
+    queryClient.setQueryData(foreignKey, 'foreign data')
+    const foreignQuery = queryClient
+      .getQueryCache()
+      .get(foreign === 'family' ? 'foreign:1' : 'foreign:constant')
+    const foreignState = { ...foreignQuery?.state }
+    try {
+      const result = yield* Effect.promise(
+        async () => await queryClient.query({ ...options, queryFn }),
+      )
+      results.push(result)
+      expect(result).toStrictEqual(expectedData)
+      expect(foreignQuery?.state).toStrictEqual(foreignState)
+    } finally {
+      queryClient.clear()
+    }
+  }
+  expect(results[0]).toStrictEqual(results[1])
+})
+
+it.effect.each(foreignCases)(
+  'preserves native $adapter $view behavior with a later $foreign foreign hasher',
+  ({ adapter, foreign, view }) =>
+    Effect.gen(function* () {
+      const group = RpcGroup.make(Rpc.make('watch', { success: Schema.Int, stream: true }))
+      const rpcClient = yield* makeRpcTestClient(group, { watch: () => Stream.succeed(2) })
+      const rpc = createRpcQueryUtils(group, { client: rpcClient, keyPrefix: ['stream-hashing'] })
+      const api = HttpApi.make('stream-hashing').add(
+        HttpApiGroup.make('events').add(
+          HttpApiEndpoint.get('watch', '/watch', {
+            success: HttpApiSchema.StreamSse({ data: Schema.Int }),
+          }),
+        ),
+      )
+      const httpClient = yield* HttpApiClient.makeWith(api, {
+        baseUrl: 'https://example.test',
+        httpClient: HttpClient.make((request) =>
+          Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response('data: 2\n\n', { headers: { 'content-type': 'text/event-stream' } }),
+            ),
+          ),
+        ),
+      })
+      const http = createHttpApiQueryUtils(api, {
+        client: httpClient,
+        keyPrefix: ['stream-hashing'],
+      })
+      const verification =
+        view === 'live'
+          ? verifyForeignHash(
+              adapter === 'rpc' ? rpc.watch.liveOptions() : http.events.watch.liveOptions(),
+              experimental_streamedQuery({
+                initialValue: 0,
+                reducer: (_previous, value: number) => value,
+                streamFn: nativeStreamFn,
+              }),
+              1,
+              2,
+              foreign,
+            )
+          : verifyForeignHash(
+              adapter === 'rpc'
+                ? rpc.watch.streamedOptions({ refetchMode: view })
+                : http.events.watch.streamedOptions({ refetchMode: view }),
+              experimental_streamedQuery({ refetchMode: view, streamFn: nativeStreamFn }),
+              [1],
+              view === 'append' ? [1, 2] : [2],
+              foreign,
+            )
+      yield* verification
+    }),
+)
+
+it.effect.each(cases)(
+  'rejects $initialHash to $hashing hash changes with $order history in HTTP $view streams',
+  ({ hashing, initialHash, order, view }) =>
+    Effect.gen(function* () {
+      const api = HttpApi.make('stream-hashing').add(
+        HttpApiGroup.make('events').add(
+          HttpApiEndpoint.get('watch', '/watch', {
+            success: HttpApiSchema.StreamSse({ data: Schema.Int }),
+          }),
+        ),
+      )
+      let executions = 0
+      const client = yield* HttpApiClient.makeWith(api, {
+        baseUrl: 'https://example.test',
+        httpClient: HttpClient.make((request) => {
+          executions += 1
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response('data: 2\n\n', { headers: { 'content-type': 'text/event-stream' } }),
+            ),
+          )
+        }),
+      })
+      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['stream-hashing'] })
+      const identity = {
+        _tag: 'EffectHttpApiQueryConfigError',
+        apiId: 'stream-hashing',
+        groupId: 'events',
+        endpoint: 'watch',
+        method: 'GET',
+      }
+      const verification =
+        view === 'live'
+          ? verifyHashGuard(
+              http.events.watch.liveOptions(),
+              1,
+              3,
+              2,
+              hashing,
+              initialHash,
+              order,
+              identity,
+              () => executions,
+            )
+          : verifyHashGuard(
+              http.events.watch.streamedOptions({ refetchMode: view }),
+              [1],
+              [3],
+              view === 'append' ? [3, 2] : [2],
+              hashing,
+              initialHash,
+              order,
+              identity,
+              () => executions,
+            )
+      yield* verification
+    }),
+)
+
+const defaultHashCases = (['rpc', 'http'] as const).flatMap((adapter) =>
+  (['global', 'prefix'] as const).flatMap((hashing) =>
+    (['native', 'custom'] as const).flatMap((effectiveHash) =>
+      (['matching', 'mismatched'] as const).flatMap((consistency) =>
+        (['reset', 'append', 'replace', 'live'] as const).map((view) => ({
+          adapter,
+          hashing,
+          effectiveHash,
+          consistency,
+          view,
+        })),
+      ),
+    ),
+  ),
+)
+
+const customDefaultHash = (key: QueryKey) => `stream:${hashKey(key)}`
+
+const verifyDefaultHash = Effect.fnUntraced(function* <Data>(
+  options: { readonly queryKey: QueryKey; readonly queryFn: QueryFunction<Data> },
+  initialData: Data,
+  expectedData: Data,
+  hashing: 'global' | 'prefix',
+  effectiveHash: 'native' | 'custom',
+  consistency: 'matching' | 'mismatched',
+  identity: Readonly<Record<string, string>>,
+  executions: () => number,
+) {
+  const queryKeyHashFn = effectiveHash === 'custom' ? customDefaultHash : hashKey
+  const queryHash = consistency === 'matching' ? queryKeyHashFn(options.queryKey) : 'only-watch'
+  const defaults = {
+    queryHash,
+    ...(effectiveHash === 'custom' ? { queryKeyHashFn } : undefined),
+  }
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: { retry: false, ...(hashing === 'global' ? defaults : undefined) },
+    },
+  })
+  if (hashing === 'prefix') {
+    queryClient.setQueryDefaults(options.queryKey, defaults)
+  }
+  queryClient.setQueryData(options.queryKey, initialData)
+  const cached = queryClient.getQueryCache().get(queryHash)
+  const initialUpdatedAt = cached?.state.dataUpdatedAt
+  try {
+    if (consistency === 'mismatched') {
+      yield* Effect.promise(async () => {
+        await expect(queryClient.query(options)).rejects.toMatchObject({
+          ...identity,
+          code: 'UnsupportedQueryHash',
+        })
+      })
+      expect(cached?.state.data).toStrictEqual(initialData)
+      expect(cached?.state.dataUpdatedAt).toBe(initialUpdatedAt)
+      expect(executions()).toBe(0)
+    } else {
+      expect(yield* Effect.promise(async () => await queryClient.query(options))).toStrictEqual(
+        expectedData,
+      )
+      expect(cached?.state.data).toStrictEqual(expectedData)
+      expect(executions()).toBe(1)
+    }
+  } finally {
+    queryClient.clear()
+  }
+})
+
+it.effect.each(defaultHashCases)(
+  'handles $consistency $hashing default queryHash with $effectiveHash hashing in $adapter $view streams',
+  ({ adapter, hashing, effectiveHash, consistency, view }) =>
+    Effect.gen(function* () {
+      const group = RpcGroup.make(Rpc.make('watch', { success: Schema.Int, stream: true }))
+      let executions = 0
+      const rpcClient = yield* makeRpcTestClient(group, {
+        watch: () => {
+          executions += 1
+          return Stream.succeed(2)
+        },
+      })
+      const rpc = createRpcQueryUtils(group, { client: rpcClient, keyPrefix: ['stream-hashing'] })
+      const api = HttpApi.make('stream-hashing').add(
+        HttpApiGroup.make('events').add(
+          HttpApiEndpoint.get('watch', '/watch', {
+            success: HttpApiSchema.StreamSse({ data: Schema.Int }),
+          }),
+        ),
+      )
+      const httpClient = yield* HttpApiClient.makeWith(api, {
+        baseUrl: 'https://example.test',
+        httpClient: HttpClient.make((request) => {
+          executions += 1
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response('data: 2\n\n', { headers: { 'content-type': 'text/event-stream' } }),
+            ),
+          )
+        }),
+      })
+      const http = createHttpApiQueryUtils(api, {
+        client: httpClient,
+        keyPrefix: ['stream-hashing'],
+      })
+      const identity =
+        adapter === 'rpc'
+          ? { _tag: 'EffectRpcQueryConfigError', rpcTag: 'watch' }
+          : {
+              _tag: 'EffectHttpApiQueryConfigError',
+              apiId: 'stream-hashing',
+              groupId: 'events',
+              endpoint: 'watch',
+              method: 'GET',
+            }
+      const verification =
+        view === 'live'
+          ? verifyDefaultHash(
+              adapter === 'rpc' ? rpc.watch.liveOptions() : http.events.watch.liveOptions(),
+              1,
+              2,
+              hashing,
+              effectiveHash,
+              consistency,
+              identity,
+              () => executions,
+            )
+          : verifyDefaultHash(
+              adapter === 'rpc'
+                ? rpc.watch.streamedOptions({ refetchMode: view })
+                : http.events.watch.streamedOptions({ refetchMode: view }),
+              [1],
+              view === 'append' ? [1, 2] : [2],
+              hashing,
+              effectiveHash,
+              consistency,
+              identity,
+              () => executions,
+            )
+      yield* verification
+    }),
+)
diff --git a/tests/create-rpc-query-utils-stream-publication.test.ts b/tests/create-rpc-query-utils-stream-publication.test.ts
new file mode 100644
index 0000000..4c244b7
--- /dev/null
+++ b/tests/create-rpc-query-utils-stream-publication.test.ts
@@ -0,0 +1,37 @@
+import { expect, it } from '@effect/vitest'
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Schema, Stream } from 'effect'
+import { Rpc, RpcGroup, RpcTest } from 'effect/rpc'
+
+import { createRpcQueryUtils } from '#effect-api-query'
+
+it.live('appends decoded values without mutating seeded sparse history', () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const Watch = Rpc.make('samples.watch', { success: Schema.Finite, stream: true })
+      const group = RpcGroup.make(Watch)
+      const client = yield* RpcTest.makeClient(group, { flatten: true }).pipe(
+        Effect.provide(group.toLayer({ 'samples.watch': () => Stream.make(8) })),
+      )
+      const queryClient = new QueryClient()
+      const initialData: number[] = []
+      initialData.length = 3
+      initialData[0] = 1
+      initialData[2] = 7
+      const options = createRpcQueryUtils(group, {
+        client,
+        keyPrefix: ['stream-publication'],
+      }).samples.watch.streamedOptions({ initialData, maxChunks: 4, refetchMode: 'append' })
+      try {
+        const data = yield* Effect.promise(async () => await queryClient.query(options))
+        expect(data).toStrictEqual([1, undefined, 7, 8])
+        expect(initialData).toHaveLength(3)
+        expect(initialData[0]).toBe(1)
+        expect(initialData[2]).toBe(7)
+        expect(1 in initialData).toBe(false)
+      } finally {
+        queryClient.clear()
+      }
+    }),
+  ),
+)
diff --git a/tests/create-rpc-query-utils-streaming.test.ts b/tests/create-rpc-query-utils-streaming.test.ts
index d98dca5..b4fbf51 100644
--- a/tests/create-rpc-query-utils-streaming.test.ts
+++ b/tests/create-rpc-query-utils-streaming.test.ts
@@ -1,9 +1,8 @@
 import { describe, expect, it, vi } from '@effect/vitest'
 import { QueryClient, QueryObserver, skipToken } from '@tanstack/query-core'
-import { Deferred, Effect, Equal, Exit, Predicate, Schema, Stream } from 'effect'
+import { Cause, Deferred, Effect, Equal, Exit, Predicate, Schema, Stream } from 'effect'
 import type { RpcClient } from 'effect/rpc'
 import { Rpc, RpcGroup } from 'effect/rpc'
-import { setTimeout } from 'node:timers/promises'
 
 import {
   createRpcQueryUtils,
@@ -127,7 +126,7 @@ describe('createRpcQueryUtils streaming execution', () => {
         const group = RpcGroup.make(Watch)
         const queryClient = new QueryClient()
         const snapshots: unknown[] = []
-        const key = ['bounded', 'rpc', 'events', 'watch', 'streamed'] as const
+        let key: readonly unknown[] = []
         const client = yield* makeRpcTestClient(group, {
           'events.watch': () =>
             Stream.fromAsyncIterable(
@@ -143,6 +142,7 @@ describe('createRpcQueryUtils streaming execution', () => {
         })
         const utils = createRpcQueryUtils(group, { client, keyPrefix: ['bounded'] })
         const options = utils.events.watch.streamedOptions({ maxChunks: 2, refetchMode })
+        key = options.queryKey
         queryClient.setQueryData(options.queryKey, [-2, -1, 0, 9])
         const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
           if (event.type === 'updated' && event.action.type === 'success') {
@@ -215,7 +215,7 @@ describe('createRpcQueryUtils streaming execution', () => {
     }),
   )
 
-  it.effect('rejects invalid bounds synchronously, including skipped queries', () =>
+  it.effect('rejects invalid retention bounds synchronously, including skipped queries', () =>
     Effect.gen(function* () {
       const Watch = Rpc.make('events.watch', {
         payload: { channel: Schema.String },
@@ -235,10 +235,7 @@ describe('createRpcQueryUtils streaming execution', () => {
         Number.MAX_SAFE_INTEGER + 1,
       ]) {
         for (const input of [{ channel: 'news' }, skipToken] as const) {
-          const buildOptions = () =>
-            input === skipToken
-              ? utils.events.watch.streamedOptions({ input, maxChunks })
-              : utils.events.watch.streamedOptions({ input, maxChunks })
+          const buildOptions = () => utils.events.watch.streamedOptions({ input, maxChunks })
           expect(buildOptions).toThrow(EffectRpcQueryConfigError)
           expect(buildOptions).toThrow(
             expect.objectContaining({ code: 'InvalidMaxChunks', rpcTag: 'events.watch' }),
@@ -313,19 +310,27 @@ describe('createRpcQueryUtils streaming execution', () => {
         'run-1-second',
       ])
       expect(yield* Effect.promise(async () => await fetch('append'))).toStrictEqual([
-        'run-1-first',
-        'run-1-second',
         'run-2-first',
         'run-2-second',
       ])
-      expect(yield* Effect.promise(async () => await fetch('replace'))).toStrictEqual([
+      expect(yield* Effect.promise(async () => await fetch('append'))).toStrictEqual([
+        'run-2-first',
+        'run-2-second',
         'run-3-first',
         'run-3-second',
       ])
-      expect(yield* Effect.promise(async () => await fetch('reset'))).toStrictEqual([
+      expect(yield* Effect.promise(async () => await fetch('replace'))).toStrictEqual([
         'run-4-first',
         'run-4-second',
       ])
+      expect(yield* Effect.promise(async () => await fetch('replace'))).toStrictEqual([
+        'run-5-first',
+        'run-5-second',
+      ])
+      expect(yield* Effect.promise(async () => await fetch('reset'))).toStrictEqual([
+        'run-6-first',
+        'run-6-second',
+      ])
     }),
   )
 
@@ -393,6 +398,54 @@ describe('createRpcQueryUtils streaming execution', () => {
     }),
   )
 
+  it.effect.each(['live', 'streamed'] as const)(
+    'preserves independent interruption and mixed Causes from an official client in %s queries',
+    (operation) =>
+      Effect.gen(function* () {
+        const Watch = Rpc.make('events.watch', { success: Schema.String, stream: true })
+        const streamGroup = RpcGroup.make(Watch)
+        const defect = new Error('stream defect')
+        const causes = [
+          Cause.interrupt(42),
+          Cause.combine(Cause.interrupt(42), Cause.die(defect)),
+        ] as const
+        let [currentCause] = causes
+        const client = yield* makeRpcTestClient(streamGroup, {
+          'events.watch': () => Stream.failCause(currentCause),
+        })
+        const utils = createRpcQueryUtils(streamGroup, {
+          client,
+          keyPrefix: ['interrupt', operation],
+        })
+        const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+        try {
+          for (const cause of causes) {
+            currentCause = cause
+            const direct = yield* Effect.exit(Stream.runCollect(client('events.watch', undefined)))
+            if (Exit.isSuccess(direct)) {
+              throw new TypeError('Expected a failed client stream')
+            }
+            const error = yield* Effect.promise(
+              async () =>
+                await captureFailure(
+                  operation === 'live'
+                    ? queryClient.query(utils.events.watch.liveOptions())
+                    : queryClient.query(utils.events.watch.streamedOptions()),
+                ),
+            )
+            expect(error).toBeInstanceOf(EffectRpcQueryError)
+            expect(error).toMatchObject({ rpcTag: 'events.watch', operation })
+            if (!isEffectRpcQueryError(error)) {
+              throw new TypeError('Expected an RPC execution error')
+            }
+            expect(error.cause).toStrictEqual(direct.cause)
+          }
+        } finally {
+          queryClient.clear()
+        }
+      }),
+  )
+
   it.effect('finalizes a stream after normal completion', () =>
     Effect.gen(function* () {
       const Watch = Rpc.make('events.watch', { success: Schema.String, stream: true })
@@ -401,7 +454,6 @@ describe('createRpcQueryUtils streaming execution', () => {
       const source = Stream.make('first', 'second').pipe(
         Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)),
       )
-      // SAFETY: This one-RPC client fixture supplies the declared stream directly so finalization can be observed.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       const client = (() => source) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof streamGroup>>
       /* oxlint-enable typescript/no-unsafe-type-assertion */
@@ -436,7 +488,6 @@ describe('createRpcQueryUtils streaming execution', () => {
       ),
       Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)),
     )
-    // SAFETY: This one-RPC client fixture supplies the declared stream directly so finalization can be observed.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     const client = (() => source) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof streamGroup>>
     /* oxlint-enable typescript/no-unsafe-type-assertion */
@@ -450,7 +501,9 @@ describe('createRpcQueryUtils streaming execution', () => {
     const query = captureFailure(queryClient.query(options))
     await Effect.runPromise(Deferred.await(waiting))
     await queryClient.cancelQueries({ queryKey: options.queryKey })
-    await setTimeout(10)
+    await Effect.runPromise(
+      Deferred.await(interrupted).pipe(Effect.andThen(Deferred.await(finalized))),
+    )
 
     expect(Deferred.isDoneUnsafe(interrupted)).toBe(true)
     expect(Deferred.isDoneUnsafe(finalized)).toBe(true)
@@ -467,12 +520,10 @@ describe('createRpcQueryUtils streaming execution', () => {
         return: async () => await Promise.reject(closeError),
       }),
     }
-    // SAFETY: The custom runner returns only this stream fixture so failed iterator closure can be observed.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     const runPromiseExit: RunPromiseExit = async () =>
       (await Promise.resolve(Exit.succeed(source))) as never
     /* oxlint-enable typescript/no-unsafe-type-assertion */
-    // SAFETY: This one-RPC client fixture supplies the declared stream directly so finalization can be observed.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     const utils = createRpcQueryUtils(streamGroup, {
       client: (() => Stream.empty) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof streamGroup>>,
@@ -509,7 +560,6 @@ describe('createRpcQueryUtils streaming execution', () => {
       const secondStarted = yield* Deferred.make<undefined>()
       const secondFinalized = yield* Deferred.make<undefined>()
       let run = 0
-      // SAFETY: This one-RPC fixture creates the declared stream directly so successive finalization can be observed.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       const client = (() => {
         run += 1
@@ -563,7 +613,6 @@ describe('createRpcQueryUtils streaming execution', () => {
         ),
         Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)),
       )
-      // SAFETY: This one-RPC client fixture supplies the declared stream directly so finalization can be observed.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       const client = (() => source) as RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof streamGroup>>
       /* oxlint-enable typescript/no-unsafe-type-assertion */
@@ -639,9 +688,7 @@ describe('createRpcQueryUtils streaming execution', () => {
         })
         expect(options).not.toHaveProperty('input')
         expect(options).not.toHaveProperty('refetchMode')
-        expect(options.queryKeyHashFn).toBe(
-          utils.events.watch.liveOptions(skipToken).queryKeyHashFn,
-        )
+        expect(options).not.toHaveProperty('queryKeyHashFn')
         const unsubscribe = observer.subscribe(() => {})
         yield* Effect.promise(async () => {
           await queryClient.invalidateQueries({ queryKey: utils.events.key() })
@@ -672,11 +719,11 @@ describe('createRpcQueryUtils streaming execution', () => {
         keyPrefix: ['app'] as const,
       })
 
-      expect(utils.events.watch.streamedOptions(skipToken)).toMatchObject({
+      expect(utils.events.watch.streamedOptions({ input: skipToken })).toMatchObject({
         queryFn: skipToken,
         queryKey: ['app', 'rpc', 'events', 'watch', 'streamed'],
       })
-      expect(utils.events.watch.liveOptions(skipToken)).toMatchObject({
+      expect(utils.events.watch.liveOptions({ input: skipToken })).toMatchObject({
         queryFn: skipToken,
         queryKey: ['app', 'rpc', 'events', 'watch', 'live'],
       })
diff --git a/tests/create-rpc-query-utils.test.ts b/tests/create-rpc-query-utils.test.ts
index eece78d..ef08196 100644
--- a/tests/create-rpc-query-utils.test.ts
+++ b/tests/create-rpc-query-utils.test.ts
@@ -45,7 +45,6 @@ describe(createRpcQueryUtils, () => {
         retry: false,
         queryFn: queryCoreSkipToken,
         queryKey: ['app', 'rpc', 'users', 'get', 'query'],
-        queryKeyHashFn: utils.users.get.queryOptions(skipToken).queryKeyHashFn,
       })
       const queryClient = new QueryClient()
       const observer = new QueryObserver(queryClient, options)
@@ -88,7 +87,7 @@ describe(createRpcQueryUtils, () => {
       ])
       expect(utils.toString.child.key()).toStrictEqual(['app', 'rpc', 'toString', 'child'])
       expect(utils.events.watch.key()).toStrictEqual(['app', 'rpc', 'events', 'watch'])
-      expect(utils.events.watch.streamedKey()).toStrictEqual([
+      expect(utils.events.watch.streamedKey().slice(0, 5)).toStrictEqual([
         'app',
         'rpc',
         'events',
@@ -101,7 +100,7 @@ describe(createRpcQueryUtils, () => {
       expect(Object.isFrozen(utils.users.get.queryKey({ id: 1 }))).toBe(true)
       expect(Object.isFrozen(utils.users.get.queryKey({ id: 1 }).at(-1))).toBe(true)
       const options = utils.users.get.queryOptions({ input: { id: 1 } })
-      expect(options.queryKeyHashFn(options.queryKey)).toBe(JSON.stringify(options.queryKey))
+      expect(options).not.toHaveProperty('queryKeyHashFn')
     }),
   )
 
@@ -156,12 +155,12 @@ describe(createRpcQueryUtils, () => {
 
       expect(skipToken).toBe(queryCoreSkipToken)
       expect(skipToken).toBe(reactQuerySkipToken)
-      const skipped = utils.users.get.queryOptions(skipToken)
+      const skipped = utils.users.get.queryOptions({ input: skipToken })
       expect(skipped).toMatchObject({
         queryFn: queryCoreSkipToken,
         queryKey: ['app', 'rpc', 'users', 'get', 'query'],
       })
-      expect(skipped.queryKeyHashFn(skipped.queryKey)).toBe(JSON.stringify(skipped.queryKey))
+      expect(skipped).not.toHaveProperty('queryKeyHashFn')
 
       const infiniteCallerOptions = {
         getNextPageParam: (): undefined => {},
@@ -179,15 +178,12 @@ describe(createRpcQueryUtils, () => {
         ...infiniteCallerOptions,
         queryFn: queryCoreSkipToken,
         queryKey: ['app', 'rpc', 'users', 'get', 'infinite'],
-        queryKeyHashFn: skipped.queryKeyHashFn,
       })
-      expect(skippedInfinite.queryKeyHashFn(skippedInfinite.queryKey)).toBe(
-        JSON.stringify(skippedInfinite.queryKey),
-      )
+      expect(skippedInfinite).not.toHaveProperty('queryKeyHashFn')
     }),
   )
 
-  it.effect('projects ordinary reflected objects with only the documented leaf interface', () =>
+  it.effect('projects ordinary reflected objects with literal RPC paths', () =>
     Effect.gen(function* () {
       const Status = Rpc.make('status', { success: Schema.Void })
       const BracketOnly = Rpc.make('billing-history.list all', { success: Schema.Void })
@@ -203,15 +199,6 @@ describe(createRpcQueryUtils, () => {
 
       expect(Object.getPrototypeOf(utils)).toBe(Object.prototype)
       expect(Reflect.ownKeys(utils)).toStrictEqual(['key', 'status', 'billing-history'])
-      expect(Object.keys(utils['billing-history']['list all']).sort()).toStrictEqual([
-        'infiniteKey',
-        'infiniteOptions',
-        'key',
-        'mutationKey',
-        'mutationOptions',
-        'queryKey',
-        'queryOptions',
-      ])
       expect(utils['billing-history']['list all'].key()).toStrictEqual([
         'app',
         'rpc',
@@ -268,7 +255,7 @@ describe(createRpcQueryUtils, () => {
     }),
   )
 
-  it.effect('projects unary and streaming leaves through their distinct interfaces', () =>
+  it.effect('projects mixed unary and streaming RPC paths with distinct view keys', () =>
     Effect.gen(function* () {
       const ListReports = Rpc.make('reports.list', { success: Schema.String })
       const ReportsStream = Rpc.make('reports.watch', { success: Schema.String, stream: true })
@@ -293,14 +280,7 @@ describe(createRpcQueryUtils, () => {
       expect(Object.keys(utils).sort()).toStrictEqual(['events', 'key', 'reports', 'updates'])
       expect(Object.keys(utils.reports).sort()).toStrictEqual(['key', 'list', 'watch'])
       expect(utils.reports.list.key()).toStrictEqual(['app', 'rpc', 'reports', 'list'])
-      expect(Object.keys(utils.events.audit.watch).sort()).toStrictEqual([
-        'key',
-        'liveKey',
-        'liveOptions',
-        'streamedKey',
-        'streamedOptions',
-      ])
-      expect(utils.events.audit.watch.streamedKey()).toStrictEqual([
+      expect(utils.events.audit.watch.streamedKey().slice(0, 6)).toStrictEqual([
         'app',
         'rpc',
         'events',
@@ -319,7 +299,7 @@ describe(createRpcQueryUtils, () => {
       expect(utils.events.audit.watch.streamedKey()).not.toStrictEqual(
         utils.events.audit.watch.liveKey(),
       )
-      expect(utils.updates.watch.streamedKey()).toStrictEqual([
+      expect(utils.updates.watch.streamedKey().slice(0, 5)).toStrictEqual([
         'app',
         'rpc',
         'updates',
diff --git a/tests/fixtures/async.ts b/tests/fixtures/async.ts
index 1968226..b166127 100644
--- a/tests/fixtures/async.ts
+++ b/tests/fixtures/async.ts
@@ -1,5 +1,3 @@
-/** Preserves successful results and exposes rejected values for runtime assertions. */
-// SAFETY: A rejected JavaScript Promise can contain any value; the tests inspect that value without parsing it away.
 /* oxlint-disable anti-slop/no-unknown-returns */
 export const captureFailure = async (promise: PromiseLike<unknown>): Promise<unknown> => {
   try {
diff --git a/tests/fixtures/docs-websocket-use.ts b/tests/fixtures/docs-websocket-use.ts
new file mode 100644
index 0000000..1d46cac
--- /dev/null
+++ b/tests/fixtures/docs-websocket-use.ts
@@ -0,0 +1,42 @@
+import { Effect } from 'effect'
+import { Socket } from 'effect/socket'
+
+import { fetchStreamSnapshot } from '#effect-api-query'
+
+import { acquireSocketQueries } from './socket-client.ts'
+
+export const readSocketSnapshot = Effect.fn('readSocketSnapshot')(function* (url: string) {
+  const application = yield* acquireSocketQueries(url, 'account-42').pipe(
+    Effect.provide(Socket.layerWebSocketConstructorGlobal),
+  )
+  const { queryClient, rpc } = application
+  try {
+    const reads = yield* Effect.promise(
+      async () =>
+        await Promise.all([
+          queryClient.query(rpc.values.read.queryOptions({ input: { id: 1 } })),
+          queryClient.query(rpc.values.read.queryOptions({ input: { id: 2 } })),
+        ]),
+    )
+    const input = { channel: 'clock' }
+    const history = yield* Effect.promise(
+      async () =>
+        await fetchStreamSnapshot(
+          queryClient,
+          rpc.values.watch.streamedOptions({ input, maxChunks: 20 }),
+          {
+            timeoutMs: 5000,
+          },
+        ),
+    )
+    const latest = yield* Effect.promise(
+      async () =>
+        await fetchStreamSnapshot(queryClient, rpc.values.watch.liveOptions({ input }), {
+          timeoutMs: 5000,
+        }),
+    )
+    return { reads, history, latest }
+  } finally {
+    yield* application.dispose
+  }
+})
diff --git a/tests/fixtures/effect-rpc.ts b/tests/fixtures/effect-rpc.ts
index e0f900e..83ae14c 100644
--- a/tests/fixtures/effect-rpc.ts
+++ b/tests/fixtures/effect-rpc.ts
@@ -30,8 +30,6 @@ const ObjectNamed = Rpc.make('toString.child', { success: Schema.Void })
 
 export const group = RpcGroup.make(GetUser, Ping, Fail, Watch, ObjectNamed)
 
-// The stateless handlers and their layer are shared; each test gets a fresh scoped
-// transport.
 const handlers = group.of({
   'diagnostics.fail': () => Effect.fail('declared-failure' as const),
   'events.watch': () => Stream.empty,
@@ -42,7 +40,6 @@ const handlers = group.of({
 })
 const handlersLayer = group.toLayer(handlers)
 
-/** Acquires an official in-memory flat client for an RPC group and its handlers. */
 export const makeRpcTestClient = Effect.fn('TestRpc.makeRpcTestClient')(function* <
   Rpcs extends Rpc.Any,
   const Handlers extends RpcGroup.HandlersFrom<Rpcs>,
@@ -52,7 +49,6 @@ export const makeRpcTestClient = Effect.fn('TestRpc.makeRpcTestClient')(function
   )
 })
 
-/** Acquires a fresh scoped client backed by the shared test handlers. */
 export const makeClient = Effect.fn('TestRpc.makeClient')(function* () {
   return yield* RpcTest.makeClient(group, { flatten: true }).pipe(Effect.provide(handlersLayer))
 })
diff --git a/tests/fixtures/http-client.ts b/tests/fixtures/http-client.ts
index d2cbf99..f5439a2 100644
--- a/tests/fixtures/http-client.ts
+++ b/tests/fixtures/http-client.ts
@@ -1,11 +1,9 @@
 import type { HttpApi, HttpApiClient } from 'effect/http-api'
 
-/** An inert ready-client fixture for tests that only construct keys and options. */
 export const unusedHttpClientFor = <Api extends HttpApi.Constraint>(
   _api: Api,
 ): HttpApiClient.ForApi<Api> => {
   const client = {}
-  // SAFETY: key-only tests never invoke a method; absent methods fail if accidentally executed.
   // oxlint-disable-next-line typescript/no-unsafe-type-assertion
   return client as HttpApiClient.ForApi<Api>
 }
diff --git a/tests/fixtures/optimistic-users.ts b/tests/fixtures/optimistic-users.ts
new file mode 100644
index 0000000..9b2a830
--- /dev/null
+++ b/tests/fixtures/optimistic-users.ts
@@ -0,0 +1,265 @@
+import {
+  CommandStatus,
+  ExampleAuthorization,
+  ExampleHttpAuthorization,
+  User,
+  UserPage,
+  exampleHttpApi,
+  exampleRpcGroup,
+} from '@effect-api-query/contracts'
+import type { CommandPayload } from '@effect-api-query/contracts'
+import type { ExampleRpcClient } from '@effect-api-query/contracts/client'
+import type { QueryClient } from '@tanstack/query-core'
+import { Deferred, Effect, Exit, Layer, Queue, Scope, Stream } from 'effect'
+import { HttpServer } from 'effect/http'
+import { HttpApiBuilder, HttpApiTest } from 'effect/http-api'
+import { RpcTest } from 'effect/rpc'
+import type { RpcClientError } from 'effect/rpc'
+
+import { createHttpApiQueryUtils, createRpcQueryUtils } from '#effect-api-query'
+
+import type { ViteReactApplication } from '../../examples/vite-react/src/lib/application.ts'
+import { makeOwnerCache, ownerKeyPrefix } from '../../examples/vite-react/src/lib/owner-cache.ts'
+import {
+  makeUsersInvalidator,
+  makeUserWrites,
+} from '../../examples/vite-react/src/lib/user-writes.ts'
+
+interface CreateRequest {
+  readonly name: string
+  readonly succeed: (user: User) => Promise<void>
+  readonly fail: () => Promise<void>
+}
+interface DeleteRequest {
+  readonly id: number
+  readonly succeed: () => Promise<void>
+  readonly fail: () => Promise<void>
+}
+interface ListRequest {
+  readonly signal: Deferred.Deferred<readonly User[]>
+  readonly succeed: (users: readonly User[]) => Promise<void>
+}
+
+interface ControlledUserWrites {
+  readonly application: ViteReactApplication
+  readonly nextCreate: () => Promise<CreateRequest>
+  readonly nextDelete: () => Promise<DeleteRequest>
+  readonly nextList: () => Promise<ListRequest>
+  readonly holdLists: () => void
+  readonly seed: (users: readonly User[]) => void
+  readonly retire: () => void
+}
+
+export const makeControlledUserWrites = Effect.fnUntraced(function* (
+  queryClient: QueryClient,
+  commandHandlers?: {
+    readonly start: (input: CommandPayload) => Effect.Effect<CommandStatus>
+    readonly status: (input: {
+      readonly operationId: string
+    }) => Effect.Effect<CommandStatus | null>
+  },
+): Effect.fn.Return<ControlledUserWrites> {
+  const scope = yield* Scope.make()
+  const run = Effect.runPromiseWith(yield* Effect.context())
+  const creates = yield* Queue.unbounded<CreateRequest>()
+  const deletes = yield* Queue.unbounded<DeleteRequest>()
+  const lists = yield* Queue.unbounded<ListRequest>()
+  let holdLists = false
+  let users: readonly User[] = []
+  const create = Effect.fnUntraced(function* ({ name }: { readonly name: string }) {
+    const gate = yield* Deferred.make<User>()
+    yield* Queue.offer(creates, {
+      name,
+      succeed: async (user) => {
+        users = [...users.filter((existing) => existing.id !== user.id), user]
+        await run(Deferred.succeed(gate, user))
+      },
+      fail: async () => {
+        await run(Deferred.interrupt(gate))
+      },
+    })
+    return yield* Deferred.await(gate)
+  })
+  const remove = Effect.fnUntraced(function* ({ id }: { readonly id: number }) {
+    const gate = yield* Deferred.make<undefined, 'user-not-found'>()
+    yield* Queue.offer(deletes, {
+      id,
+      succeed: async () => {
+        users = users.filter((user) => user.id !== id)
+        await run(Deferred.succeed(gate, undefined))
+      },
+      fail: async () => {
+        await run(Deferred.fail(gate, 'user-not-found'))
+      },
+    })
+    return yield* Deferred.await(gate)
+  })
+  const list = Effect.fnUntraced(function* () {
+    if (!holdLists) {
+      return users
+    }
+    const gate = yield* Deferred.make<readonly User[]>()
+    yield* Queue.offer(lists, {
+      signal: gate,
+      succeed: async (snapshot) => {
+        await run(Deferred.succeed(gate, snapshot))
+      },
+    })
+    return yield* Deferred.await(gate)
+  })
+  const page = ({ cursor, pageSize }: { readonly cursor: number; readonly pageSize: number }) =>
+    Effect.succeed(
+      new UserPage({
+        users: users.slice(cursor, cursor + pageSize),
+        total: users.length,
+        nextCursor: cursor + pageSize < users.length ? cursor + pageSize : null,
+      }),
+    )
+  const get = ({ id, locale }: { readonly id: number; readonly locale?: string | undefined }) => {
+    const user = users.find((candidate) => candidate.id === id)
+    return user === undefined
+      ? Effect.fail('user-not-found' as const)
+      : Effect.succeed(new User({ id: user.id, name: user.name, locale: locale ?? 'en' }))
+  }
+  const rpcClient: ExampleRpcClient = yield* RpcTest.makeClient(exampleRpcGroup, {
+    flatten: true,
+  }).pipe(
+    Effect.provide(
+      exampleRpcGroup.toLayer({
+        'users.create': create,
+        'users.delete': remove,
+        'users.list': list,
+        'users.get': get,
+        'users.page': page,
+        'testing.reset': () => Effect.void,
+        'testing.seed': () => Effect.succeed(users),
+        'diagnostics.stream': () => Stream.empty,
+        'diagnostics.fail': () => Effect.die('unused diagnostic'),
+        'diagnostics.cancel': () => Effect.void,
+        'diagnostics.slow': () => Effect.succeed('done'),
+        'diagnostics.status': () => Effect.succeed({ started: 0, interrupted: 0 }),
+        'diagnostics.operationStatus': () => Effect.succeed({ started: 0, interrupted: 0 }),
+        'commands.start':
+          commandHandlers?.start ??
+          (({ operationId, steps }) =>
+            Effect.succeed(
+              new CommandStatus({
+                operationId,
+                totalSteps: steps,
+                completedSteps: steps,
+                state: 'completed',
+              }),
+            )),
+        'commands.status': commandHandlers?.status ?? (() => Effect.succeed(null)),
+        'commands.cancel': ({ operationId }) =>
+          Effect.succeed(
+            new CommandStatus({
+              operationId,
+              totalSteps: 0,
+              completedSteps: 0,
+              state: 'cancelled',
+            }),
+          ),
+      }),
+    ),
+    Effect.provideService(
+      ExampleAuthorization,
+      ExampleAuthorization.of((effect) => effect),
+    ),
+    Scope.provide(scope),
+  )
+  const httpHandlers = HttpApiBuilder.group(exampleHttpApi, 'users', (group) =>
+    group
+      .handle('create', ({ payload }) => create(payload))
+      .handle('delete', ({ params }) => remove(params))
+      .handle('get', ({ params, query }) => get({ ...params, ...query }))
+      .handle('list', list)
+      .handle('page', ({ query }) => page(query)),
+  )
+  const diagnostics = HttpApiBuilder.group(exampleHttpApi, 'diagnostics', (group) =>
+    group
+      .handle('fail', () => Effect.die('unused diagnostic'))
+      .handle('slow', () => Effect.succeed('done'))
+      .handle('status', () => Effect.succeed({ started: 0, interrupted: 0 }))
+      .handle('operationStatus', () => Effect.succeed({ started: 0, interrupted: 0 })),
+  )
+  const httpClient = yield* HttpApiTest.groups(exampleHttpApi, ['users', 'diagnostics']).pipe(
+    Effect.provide(Layer.mergeAll(httpHandlers, diagnostics, HttpServer.layerServices)),
+    Effect.provideService(
+      ExampleHttpAuthorization,
+      ExampleHttpAuthorization.of((effect) => effect),
+    ),
+    Scope.provide(scope),
+  )
+  const identity = {
+    tenantId: 'example-team',
+    userId: 'example-user',
+    sessionGeneration: 1,
+    permissionGeneration: 1,
+  }
+  const keyPrefix = ownerKeyPrefix(identity)
+  const rpcQuery = createRpcQueryUtils<
+    typeof exampleRpcGroup,
+    ReturnType<typeof ownerKeyPrefix>,
+    RpcClientError.RpcClientError
+  >(exampleRpcGroup, {
+    client: rpcClient,
+    keyPrefix,
+  })
+  const httpQuery = createHttpApiQueryUtils(exampleHttpApi, {
+    client: httpClient,
+    keyPrefix,
+  })
+  const owner = makeOwnerCache({
+    identity,
+    queryClient,
+    directoryKeys: {
+      rpc: rpcQuery.users.list.queryKey(),
+      http: httpQuery.users.list.queryKey(),
+    },
+  })
+  const { isActive, runMutation, persistDirectory, trackMutationOptions } = owner
+  const invalidateUsers = makeUsersInvalidator({ queryClient, rpcQuery, httpQuery, isActive })
+  const userWrites = makeUserWrites({
+    queryClient,
+    rpcQuery,
+    httpQuery,
+    isActive,
+    invalidateUsers,
+    trackMutationOptions,
+  })
+  const dispose = async () => {
+    try {
+      await owner.retire()
+    } finally {
+      await run(Scope.close(scope, Exit.void))
+    }
+  }
+  return {
+    application: {
+      queryClient,
+      rpcQuery,
+      httpQuery,
+      userWrites,
+      identity: owner.identity,
+      persistDirectory,
+      trackMutationOptions,
+      isActive,
+      runMutation,
+      invalidateUsers,
+      dispose,
+    },
+    nextCreate: async () => run(Queue.take(creates)),
+    nextDelete: async () => run(Queue.take(deletes)),
+    nextList: async () => run(Queue.take(lists)),
+    holdLists: () => {
+      holdLists = true
+    },
+    seed: (data: readonly User[]) => {
+      users = data
+    },
+    retire: () => {
+      void owner.retire()
+    },
+  }
+})
diff --git a/tests/fixtures/query-cache.ts b/tests/fixtures/query-cache.ts
new file mode 100644
index 0000000..3197ee7
--- /dev/null
+++ b/tests/fixtures/query-cache.ts
@@ -0,0 +1,20 @@
+import type { QueryClient } from '@tanstack/query-core'
+import { Deferred, Effect, Exit } from 'effect'
+
+export const waitForQueryState = Effect.fnUntraced(function* (
+  queryClient: QueryClient,
+  check: () => boolean,
+) {
+  const ready = yield* Deferred.make<undefined>()
+  const observe = () => {
+    if (check()) {
+      Deferred.doneUnsafe(ready, Exit.succeed(undefined))
+    }
+  }
+  yield* Effect.acquireRelease(
+    Effect.sync(() => queryClient.getQueryCache().subscribe(observe)),
+    (unsubscribe) => Effect.sync(unsubscribe),
+  )
+  observe()
+  yield* Deferred.await(ready).pipe(Effect.timeout('5 seconds'))
+}, Effect.scoped)
diff --git a/tests/fixtures/rpc-transport-queries.ts b/tests/fixtures/rpc-transport-queries.ts
new file mode 100644
index 0000000..baad6a0
--- /dev/null
+++ b/tests/fixtures/rpc-transport-queries.ts
@@ -0,0 +1,64 @@
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Schema, Scope } from 'effect'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient, RpcClientError } from 'effect/rpc'
+
+import { createRpcQueryUtils } from '../../src/index.ts'
+
+export const transportGroup = RpcGroup.make(
+  Rpc.make('values.read', { payload: { id: Schema.Int }, success: Schema.Int }),
+)
+
+export const sharedStreamGroup = RpcGroup.make(
+  Rpc.make('burst', { success: Schema.Int, stream: true }),
+  Rpc.make('read', { success: Schema.Int }),
+)
+
+export const startSharedTransportQuery = Effect.fnUntraced(function* (
+  client: RpcClient.RpcClient.Flat<
+    RpcGroup.Rpcs<typeof sharedStreamGroup>,
+    RpcClientError.RpcClientError
+  >,
+  clientScope: Scope.Scope,
+) {
+  const queryClient = new QueryClient()
+  yield* Scope.addFinalizer(
+    clientScope,
+    Effect.promise(async () => {
+      await queryClient.cancelQueries()
+      queryClient.clear()
+    }),
+  )
+  const utils = createRpcQueryUtils(sharedStreamGroup, { client, keyPrefix: ['shared-transport'] })
+  const unary = yield* Effect.forkIn(
+    Effect.promise(
+      async () => await queryClient.query(utils.read.queryOptions({ retry: false })),
+    ).pipe(Effect.exit),
+    clientScope,
+  )
+  return { queryClient, unary }
+})
+
+export const queryTransportCalls = Effect.fnUntraced(function* (
+  client: RpcClient.RpcClient.Flat<
+    RpcGroup.Rpcs<typeof transportGroup>,
+    RpcClientError.RpcClientError
+  >,
+  count: number,
+) {
+  const queryClient = new QueryClient()
+  yield* Effect.addFinalizer(() =>
+    Effect.sync(() => {
+      queryClient.clear()
+    }),
+  )
+  const utils = createRpcQueryUtils(transportGroup, { client, keyPrefix: ['overhead'] })
+  const values = yield* Effect.promise(async () =>
+    Promise.all(
+      Array.from({ length: count }, async (_unused, id) =>
+        queryClient.query(utils.values.read.queryOptions({ input: { id }, retry: false })),
+      ),
+    ),
+  )
+  return { values, cacheEntries: queryClient.getQueryCache().getAll().length }
+})
diff --git a/tests/fixtures/socket-client.ts b/tests/fixtures/socket-client.ts
new file mode 100644
index 0000000..010c4cf
--- /dev/null
+++ b/tests/fixtures/socket-client.ts
@@ -0,0 +1,44 @@
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Exit, Layer, Schema, Scope } from 'effect'
+import { Rpc, RpcClient, RpcGroup, RpcSerialization } from 'effect/rpc'
+import { Socket } from 'effect/socket'
+
+import { createRpcQueryUtils } from '#effect-api-query'
+
+export const socketGroup = RpcGroup.make(
+  Rpc.make('values.read', { payload: { id: Schema.Int }, success: Schema.Int }),
+  Rpc.make('values.watch', {
+    payload: { channel: Schema.String },
+    success: Schema.Int,
+    stream: true,
+  }),
+)
+
+export const acquireSocketQueries = Effect.fn('acquireSocketQueries')(function* (
+  url: string,
+  owner: string,
+) {
+  const clientScope = yield* Scope.fork(yield* Effect.scope, 'sequential')
+  const socket = yield* Socket.makeWebSocket(url).pipe(Scope.provide(clientScope))
+  const protocol = yield* Layer.buildWithScope(
+    RpcClient.layerProtocolSocket().pipe(
+      Layer.provide(RpcSerialization.layerJson),
+      Layer.provide(Layer.succeed(Socket.Socket, socket)),
+    ),
+    clientScope,
+  )
+  const client = yield* RpcClient.make(socketGroup, { flatten: true }).pipe(
+    Effect.provide(protocol),
+    Scope.provide(clientScope),
+  )
+  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+  const rpc = createRpcQueryUtils(socketGroup, { client, keyPrefix: ['socket', owner] })
+  yield* Scope.addFinalizer(
+    clientScope,
+    Effect.promise(async () => {
+      await queryClient.cancelQueries()
+      queryClient.clear()
+    }),
+  )
+  return { client, rpc, queryClient, dispose: Scope.close(clientScope, Exit.void) }
+})
diff --git a/tests/fixtures/tsconfig.server-local.json b/tests/fixtures/tsconfig.server-local.json
new file mode 100644
index 0000000..fbe9f14
--- /dev/null
+++ b/tests/fixtures/tsconfig.server-local.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": [
+    "../../examples/server/src/server-local-rpc.ts",
+    "../types/server-local-client-contract.ts"
+  ]
+}
diff --git a/tests/fixtures/user-events.ts b/tests/fixtures/user-events.ts
new file mode 100644
index 0000000..169b7c0
--- /dev/null
+++ b/tests/fixtures/user-events.ts
@@ -0,0 +1,247 @@
+import type { QueryClient, QueryFilters } from '@tanstack/react-query'
+import { Data, Effect, Schema } from 'effect'
+import type { Reactivity } from 'effect/reactivity'
+
+import type { ViteReactApplication } from '../../examples/vite-react/src/lib/application.ts'
+import { ownerKeyPrefix } from '../../examples/vite-react/src/lib/owner-cache.ts'
+
+const EventEnvelope = {
+  schema: Schema.Literal('users.v1'),
+  ownerKey: Schema.String,
+  cursor: Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: Number.MAX_SAFE_INTEGER })),
+}
+const UserEventSchema = Schema.Union([
+  Schema.Struct({
+    ...EventEnvelope,
+    kind: Schema.Literal('user.changed'),
+    id: Schema.Int,
+    locale: Schema.String,
+  }),
+  Schema.Struct({ ...EventEnvelope, kind: Schema.Literal('users.changed') }),
+  Schema.Struct({ ...EventEnvelope, kind: Schema.Literal('users.reset') }),
+])
+
+export const decodeUserEvent = Schema.decodeUnknownEffect(UserEventSchema)
+type UserEvent = typeof UserEventSchema.Type
+
+class UserEventConsumerUnavailable extends Data.TaggedError('UserEventConsumerUnavailable')<{
+  readonly reason: 'inactive-owner' | 'already-registered'
+}> {}
+
+interface UserIdentity {
+  readonly id: number
+  readonly locale: string
+}
+
+export type UserEventOwner = Pick<
+  ViteReactApplication,
+  'identity' | 'isActive' | 'queryClient' | 'rpcQuery' | 'httpQuery'
+>
+
+const consumers = new WeakSet<QueryClient>()
+
+export const makeUserEventConsumer = Effect.fnUntraced(function* (
+  owner: UserEventOwner,
+  reactivity: Reactivity.Reactivity,
+  {
+    onRefreshError = console.error,
+    observedUsers = [],
+  }: {
+    readonly onRefreshError?: (error: Error) => void
+    readonly observedUsers?: readonly UserIdentity[]
+  } = {},
+) {
+  const runPromise = Effect.runPromiseWith(yield* Effect.context())
+  const ownerKey = JSON.stringify(ownerKeyPrefix(owner.identity))
+  const reactivityKeys = {
+    directory: JSON.stringify([ownerKey, 'users.directory']),
+    all: JSON.stringify([ownerKey, 'users.all']),
+    user: ({ id, locale }: UserIdentity) => JSON.stringify([ownerKey, 'user', id, locale]),
+  }
+  const { queryClient, rpcQuery, httpQuery } = owner
+  let pending: Promise<void> | undefined
+  let all = false
+  let directory = false
+  let cursor = 0
+  let active = true
+  const isActive = () => active && owner.isActive()
+  const users = new Map<string, UserIdentity>()
+  const markUser = (user: UserIdentity) => {
+    if (all) {
+      return
+    }
+    users.set(JSON.stringify([user.id, user.locale]), user)
+    if (users.size > 64) {
+      all = true
+      users.clear()
+    }
+  }
+  const run = Effect.fnUntraced(function* () {
+    while (all || directory || users.size > 0) {
+      if (!isActive()) {
+        all = false
+        directory = false
+        users.clear()
+        return
+      }
+      if (queryClient.isMutating() > 0) {
+        return
+      }
+      const filters: QueryFilters[] = all
+        ? [{ queryKey: rpcQuery.users.key() }, { queryKey: httpQuery.users.key() }]
+        : [
+            ...(directory
+              ? [
+                  { queryKey: rpcQuery.users.list.key() },
+                  { queryKey: rpcQuery.users.page.key() },
+                  { queryKey: httpQuery.users.list.key() },
+                  { queryKey: httpQuery.users.page.key() },
+                ]
+              : []),
+            ...[...users.values()].flatMap(({ id, locale }) => [
+              { queryKey: rpcQuery.users.get.queryKey({ id, locale }), exact: true },
+              {
+                queryKey: httpQuery.users.get.queryKey({
+                  params: { id },
+                  query: { locale },
+                }),
+                exact: true,
+              },
+            ]),
+          ]
+      all = false
+      directory = false
+      users.clear()
+      yield* Effect.promise(async () =>
+        Promise.all(filters.map(async (filter) => queryClient.invalidateQueries(filter))),
+      )
+    }
+  })
+  const schedule = () => {
+    if (pending !== undefined || queryClient.isMutating() > 0) {
+      return
+    }
+    pending = (async () => {
+      await Promise.resolve()
+      try {
+        await runPromise(run())
+      } finally {
+        pending = undefined
+        if (isActive() && (all || directory || users.size > 0)) {
+          schedule()
+        }
+      }
+    })()
+    const scheduled = pending
+    void (async () => {
+      try {
+        await scheduled
+      } catch (error) {
+        onRefreshError(new Error('Refreshing user cache failed', { cause: error }))
+      }
+    })()
+  }
+  const register = () => [
+    reactivity.registerUnsafe([reactivityKeys.directory], () => {
+      if (!isActive()) {
+        return
+      }
+      directory = true
+      schedule()
+    }),
+    ...observedUsers.map(({ id, locale }) =>
+      reactivity.registerUnsafe([reactivityKeys.user({ id, locale })], () => {
+        if (!isActive()) {
+          return
+        }
+        markUser({ id, locale })
+        schedule()
+      }),
+    ),
+    reactivity.registerUnsafe([reactivityKeys.all], () => {
+      if (!isActive()) {
+        return
+      }
+      all = true
+      schedule()
+    }),
+    queryClient.getMutationCache().subscribe(() => {
+      if (isActive() && queryClient.isMutating() === 0 && (all || directory || users.size > 0)) {
+        schedule()
+      }
+    }),
+  ]
+  yield* Effect.acquireRelease(
+    Effect.suspend(() => {
+      if (!owner.isActive() || consumers.has(queryClient)) {
+        return new UserEventConsumerUnavailable({
+          reason: owner.isActive() ? 'already-registered' : 'inactive-owner',
+        })
+      }
+      return Effect.sync(() => {
+        consumers.add(queryClient)
+        return register()
+      })
+    }),
+    (unregister) =>
+      Effect.sync(() => {
+        active = false
+        all = false
+        directory = false
+        users.clear()
+        consumers.delete(queryClient)
+        for (const cancel of unregister) {
+          cancel()
+        }
+      }),
+  )
+  const deliver = Effect.fnUntraced(function* (input: UserEvent) {
+    const event = yield* decodeUserEvent(input)
+    if (!isActive() || event.ownerKey !== ownerKey || event.cursor <= cursor) {
+      return false
+    }
+    if (event.cursor !== cursor + 1) {
+      all = true
+    }
+    ;({ cursor } = event)
+    if (event.kind === 'user.changed') {
+      markUser(event)
+      reactivity.invalidateUnsafe([reactivityKeys.directory])
+    } else {
+      reactivity.invalidateUnsafe([
+        event.kind === 'users.reset' ? reactivityKeys.all : reactivityKeys.directory,
+      ])
+    }
+    return true
+  })
+  const resume = Effect.fnUntraced(function* (replayAvailable: boolean) {
+    if (!isActive()) {
+      return cursor
+    }
+    if (!replayAvailable) {
+      cursor = 0
+      reactivity.invalidateUnsafe([reactivityKeys.all])
+    }
+    yield* Effect.void
+    return cursor
+  })
+  const flush = async (): Promise<void> =>
+    runPromise(
+      Effect.gen(function* () {
+        let scheduled = pending
+        while (scheduled !== undefined) {
+          const current = scheduled
+          yield* Effect.promise(async () => current)
+          scheduled = pending
+        }
+      }),
+    )
+  return {
+    ownerKey,
+    reactivityKeys,
+    deliver,
+    resume,
+    cursor: () => cursor,
+    flush,
+  }
+})
diff --git a/tests/fixtures/websocket-checks.ts b/tests/fixtures/websocket-checks.ts
new file mode 100644
index 0000000..1cdb805
--- /dev/null
+++ b/tests/fixtures/websocket-checks.ts
@@ -0,0 +1,348 @@
+import { CancelledError } from '@tanstack/query-core'
+import type { QueryClient, QueryKey } from '@tanstack/query-core'
+import { Cause, Deferred, Effect, Equal, Exit, Stream } from 'effect'
+import { RpcClient } from 'effect/rpc'
+import { deepStrictEqual, equal, ok } from 'node:assert/strict'
+
+import { isEffectRpcQueryError } from '#effect-api-query'
+
+import {
+  runSocketCase,
+  serveSocketGroup,
+} from '../../examples/server/tests/fixtures/websocket-server.ts'
+import { readSocketSnapshot } from './docs-websocket-use.ts'
+import { acquireSocketQueries } from './socket-client.ts'
+
+interface RetiringSocketOwner {
+  queryClient: QueryClient | undefined
+}
+
+const wait = <A>(deferred: Deferred.Deferred<A>) =>
+  Deferred.await(deferred).pipe(Effect.timeout('5 seconds'))
+
+const waitForData = async (
+  queryClient: QueryClient,
+  queryKey: QueryKey,
+  expected: number | readonly number[],
+) => {
+  const published = Deferred.makeUnsafe<undefined>()
+  const check = () => {
+    const data = queryClient.getQueryData(queryKey)
+    if (JSON.stringify(data) === JSON.stringify(expected)) {
+      Effect.runSync(Deferred.succeed(published, undefined))
+    }
+  }
+  const unsubscribe = queryClient.getQueryCache().subscribe(check)
+  try {
+    check()
+    await Effect.runPromise(wait(published))
+  } finally {
+    unsubscribe()
+  }
+}
+
+const settle = async (promise: PromiseLike<unknown>) => {
+  try {
+    return { status: 'success', data: await promise } as const
+  } catch (error) {
+    return { status: 'failure', error } as const
+  }
+}
+
+export const exerciseSocketConcurrency = async () =>
+  await runSocketCase(
+    Effect.gen(function* () {
+      const readsStarted = yield* Deferred.make<undefined>()
+      const releaseReads = yield* Deferred.make<undefined>()
+      const releaseSecond = yield* Deferred.make<undefined>()
+      const historyClosed = yield* Deferred.make<undefined>()
+      const liveClosed = yield* Deferred.make<undefined>()
+      let started = 0
+      const url = yield* serveSocketGroup({
+        'values.read': Effect.fnUntraced(function* ({ id }) {
+          started += 1
+          if (started === 2) {
+            yield* Deferred.succeed(readsStarted, undefined)
+          }
+          yield* Deferred.await(releaseReads)
+          return id * 10
+        }),
+        'values.watch': ({ channel }) =>
+          Stream.succeed(1).pipe(
+            Stream.concat(
+              channel === 'clock'
+                ? Stream.empty
+                : Stream.fromEffect(Deferred.await(releaseSecond).pipe(Effect.as(2))),
+            ),
+            Stream.concat(Stream.fromEffect(Effect.never)),
+            Stream.ensuring(
+              Deferred.succeed(channel === 'history' ? historyClosed : liveClosed, undefined).pipe(
+                Effect.asVoid,
+              ),
+            ),
+          ),
+      })
+      const { queryClient, rpc, dispose } = yield* acquireSocketQueries(url, 'first')
+      const reads = [1, 2].map(
+        async (id) => await queryClient.query(rpc.values.read.queryOptions({ input: { id } })),
+      )
+      const historyOptions = rpc.values.watch.streamedOptions({
+        input: { channel: 'history' },
+        rpcOptions: { streamBufferSize: 16 },
+      })
+      const liveOptions = rpc.values.watch.liveOptions({
+        input: { channel: 'live' },
+        rpcOptions: { streamBufferSize: 16 },
+      })
+      const history = settle(queryClient.query(historyOptions))
+      const live = settle(queryClient.query(liveOptions))
+      yield* wait(readsStarted)
+      yield* Effect.promise(async () => {
+        await waitForData(queryClient, historyOptions.queryKey, [1])
+      })
+      yield* Effect.promise(async () => {
+        await waitForData(queryClient, liveOptions.queryKey, 1)
+      })
+      equal(queryClient.getQueryState(historyOptions.queryKey)?.status, 'success')
+      equal(queryClient.getQueryState(historyOptions.queryKey)?.fetchStatus, 'fetching')
+      equal(queryClient.getQueryState(liveOptions.queryKey)?.status, 'success')
+      equal(queryClient.getQueryState(liveOptions.queryKey)?.fetchStatus, 'fetching')
+      equal(yield* Deferred.isDone(historyClosed), false)
+      equal(yield* Deferred.isDone(liveClosed), false)
+      yield* Effect.promise(async () => {
+        await queryClient.cancelQueries({ queryKey: historyOptions.queryKey, exact: true })
+      })
+      yield* wait(historyClosed)
+      const historyResult = yield* Effect.promise(async () => await history)
+      equal(historyResult.status, 'success')
+      if (historyResult.status === 'success') {
+        deepStrictEqual(historyResult.data, [1])
+      }
+      equal(yield* Deferred.isDone(liveClosed), false)
+      equal(queryClient.getQueryState(liveOptions.queryKey)?.fetchStatus, 'fetching')
+      yield* Deferred.succeed(releaseSecond, undefined)
+      yield* Effect.promise(async () => {
+        await waitForData(queryClient, liveOptions.queryKey, 2)
+      })
+      yield* Deferred.succeed(releaseReads, undefined)
+      const values = yield* Effect.promise(async () => await Promise.all(reads))
+      deepStrictEqual(values, [10, 20])
+      yield* Effect.promise(async () => {
+        await queryClient.cancelQueries({ queryKey: liveOptions.queryKey, exact: true })
+      })
+      yield* wait(liveClosed)
+      const liveResult = yield* Effect.promise(async () => await live)
+      equal(liveResult.status, 'success')
+      if (liveResult.status === 'success') {
+        equal(liveResult.data, 2)
+      }
+      deepStrictEqual(yield* readSocketSnapshot(url), {
+        reads: [10, 20],
+        history: [1],
+        latest: 1,
+      })
+      yield* dispose
+      equal(queryClient.isFetching(), 0)
+      equal(queryClient.getQueryCache().getAll().length, 0)
+      return {
+        reads: values,
+        history: [1],
+        latest: 1,
+        historyCancelled: true,
+        liveContinued: 2,
+        liveCancelled: true,
+      }
+    }),
+  )
+
+export const exerciseSocketInterruption = async () =>
+  await runSocketCase(
+    Effect.gen(function* () {
+      const readStarted = yield* Deferred.make<undefined>()
+      const releaseRead = yield* Deferred.make<undefined>()
+      const url = yield* serveSocketGroup({
+        'values.read': Effect.fnUntraced(function* ({ id }) {
+          if (id < 0) {
+            return yield* Effect.failCause(Cause.interrupt(42))
+          }
+          yield* Deferred.succeed(readStarted, undefined)
+          yield* Deferred.await(releaseRead)
+          return id * 10
+        }),
+        'values.watch': ({ channel }) => {
+          const interruption = Stream.failCause(Cause.interrupt(42))
+          return channel.endsWith('emitted')
+            ? Stream.succeed(7).pipe(Stream.concat(interruption))
+            : interruption
+        },
+      })
+      const { client, rpc, queryClient, dispose } = yield* acquireSocketQueries(url, 'interrupted')
+      const unaffected = queryClient.query(rpc.values.read.queryOptions({ input: { id: 3 } }))
+      yield* wait(readStarted)
+      const nativeUnary = yield* client('values.read', { id: -1 }).pipe(Effect.exit)
+      const generatedUnary = yield* Effect.promise(
+        async () =>
+          await settle(queryClient.query(rpc.values.read.queryOptions({ input: { id: -1 } }))),
+      )
+      ok(Exit.isFailure(nativeUnary))
+      equal(generatedUnary.status, 'failure')
+      if (generatedUnary.status === 'failure') {
+        ok(isEffectRpcQueryError(generatedUnary.error))
+        equal(generatedUnary.error.operation, 'query')
+        equal(Equal.equals(nativeUnary.cause, generatedUnary.error.cause), true)
+        equal(Cause.hasInterruptsOnly(generatedUnary.error.cause), true)
+      }
+      for (const view of ['streamed', 'live'] as const) {
+        for (const emitted of [false, true]) {
+          const input = { channel: `${view}-${emitted ? 'emitted' : 'empty'}` }
+          const nativeStream = yield* client('values.watch', input, {
+            streamBufferSize: 16,
+          }).pipe(Stream.runCollect, Effect.exit)
+          const options =
+            view === 'streamed'
+              ? rpc.values.watch.streamedOptions({ input, rpcOptions: { streamBufferSize: 16 } })
+              : rpc.values.watch.liveOptions({ input, rpcOptions: { streamBufferSize: 16 } })
+          const generatedStream = yield* Effect.promise(
+            async () =>
+              await settle(
+                view === 'streamed'
+                  ? queryClient.query(
+                      rpc.values.watch.streamedOptions({
+                        input,
+                        rpcOptions: { streamBufferSize: 16 },
+                      }),
+                    )
+                  : queryClient.query(
+                      rpc.values.watch.liveOptions({ input, rpcOptions: { streamBufferSize: 16 } }),
+                    ),
+              ),
+          )
+          ok(Exit.isFailure(nativeStream))
+          equal(generatedStream.status, 'failure')
+          if (generatedStream.status === 'failure') {
+            ok(isEffectRpcQueryError(generatedStream.error))
+            equal(generatedStream.error.rpcTag, 'values.watch')
+            equal(generatedStream.error.operation, view)
+            equal(Equal.equals(nativeStream.cause, generatedStream.error.cause), true)
+            equal(Cause.hasInterruptsOnly(generatedStream.error.cause), true)
+            equal(queryClient.getQueryState(options.queryKey)?.error, generatedStream.error)
+            equal(queryClient.getQueryState(options.queryKey)?.status, 'error')
+          }
+          const emittedData = view === 'streamed' ? [7] : 7
+          deepStrictEqual(
+            queryClient.getQueryData(options.queryKey),
+            emitted ? emittedData : undefined,
+          )
+          equal(
+            queryClient.getQueryState(rpc.values.read.queryKey({ id: 3 }))?.fetchStatus,
+            'fetching',
+          )
+        }
+      }
+      yield* Deferred.succeed(releaseRead, undefined)
+      const unaffectedRead = yield* Effect.promise(async () => await unaffected)
+      equal(unaffectedRead, 30)
+      yield* dispose
+      return { comparedWireCauses: 5, unaffectedRead }
+    }),
+  )
+
+export const exerciseSocketReplacement = async () =>
+  await runSocketCase(
+    Effect.gen(function* () {
+      const oldClosed = yield* Deferred.make<undefined>()
+      const unrelatedClosed = yield* Deferred.make<undefined>()
+      const replacementClosed = yield* Deferred.make<undefined>()
+      const releaseSecond = yield* Deferred.make<undefined>()
+      const readStarted = yield* Deferred.make<undefined>()
+      const disconnected = yield* Deferred.make<undefined>()
+      const ownerFinalizers = [oldClosed, replacementClosed]
+      const url = yield* serveSocketGroup({
+        'values.read': () =>
+          Deferred.succeed(readStarted, undefined).pipe(Effect.andThen(Effect.never)),
+        'values.watch': ({ channel }) => {
+          const finalized = channel === 'owner-a' ? ownerFinalizers.shift() : unrelatedClosed
+          if (finalized === undefined) {
+            return Stream.die(new Error('Unexpected owner acquisition'))
+          }
+          return Stream.succeed(1).pipe(
+            Stream.concat(Stream.fromEffect(Deferred.await(releaseSecond).pipe(Effect.as(2)))),
+            Stream.concat(Stream.fromEffect(Effect.never)),
+            Stream.ensuring(Deferred.succeed(finalized, undefined).pipe(Effect.asVoid)),
+          )
+        },
+      })
+      const retiringOwner: RetiringSocketOwner = { queryClient: undefined }
+      const oldOwner = yield* acquireSocketQueries(url, 'a').pipe(
+        Effect.provideService(RpcClient.ConnectionHooks, {
+          onConnect: Effect.void,
+          onDisconnect: Effect.gen(function* () {
+            equal(retiringOwner.queryClient?.isFetching(), 0)
+            equal(retiringOwner.queryClient?.getQueryCache().getAll().length, 0)
+            yield* Deferred.succeed(disconnected, undefined)
+          }),
+        }),
+      )
+      retiringOwner.queryClient = oldOwner.queryClient
+      const unrelatedOwner = yield* acquireSocketQueries(url, 'b')
+      const oldOptions = oldOwner.rpc.values.watch.liveOptions({ input: { channel: 'owner-a' } })
+      const unrelatedOptions = unrelatedOwner.rpc.values.watch.liveOptions({
+        input: { channel: 'owner-b' },
+      })
+      const oldRead = settle(
+        oldOwner.queryClient.query(oldOwner.rpc.values.read.queryOptions({ input: { id: 1 } })),
+      )
+      const oldStream = settle(oldOwner.queryClient.query(oldOptions))
+      const unrelatedStream = settle(unrelatedOwner.queryClient.query(unrelatedOptions))
+      yield* wait(readStarted)
+      yield* Effect.promise(async () => {
+        await waitForData(oldOwner.queryClient, oldOptions.queryKey, 1)
+      })
+      yield* Effect.promise(async () => {
+        await waitForData(unrelatedOwner.queryClient, unrelatedOptions.queryKey, 1)
+      })
+      yield* oldOwner.dispose
+      yield* wait(disconnected)
+      yield* wait(oldClosed)
+      const cancelledRead = yield* Effect.promise(async () => await oldRead)
+      equal(cancelledRead.status, 'failure')
+      if (cancelledRead.status === 'failure') {
+        equal(cancelledRead.error instanceof CancelledError, true)
+      }
+      yield* Effect.promise(async () => await oldStream)
+      equal(yield* Deferred.isDone(unrelatedClosed), false)
+      equal(
+        unrelatedOwner.queryClient.getQueryState(unrelatedOptions.queryKey)?.fetchStatus,
+        'fetching',
+      )
+      const replacement = yield* acquireSocketQueries(url, 'a')
+      const replacementOptions = replacement.rpc.values.watch.liveOptions({
+        input: { channel: 'owner-a' },
+      })
+      deepStrictEqual(replacementOptions.queryKey, oldOptions.queryKey)
+      equal(replacement.queryClient === oldOwner.queryClient, false)
+      const replacementStream = settle(replacement.queryClient.query(replacementOptions))
+      yield* Effect.promise(async () => {
+        await waitForData(replacement.queryClient, replacementOptions.queryKey, 1)
+      })
+      yield* Deferred.succeed(releaseSecond, undefined)
+      yield* Effect.promise(async () => {
+        await waitForData(unrelatedOwner.queryClient, unrelatedOptions.queryKey, 2)
+      })
+      yield* Effect.promise(async () => {
+        await waitForData(replacement.queryClient, replacementOptions.queryKey, 2)
+      })
+      equal(oldOwner.queryClient.getQueryCache().getAll().length, 0)
+      yield* unrelatedOwner.dispose
+      yield* replacement.dispose
+      yield* wait(unrelatedClosed)
+      yield* wait(replacementClosed)
+      yield* Effect.promise(async () => await Promise.all([unrelatedStream, replacementStream]))
+      return {
+        oldOwnerCancelled: true,
+        unrelatedOwnerContinued: 2,
+        replacementValue: 1,
+        disconnectsAfterQueryCancellation: true,
+      }
+    }),
+  )
diff --git a/tests/http-cached-views.test.ts b/tests/http-cached-views.test.ts
new file mode 100644
index 0000000..5cb230e
--- /dev/null
+++ b/tests/http-cached-views.test.ts
@@ -0,0 +1,548 @@
+import { it } from '@effect/vitest'
+import { QueryClient, QueryObserver } from '@tanstack/query-core'
+import { Cause, Deferred, Effect, Exit, Predicate, Schema, SchemaTransformation } from 'effect'
+import { HttpClient, HttpClientResponse } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiClient,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiSchema,
+} from 'effect/http-api'
+import { expect } from 'vite-plus/test'
+
+import { createHttpApiQueryUtils, isEffectHttpApiQueryError, skipToken } from '#effect-api-query'
+
+import { captureFailure } from './fixtures/async.ts'
+import { waitForQueryState } from './fixtures/query-cache.ts'
+
+const UndefinedValue = Schema.Null.pipe(
+  Schema.decodeTo(
+    Schema.Void,
+    SchemaTransformation.transform({ decode: () => {}, encode: () => null }),
+  ),
+)
+const api = HttpApi.make('cached-views').add(
+  HttpApiGroup.make('items').add(
+    HttpApiEndpoint.get('watch', '/watch', {
+      success: HttpApiSchema.StreamSse({ data: Schema.Union([Schema.Int, UndefinedValue]) }),
+    }),
+    HttpApiEndpoint.get('wrapped', '/wrapped', {
+      success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamSse({ data: Schema.Int }), {
+        'x-version': Schema.FiniteFromString,
+      }),
+    }),
+    HttpApiEndpoint.get('read', '/read', {
+      success: HttpApiSchema.WithHeaders(Schema.String, { etag: Schema.String }).pipe(
+        HttpApiSchema.status(203),
+      ),
+    }),
+  ),
+)
+const makeClient = (response: () => Response) =>
+  HttpApiClient.makeWith(api, {
+    baseUrl: 'https://example.test',
+    httpClient: HttpClient.make((request) =>
+      Effect.succeed(HttpClientResponse.fromWeb(request, response())),
+    ),
+  })
+const sse = (body: string, headers = {}) =>
+  new Response(body, { headers: { 'content-type': 'text/event-stream', ...headers } })
+
+it.effect('caches decoded SSE views with distinct decoder policies and header wrappers', () =>
+  Effect.gen(function* () {
+    const client = yield* makeClient(() => sse('data: 1\n\ndata: null\n\n', { 'x-version': '4' }))
+    const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['views'] })
+    const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    yield* Effect.addFinalizer(() =>
+      Effect.sync(() => {
+        queryClient.clear()
+      }),
+    )
+    expect(
+      yield* Effect.promise(
+        async () => await queryClient.query(http.items.watch.streamedOptions()),
+      ),
+    ).toStrictEqual([1, undefined])
+    expect(
+      yield* Effect.promise(async () => await queryClient.query(http.items.watch.liveOptions())),
+    ).toBeNull()
+    const wrapped = yield* makeClient(() => sse('data: 3\n\ndata: 7\n\n', { 'x-version': '4' }))
+    const wrappedHttp = createHttpApiQueryUtils(api, { client: wrapped, keyPrefix: ['wrapped'] })
+    expect(
+      yield* Effect.promise(
+        async () => await queryClient.query(wrappedHttp.items.wrapped.streamedOptions()),
+      ),
+    ).toStrictEqual([
+      HttpApiSchema.withHeaders({ body: 3, headers: { 'x-version': 4 } }),
+      HttpApiSchema.withHeaders({ body: 7, headers: { 'x-version': 4 } }),
+    ])
+    expect(
+      yield* Effect.promise(
+        async () => await queryClient.query(wrappedHttp.items.wrapped.liveOptions()),
+      ),
+    ).toStrictEqual(HttpApiSchema.withHeaders({ body: 7, headers: { 'x-version': 4 } }))
+    expect(http.items.watch.streamedKey()).toStrictEqual(
+      http.items.watch.streamedKey({ sseOptions: { maxEventSize: 10 * 1024 * 1024 } }),
+    )
+    expect(http.items.watch.streamedKey()).not.toStrictEqual(
+      http.items.watch.streamedKey({ sseOptions: { maxEventSize: 3 } }),
+    )
+    const decoderClient = yield* makeClient(
+      () =>
+        new Response(
+          new ReadableStream<Uint8Array>({
+            start(controller) {
+              controller.enqueue(new TextEncoder().encode('data: 12345'))
+              controller.enqueue(new TextEncoder().encode('\n\n'))
+              controller.close()
+            },
+          }),
+          { headers: { 'content-type': 'text/event-stream' } },
+        ),
+    )
+    const decoderHttp = createHttpApiQueryUtils(api, {
+      client: decoderClient,
+      keyPrefix: ['decoder'],
+    })
+    const failed = yield* Effect.promise(
+      async () =>
+        await captureFailure(
+          queryClient.query(
+            decoderHttp.items.watch.streamedOptions({ sseOptions: { maxEventSize: 3 } }),
+          ),
+        ),
+    )
+    expect(failed).toMatchObject({
+      _tag: 'EffectHttpApiQueryError',
+      operation: 'streamed',
+      endpoint: 'watch',
+    })
+    if (!isEffectHttpApiQueryError(failed)) {
+      throw new TypeError('Expected an HTTP execution error')
+    }
+    expect(failed.cause.reasons[0]).toMatchObject({ _tag: 'Fail', error: { _tag: 'SseError' } })
+    expect(queryClient.getQueryData(http.items.watch.streamedKey())).toStrictEqual([1, undefined])
+  }),
+)
+
+it.effect.each(['live', 'streamed'] as const)(
+  'preserves mixed acquisition Causes in HTTP %s views',
+  (view) =>
+    Effect.gen(function* () {
+      const defect = new Error('transport defect')
+      const cause = Cause.combine(Cause.interrupt(123), Cause.die(defect))
+      const client = yield* HttpApiClient.makeWith(api, {
+        baseUrl: 'https://example.test',
+        httpClient: HttpClient.make(() => Effect.failCause(cause)),
+      })
+      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['failure', view] })
+      const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          queryClient.clear()
+        }),
+      )
+      const error = yield* Effect.promise(
+        async () =>
+          await captureFailure(
+            view === 'live'
+              ? queryClient.query(http.items.watch.liveOptions())
+              : queryClient.query(http.items.watch.streamedOptions()),
+          ),
+      )
+      expect(error).toMatchObject({
+        _tag: 'EffectHttpApiQueryError',
+        apiId: 'cached-views',
+        groupId: 'items',
+        endpoint: 'watch',
+        method: 'GET',
+        operation: view,
+      })
+      if (!isEffectHttpApiQueryError(error)) {
+        throw new TypeError('Expected an HTTP execution error')
+      }
+      expect(error.cause.reasons.map((reason) => reason._tag)).toStrictEqual(['Interrupt', 'Die'])
+      expect(error.cause.reasons[0]).toMatchObject({ fiberId: 123 })
+      const [, reason] = error.cause.reasons
+      if (reason?._tag !== 'Die') {
+        throw new TypeError('Expected the original defect')
+      }
+      expect(reason.defect).toBe(defect)
+    }),
+)
+
+it.effect.each(
+  (['live', 'streamed'] as const).flatMap((view) => [
+    { view, body: 'data: "bad"\n\n', tag: 'SchemaError', published: false },
+    { view, body: 'id: v3\ndata: 1\n\nretry: 25\n\n', tag: 'Retry', published: true },
+  ]),
+)('preserves HTTP $view failure $tag and prior publication', ({ view, body, tag, published }) =>
+  Effect.gen(function* () {
+    const client = yield* makeClient(() => sse(body))
+    const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['decode', view] })
+    const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    yield* Effect.addFinalizer(() =>
+      Effect.sync(() => {
+        queryClient.clear()
+      }),
+    )
+    const error = yield* Effect.promise(
+      async () =>
+        await captureFailure(
+          view === 'live'
+            ? queryClient.query(http.items.watch.liveOptions())
+            : queryClient.query(http.items.watch.streamedOptions()),
+        ),
+    )
+    if (!isEffectHttpApiQueryError(error)) {
+      throw new TypeError('Expected an HTTP execution error')
+    }
+    expect(error.cause.reasons[0]).toMatchObject({ _tag: 'Fail', error: { _tag: tag } })
+    const publishedData = view === 'live' ? 1 : [1]
+    expect(
+      queryClient.getQueryData(
+        view === 'live' ? http.items.watch.liveKey() : http.items.watch.streamedKey(),
+      ),
+    ).toStrictEqual(published ? publishedData : undefined)
+  }),
+)
+
+it.effect.each(['live', 'streamed'] as const)(
+  'cancels and closes an HTTP %s body after the first publication',
+  (view) =>
+    Effect.gen(function* () {
+      const finalized = yield* Deferred.make<undefined>()
+      let signal: AbortSignal | undefined
+      let closed = 0
+      const client = yield* HttpApiClient.makeWith(api, {
+        baseUrl: 'https://example.test',
+        httpClient: HttpClient.make((request, _url, transportSignal) => {
+          signal = transportSignal
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(
+                new ReadableStream<Uint8Array>({
+                  start(controller) {
+                    controller.enqueue(new TextEncoder().encode('data: 1\n\n'))
+                  },
+                  cancel() {
+                    closed += 1
+                    Deferred.doneUnsafe(finalized, Exit.succeed(undefined))
+                  },
+                }),
+                { headers: { 'content-type': 'text/event-stream' } },
+              ),
+            ),
+          )
+        }),
+      })
+      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['cancel', view] })
+      const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+      const queryKey = view === 'live' ? http.items.watch.liveKey() : http.items.watch.streamedKey()
+      const pending =
+        view === 'live'
+          ? queryClient.query(http.items.watch.liveOptions())
+          : queryClient.query(http.items.watch.streamedOptions())
+      try {
+        yield* waitForQueryState(
+          queryClient,
+          () => queryClient.getQueryState(queryKey)?.status === 'success',
+        )
+        expect(queryClient.getQueryState(queryKey)?.fetchStatus).toBe('fetching')
+        yield* Effect.promise(async () => {
+          await queryClient.cancelQueries({ queryKey, exact: true })
+        })
+        yield* Deferred.await(finalized)
+        expect(signal?.aborted).toBe(true)
+        expect(closed).toBe(1)
+        expect(yield* Effect.promise(async () => await pending)).toStrictEqual(
+          view === 'live' ? 1 : [1],
+        )
+      } finally {
+        yield* Effect.promise(async () => {
+          await queryClient.cancelQueries({ queryKey, exact: true })
+        })
+        queryClient.clear()
+      }
+    }),
+)
+
+it.effect(
+  'captures immutable HTTP metadata separately from decoded data and preserves native sharing',
+  () =>
+    Effect.gen(function* () {
+      let revision = 1
+      const client = yield* makeClient(() =>
+        Response.json('document', {
+          status: 203,
+          headers: { 'content-type': 'application/json', etag: `"revision-${revision}"` },
+        }),
+      )
+      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['metadata'] })
+      const queryClient = new QueryClient()
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          queryClient.clear()
+        }),
+      )
+      const options = http.items.read.metadataOptions()
+      const first = yield* Effect.promise(async () => await queryClient.query(options))
+      expect(first).toMatchObject({
+        data: { body: 'document', headers: { etag: '"revision-1"' } },
+        status: 203,
+        headers: { etag: '"revision-1"' },
+      })
+      expect(Object.isFrozen(first)).toBe(true)
+      expect(Object.isFrozen(first.headers)).toBe(true)
+      expect(
+        yield* Effect.promise(async () => await queryClient.query(http.items.read.queryOptions())),
+      ).toStrictEqual(first.data)
+      expect(queryClient.getQueryCache().findAll({ queryKey: http.items.read.key() })).toHaveLength(
+        2,
+      )
+      revision = 2
+      const second = yield* Effect.promise(async () => await queryClient.query(options))
+      expect(second.headers['etag']).toBe('"revision-2"')
+      expect(first.headers['etag']).toBe('"revision-1"')
+      const cached = queryClient.getQueryData(options.queryKey)
+      yield* Effect.promise(async () => await queryClient.query(options))
+      expect(queryClient.getQueryData(options.queryKey)).toBe(cached)
+      queryClient.setQueryDefaults(http.items.read.key(), {
+        structuralSharing: (_previous, data) => {
+          if (!Predicate.isObject(data)) {
+            throw new TypeError('Expected a metadata view')
+          }
+          return { ...data, status: 211 }
+        },
+      })
+      yield* Effect.promise(async () => await queryClient.query(http.items.read.metadataOptions()))
+      const shared = queryClient.getQueryData(options.queryKey)
+      if (shared === undefined) {
+        throw new TypeError('Expected cached metadata')
+      }
+      expect(shared.status).toBe(211)
+      expect(Object.isFrozen(shared)).toBe(true)
+      expect(Object.isFrozen(shared.headers)).toBe(true)
+      const manual = { ...shared, headers: { etag: 'manual' } }
+      queryClient.setQueryData(options.queryKey, manual)
+      expect(Object.isFrozen(manual)).toBe(false)
+      expect(Object.isFrozen(manual.headers)).toBe(false)
+    }),
+)
+
+it.effect.each(['global', 'prefix'] as const)(
+  'uses %s HTTP hashing across unary, infinite and open stream views',
+  (mode) =>
+    Effect.gen(function* () {
+      const finalized = yield* Deferred.make<undefined>()
+      let closed = 0
+      let reads = 0
+      const client = yield* HttpApiClient.makeWith(api, {
+        baseUrl: 'https://example.test',
+        httpClient: HttpClient.make((request) => {
+          if (request.url.endsWith('/read')) {
+            reads += 1
+            return Effect.succeed(
+              HttpClientResponse.fromWeb(
+                request,
+                Response.json('server', { status: 203, headers: { etag: 'server' } }),
+              ),
+            )
+          }
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(
+                new ReadableStream<Uint8Array>({
+                  start(controller) {
+                    controller.enqueue(new TextEncoder().encode('data: 1\n\n'))
+                  },
+                  cancel() {
+                    closed += 1
+                    if (closed === 2) {
+                      Deferred.doneUnsafe(finalized, Exit.succeed(undefined))
+                    }
+                  },
+                }),
+                { headers: { 'content-type': 'text/event-stream' } },
+              ),
+            ),
+          )
+        }),
+      })
+      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['hashing-http'] })
+      const queryClient = new QueryClient({
+        defaultOptions: {
+          queries: {
+            retry: false,
+            staleTime: Infinity,
+            queryKeyHashFn: (key) => `global:${JSON.stringify(key)}`,
+          },
+        },
+      })
+      if (mode === 'prefix') {
+        queryClient.setQueryDefaults(http.key(), {
+          queryKeyHashFn: (key) => `prefix:${JSON.stringify(key)}`,
+        })
+      }
+      const history = new QueryObserver(queryClient, http.items.watch.streamedOptions())
+      const latest = new QueryObserver(queryClient, http.items.watch.liveOptions())
+      const stopHistory = history.subscribe(() => {})
+      const stopLatest = latest.subscribe(() => {})
+      try {
+        yield* waitForQueryState(
+          queryClient,
+          () =>
+            history.getCurrentResult().status === 'success' &&
+            latest.getCurrentResult().status === 'success',
+        )
+        expect(history.getCurrentResult()).toMatchObject({ data: [1], fetchStatus: 'fetching' })
+        expect(latest.getCurrentResult()).toMatchObject({ data: 1, fetchStatus: 'fetching' })
+        queryClient.setQueryData(http.items.watch.streamedKey(), [2])
+        queryClient.setQueryData(http.items.watch.liveKey(), 2)
+        expect(queryClient.getQueryData(http.items.watch.streamedKey())).toStrictEqual([2])
+        expect(queryClient.getQueryData(http.items.watch.liveKey())).toBe(2)
+        const unary = http.items.read.queryOptions()
+        const pages = http.items.read.infiniteOptions({
+          initialPageParam: 0,
+          getNextPageParam: () => {},
+        })
+        const returned = HttpApiSchema.withHeaders({ body: 'server', headers: { etag: 'server' } })
+        expect(yield* Effect.promise(async () => await queryClient.query(unary))).toStrictEqual(
+          returned,
+        )
+        expect(
+          yield* Effect.promise(async () => await queryClient.infiniteQuery(pages)),
+        ).toStrictEqual({ pages: [returned], pageParams: [0] })
+        const manual = HttpApiSchema.withHeaders({ body: 'native', headers: { etag: 'native' } })
+        queryClient.setQueryData(http.items.read.queryKey(), manual)
+        queryClient.setQueryData(http.items.read.infiniteKey(), {
+          pages: [manual],
+          pageParams: [0],
+        })
+        expect(yield* Effect.promise(async () => await queryClient.query(unary))).toStrictEqual(
+          manual,
+        )
+        expect(
+          yield* Effect.promise(async () => await queryClient.infiniteQuery(pages)),
+        ).toStrictEqual({ pages: [manual], pageParams: [0] })
+        expect(reads).toBe(2)
+        expect(queryClient.getQueryCache().getAll()).toHaveLength(4)
+        expect(
+          queryClient
+            .getQueryCache()
+            .getAll()
+            .every((query) => query.queryHash.startsWith(`${mode}:`)),
+        ).toBe(true)
+      } finally {
+        stopHistory()
+        stopLatest()
+        yield* Effect.promise(async () => {
+          await queryClient.cancelQueries()
+        })
+        yield* Deferred.await(finalized)
+        queryClient.clear()
+      }
+    }),
+)
+
+it.effect.each(['reset', 'append', 'replace'] as const)(
+  'retains bounded HTTP %s histories with native refetch publication',
+  (refetchMode) =>
+    Effect.gen(function* () {
+      let calls = 0
+      const client = yield* makeClient(() => {
+        calls += 1
+        return sse(
+          calls === 1 ? 'data: 1\n\ndata: 2\n\ndata: 3\n\n' : 'data: 4\n\ndata: 5\n\ndata: 6\n\n',
+        )
+      })
+      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['http-refetch'] })
+      const options = http.items.watch.streamedOptions({ maxChunks: 2, refetchMode })
+      const queryClient = new QueryClient()
+      const publications: unknown[] = []
+      try {
+        expect(yield* Effect.promise(async () => await queryClient.query(options))).toStrictEqual([
+          2, 3,
+        ])
+        const stop = queryClient.getQueryCache().subscribe((event) => {
+          if (event.type === 'updated' && event.action.type === 'success') {
+            publications.push(event.query.state.data)
+          }
+        })
+        try {
+          expect(yield* Effect.promise(async () => await queryClient.query(options))).toStrictEqual(
+            [5, 6],
+          )
+          expect(publications.length).toBeGreaterThan(0)
+          if (refetchMode === 'replace') {
+            expect(publications.every((data) => JSON.stringify(data) === '[5,6]')).toBe(true)
+          } else {
+            expect(publications).toContainEqual(refetchMode === 'reset' ? [4] : [3, 4])
+          }
+          expect(
+            queryClient.getQueryData(http.items.watch.streamedKey({ maxChunks: 2, refetchMode })),
+          ).toStrictEqual([5, 6])
+          expect(calls).toBe(2)
+        } finally {
+          stop()
+        }
+      } finally {
+        queryClient.clear()
+      }
+    }),
+)
+
+it.effect('validates HTTP history policies before skipped queries acquire a request', () =>
+  Effect.gen(function* () {
+    const inputApi = HttpApi.make('skipped-policies').add(
+      HttpApiGroup.make('events').add(
+        HttpApiEndpoint.get('watch', '/watch', {
+          query: { channel: Schema.String },
+          success: HttpApiSchema.StreamSse({ data: Schema.Int }),
+        }),
+      ),
+    )
+    let requests = 0
+    const client = yield* HttpApiClient.makeWith(inputApi, {
+      baseUrl: 'https://example.test',
+      httpClient: HttpClient.make((request) => {
+        requests += 1
+        return Effect.succeed(HttpClientResponse.fromWeb(request, sse('data: 1\n\n')))
+      }),
+    })
+    const http = createHttpApiQueryUtils(inputApi, { client, keyPrefix: ['skipped-http'] })
+    for (const input of [{ query: { channel: 'news' } }, skipToken] as const) {
+      for (const maxChunks of [0, Number.NaN, Number.MAX_SAFE_INTEGER + 1]) {
+        const build = () => http.events.watch.streamedOptions({ input, maxChunks })
+        expect(build).toThrow(
+          expect.objectContaining({
+            code: 'InvalidMaxChunks',
+            apiId: 'skipped-policies',
+            endpoint: 'watch',
+          }),
+        )
+      }
+    }
+    const queryClient = new QueryClient()
+    const observer = new QueryObserver(
+      queryClient,
+      http.events.watch.streamedOptions({
+        input: skipToken,
+        initialData: [9],
+        maxChunks: 2,
+        refetchMode: 'append',
+      }),
+    )
+    const stop = observer.subscribe(() => {})
+    try {
+      expect(observer.getCurrentResult()).toMatchObject({ data: [9], fetchStatus: 'idle' })
+      expect(requests).toBe(0)
+    } finally {
+      stop()
+      queryClient.clear()
+    }
+  }),
+)
diff --git a/tests/http-execution.test.ts b/tests/http-execution.test.ts
index 22eda4f..9219df4 100644
--- a/tests/http-execution.test.ts
+++ b/tests/http-execution.test.ts
@@ -344,7 +344,6 @@ describe('HTTP execution', () => {
       const input = { params: { scenario } }
       try {
         for (const operation of ['query', 'mutation'] as const) {
-          // SAFETY: Query and mutation runs share a Cause recorder; sequential execution isolates each identity assertion.
           /* oxlint-disable eslint/no-await-in-loop */
           const error: unknown = await captureFailure(
             operation === 'query'
@@ -370,16 +369,6 @@ describe('HTTP execution', () => {
           })
           expect(error.message).not.toContain(scenario)
           expect(error.message).not.toContain(privateToken)
-          expect(Object.keys(error).sort()).toStrictEqual([
-            '_tag',
-            'apiId',
-            'cause',
-            'endpoint',
-            'groupId',
-            'method',
-            'name',
-            'operation',
-          ])
         }
       } finally {
         queryClient.clear()
diff --git a/tests/http-hydration.test.ts b/tests/http-hydration.test.ts
new file mode 100644
index 0000000..6757d5c
--- /dev/null
+++ b/tests/http-hydration.test.ts
@@ -0,0 +1,361 @@
+import { it } from '@effect/vitest'
+import { QueryClient } from '@tanstack/query-core'
+import { Deferred, Effect, Exit, Schema, Scope, Stream } from 'effect'
+import { HttpServer } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiBuilder,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiSchema,
+  HttpApiTest,
+} from 'effect/http-api'
+import { expect } from 'vite-plus/test'
+
+import { createHttpApiQueryUtils, fetchStreamSnapshot } from '#effect-api-query'
+
+import { Profile } from './types/docs-hydration-rich.ts'
+import {
+  ArchivedProfile,
+  HistoryElement,
+  prepareViewHydration,
+  prepareViewSnapshot,
+  SnapshotDecoding,
+  SnapshotEncoding,
+} from './types/docs-hydration-views.ts'
+
+it.effect('hydrates buffered and metadata views and refetches an alternate declared success', () =>
+  Effect.gen(function* () {
+    const api = HttpApi.make('hydration-metadata').add(
+      HttpApiGroup.make('profiles').add(
+        HttpApiEndpoint.get('read', '/read', {
+          success: [
+            HttpApiSchema.WithHeaders(Profile, { 'x-version': Schema.FiniteFromString }),
+            HttpApiSchema.WithHeaders(ArchivedProfile, {
+              'x-version': Schema.FiniteFromString,
+            }).pipe(HttpApiSchema.status(203)),
+          ],
+        }),
+      ),
+    )
+    const profile = new Profile({
+      name: 'Ada',
+      credits: 9_007_199_254_740_993n,
+      avatar: new Uint8Array([0, 1, 255]),
+    })
+    const archived = new ArchivedProfile({ archived: true, name: 'Grace', credits: 42n })
+    const serverScope = yield* Scope.make()
+    const browserScope = yield* Scope.make()
+    const server = new QueryClient()
+    const browser = new QueryClient()
+    const restored = new QueryClient()
+    yield* Effect.addFinalizer(() =>
+      Effect.gen(function* () {
+        server.clear()
+        browser.clear()
+        restored.clear()
+        yield* Scope.close(serverScope, Exit.void)
+        yield* Scope.close(browserScope, Exit.void)
+      }),
+    )
+    let serverReads = 0
+    let browserReads = 0
+    let encoded = 0
+    let decoded = 0
+    const encoding = {
+      beforeEncode: Effect.sync(() => {
+        encoded += 1
+      }),
+    }
+    const decoding = {
+      beforeDecode: Effect.sync(() => {
+        decoded += 1
+      }),
+    }
+    const serverClient = yield* HttpApiTest.groups(api, ['profiles']).pipe(
+      Effect.provide(
+        HttpApiBuilder.group(api, 'profiles', (handlers) =>
+          handlers.handle('read', () =>
+            Effect.sync(() => {
+              serverReads += 1
+              return HttpApiSchema.withHeaders({ body: profile, headers: { 'x-version': 4 } })
+            }),
+          ),
+        ),
+      ),
+      Effect.provideService(Scope.Scope, serverScope),
+    )
+    const browserClient = yield* HttpApiTest.groups(api, ['profiles']).pipe(
+      Effect.provide(
+        HttpApiBuilder.group(api, 'profiles', (handlers) =>
+          handlers.handle('read', () =>
+            Effect.sync(() => {
+              browserReads += 1
+              return HttpApiSchema.withHeaders({ body: archived, headers: { 'x-version': 7 } })
+            }),
+          ),
+        ),
+      ),
+      Effect.provideService(Scope.Scope, browserScope),
+    )
+    const serverOptions = createHttpApiQueryUtils(api, {
+      client: serverClient,
+      keyPrefix: ['hydration-views', 'metadata'],
+    }).profiles.read.metadataOptions({ retry: false, staleTime: Infinity })
+    const browserOptions = createHttpApiQueryUtils(api, {
+      client: browserClient,
+      keyPrefix: ['hydration-views', 'metadata'],
+    }).profiles.read.metadataOptions({ retry: false, staleTime: Infinity })
+    const serverBuffered = createHttpApiQueryUtils(api, {
+      client: serverClient,
+      keyPrefix: ['hydration-views', 'buffered'],
+    }).profiles.read.queryOptions({ retry: false, staleTime: Infinity })
+    const browserBuffered = createHttpApiQueryUtils(api, {
+      client: browserClient,
+      keyPrefix: ['hydration-views', 'buffered'],
+    }).profiles.read.queryOptions({ retry: false, staleTime: Infinity })
+    const initial = yield* Effect.promise(async () => await server.query(serverOptions))
+    yield* Effect.promise(async () => await server.query(serverBuffered))
+    const json = yield* prepareViewSnapshot(server).pipe(
+      Effect.provideService(SnapshotEncoding, encoding),
+    )
+    expect(server.getQueryData(serverOptions.queryKey)).toBe(initial)
+    expect(initial.data.body).toBeInstanceOf(Profile)
+    expect(initial.status).toBe(200)
+    server.clear()
+    yield* Scope.close(serverScope, Exit.void)
+    yield* prepareViewHydration(browser, json).pipe(
+      Effect.provideService(SnapshotDecoding, decoding),
+    )
+    const hydrated = yield* Effect.promise(async () => await browser.query(browserOptions))
+    const hydratedBuffered = yield* Effect.promise(async () => await browser.query(browserBuffered))
+    expect(hydratedBuffered).toStrictEqual(hydrated.data)
+    if (!(hydratedBuffered.body instanceof Profile)) {
+      throw new TypeError('Expected a hydrated buffered Profile')
+    }
+    expect(hydratedBuffered.body.summary()).toBe('Ada: 9007199254740993 credits')
+    expect(hydratedBuffered.body.avatar).toStrictEqual(new Uint8Array([0, 1, 255]))
+    expect(browserReads).toBe(0)
+    expect(hydrated.data).toStrictEqual(
+      HttpApiSchema.withHeaders({ body: profile, headers: { 'x-version': 4 } }),
+    )
+    expect(hydrated.data.body).toBeInstanceOf(Profile)
+    if (!(hydrated.data.body instanceof Profile)) {
+      throw new TypeError('Expected a hydrated Profile')
+    }
+    expect(hydrated.data.body.summary()).toBe('Ada: 9007199254740993 credits')
+    expect(hydrated.data.body.avatar).toStrictEqual(new Uint8Array([0, 1, 255]))
+    expect(hydrated.data.headers['x-version']).toBe(4)
+    expect(hydrated.status).toBe(200)
+    expect(hydrated.headers['x-version']).toBe('4')
+    yield* Effect.promise(async () => {
+      await browser.invalidateQueries({
+        queryKey: browserOptions.queryKey,
+        exact: true,
+        refetchType: 'none',
+      })
+      await browser.invalidateQueries({
+        queryKey: browserBuffered.queryKey,
+        exact: true,
+        refetchType: 'none',
+      })
+    })
+    const refreshed = yield* Effect.promise(async () => await browser.query(browserOptions))
+    expect(refreshed.data.body).toBeInstanceOf(ArchivedProfile)
+    expect(refreshed.data.body.summary()).toBe('Grace: 42 archived credits')
+    expect(refreshed.data.headers['x-version']).toBe(7)
+    expect(refreshed.status).toBe(203)
+    expect(refreshed.headers['x-version']).toBe('7')
+    const refreshedBuffered = yield* Effect.promise(
+      async () => await browser.query(browserBuffered),
+    )
+    expect(refreshedBuffered.body).toBeInstanceOf(ArchivedProfile)
+    expect(refreshedBuffered.body.summary()).toBe('Grace: 42 archived credits')
+    expect(refreshedBuffered.headers['x-version']).toBe(7)
+    expect(Object.isFrozen(refreshed)).toBe(true)
+    expect(Object.isFrozen(refreshed.headers)).toBe(true)
+    const refreshedJson = yield* prepareViewSnapshot(browser).pipe(
+      Effect.provideService(SnapshotEncoding, encoding),
+    )
+    yield* prepareViewHydration(restored, refreshedJson).pipe(
+      Effect.provideService(SnapshotDecoding, decoding),
+    )
+    const restoredMetadata = restored.getQueryData(browserOptions.queryKey)
+    expect(restoredMetadata?.data).toStrictEqual(
+      HttpApiSchema.withHeaders({ body: archived, headers: { 'x-version': 7 } }),
+    )
+    expect(restoredMetadata?.data.body).toBeInstanceOf(ArchivedProfile)
+    expect(restoredMetadata?.data.body.summary()).toBe('Grace: 42 archived credits')
+    expect(restoredMetadata).toMatchObject({
+      status: 203,
+      headers: { 'x-version': '7' },
+      data: { headers: { 'x-version': 7 } },
+    })
+    expect([serverReads, browserReads, encoded, decoded]).toStrictEqual([2, 2, 4, 4])
+  }).pipe(Effect.provide(HttpServer.layerServices)),
+)
+
+it.effect('hydrates wrapped SSE live and history views with independent browser resources', () =>
+  Effect.gen(function* () {
+    const api = HttpApi.make('hydration-sse').add(
+      HttpApiGroup.make('profiles').add(
+        HttpApiEndpoint.get('watch', '/watch', {
+          success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamSse({ data: HistoryElement }), {
+            'x-version': Schema.FiniteFromString,
+          }),
+        }),
+      ),
+    )
+    const profile = new Profile({
+      name: 'Ada',
+      credits: 9_007_199_254_740_993n,
+      avatar: new Uint8Array([0, 1, 255]),
+    })
+    const serverClosed = yield* Deferred.make<undefined>()
+    const browserClosed = yield* Deferred.make<undefined>()
+    const serverScope = yield* Scope.make()
+    const browserScope = yield* Scope.make()
+    const server = new QueryClient()
+    const browser = new QueryClient()
+    const restored = new QueryClient()
+    yield* Effect.addFinalizer(() =>
+      Effect.gen(function* () {
+        yield* Effect.promise(async () => {
+          await server.cancelQueries()
+          await browser.cancelQueries()
+        })
+        server.clear()
+        browser.clear()
+        restored.clear()
+        yield* Scope.close(serverScope, Exit.void)
+        yield* Scope.close(browserScope, Exit.void)
+      }),
+    )
+    let serverReads = 0
+    let browserReads = 0
+    const serverClient = yield* HttpApiTest.groups(api, ['profiles']).pipe(
+      Effect.provide(
+        HttpApiBuilder.group(api, 'profiles', (handlers) =>
+          handlers.handle('watch', () =>
+            Effect.sync(() => {
+              serverReads += 1
+              return HttpApiSchema.withHeaders({
+                body: Stream.make(profile).pipe(
+                  Stream.concat(Stream.never),
+                  Stream.ensuring(Deferred.succeed(serverClosed, undefined)),
+                ),
+                headers: { 'x-version': 4 },
+              })
+            }),
+          ),
+        ),
+      ),
+      Effect.provideService(Scope.Scope, serverScope),
+    )
+    const browserClient = yield* HttpApiTest.groups(api, ['profiles']).pipe(
+      Effect.provide(
+        HttpApiBuilder.group(api, 'profiles', (handlers) =>
+          handlers.handle('watch', () =>
+            Effect.sync(() => {
+              browserReads += 1
+              return HttpApiSchema.withHeaders({
+                body: Stream.make(undefined).pipe(
+                  Stream.concat(Stream.never),
+                  Stream.ensuring(Deferred.succeed(browserClosed, undefined)),
+                ),
+                headers: { 'x-version': 7 },
+              })
+            }),
+          ),
+        ),
+      ),
+      Effect.provideService(Scope.Scope, browserScope),
+    )
+    const serverOptions = createHttpApiQueryUtils(api, {
+      client: serverClient,
+      keyPrefix: ['hydration-views', 'wrapped-live'],
+    }).profiles.watch.liveOptions({ retry: false })
+    const browserOptions = createHttpApiQueryUtils(api, {
+      client: browserClient,
+      keyPrefix: ['hydration-views', 'wrapped-live'],
+    }).profiles.watch.liveOptions({ retry: false })
+    const serverHistory = createHttpApiQueryUtils(api, {
+      client: serverClient,
+      keyPrefix: ['hydration-views', 'wrapped-history'],
+    }).profiles.watch.streamedOptions({ retry: false })
+    const browserHistory = createHttpApiQueryUtils(api, {
+      client: browserClient,
+      keyPrefix: ['hydration-views', 'wrapped-history'],
+    }).profiles.watch.streamedOptions({ retry: false })
+    const initial = yield* Effect.promise(
+      async () => await fetchStreamSnapshot(server, serverOptions),
+    )
+    yield* Deferred.await(serverClosed)
+    expect(initial.body).toBeInstanceOf(Profile)
+    expect(initial.headers['x-version']).toBe(4)
+    const initialHistory = yield* Effect.promise(
+      async () => await fetchStreamSnapshot(server, serverHistory),
+    )
+    expect(initialHistory).toStrictEqual([initial])
+    const json = yield* prepareViewSnapshot(server).pipe(
+      Effect.provideService(SnapshotEncoding, { beforeEncode: Effect.void }),
+    )
+    expect(server.getQueryData(serverOptions.queryKey)).toBe(initial)
+    server.clear()
+    yield* Scope.close(serverScope, Exit.void)
+    expect(Deferred.isDoneUnsafe(browserClosed)).toBe(false)
+    yield* prepareViewHydration(browser, json).pipe(
+      Effect.provideService(SnapshotDecoding, { beforeDecode: Effect.void }),
+    )
+    const hydrated = yield* Effect.promise(
+      async () => await fetchStreamSnapshot(browser, browserOptions, { mode: 'cached' }),
+    )
+    expect(browserReads).toBe(0)
+    expect(hydrated).toStrictEqual(
+      HttpApiSchema.withHeaders({ body: profile, headers: { 'x-version': 4 } }),
+    )
+    expect(hydrated.body).toBeInstanceOf(Profile)
+    if (!(hydrated.body instanceof Profile)) {
+      throw new TypeError('Expected a hydrated Profile')
+    }
+    expect(hydrated.body.summary()).toBe('Ada: 9007199254740993 credits')
+    expect(hydrated.body.avatar).toStrictEqual(new Uint8Array([0, 1, 255]))
+    expect(hydrated.headers['x-version']).toBe(4)
+    const hydratedHistory = yield* Effect.promise(
+      async () => await fetchStreamSnapshot(browser, browserHistory, { mode: 'cached' }),
+    )
+    expect(hydratedHistory).toStrictEqual([hydrated])
+    expect(browserReads).toBe(0)
+    const fresh = yield* Effect.promise(
+      async () => await fetchStreamSnapshot(browser, browserOptions),
+    )
+    yield* Deferred.await(browserClosed)
+    expect(fresh).toStrictEqual(
+      HttpApiSchema.withHeaders({ body: undefined, headers: { 'x-version': 7 } }),
+    )
+    expect(fresh.body).toBeUndefined()
+    expect(fresh.headers['x-version']).toBe(7)
+    const freshHistory = yield* Effect.promise(
+      async () => await fetchStreamSnapshot(browser, browserHistory),
+    )
+    expect(freshHistory).toStrictEqual([fresh])
+    const freshJson = yield* prepareViewSnapshot(browser).pipe(
+      Effect.provideService(SnapshotEncoding, { beforeEncode: Effect.void }),
+    )
+    yield* prepareViewHydration(restored, freshJson).pipe(
+      Effect.provideService(SnapshotDecoding, { beforeDecode: Effect.void }),
+    )
+    const restoredSnapshot = restored.getQueryData(browserOptions.queryKey)
+    expect(restoredSnapshot).toStrictEqual(
+      HttpApiSchema.withHeaders({ body: undefined, headers: { 'x-version': 7 } }),
+    )
+    expect(restoredSnapshot).toHaveProperty('body', undefined)
+    expect(restoredSnapshot?.headers['x-version']).toBe(7)
+    expect(restored.getQueryData(browserHistory.queryKey)).toStrictEqual([fresh])
+    expect([serverReads, browserReads]).toStrictEqual([2, 2])
+    expect(server.isFetching()).toBe(0)
+    expect(browser.isFetching()).toBe(0)
+    expect(server.getQueryCache().hasListeners()).toBe(false)
+    expect(browser.getQueryCache().hasListeners()).toBe(false)
+  }).pipe(Effect.provide(HttpServer.layerServices)),
+)
diff --git a/tests/http-live-query.test.ts b/tests/http-live-query.test.ts
new file mode 100644
index 0000000..ebb91c8
--- /dev/null
+++ b/tests/http-live-query.test.ts
@@ -0,0 +1,50 @@
+import { it } from '@effect/vitest'
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Layer, Schema, Stream } from 'effect'
+import { HttpServer } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiBuilder,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiSchema,
+  HttpApiTest,
+} from 'effect/http-api'
+import { expect } from 'vite-plus/test'
+
+import { createHttpApiQueryUtils, EffectHttpApiQueryEmptyStreamError } from '#effect-api-query'
+
+const api = HttpApi.make('empty-live').add(
+  HttpApiGroup.make('events').add(
+    HttpApiEndpoint.get('watch', '/watch', {
+      success: HttpApiSchema.StreamSse({ data: Schema.Finite }),
+    }),
+  ),
+)
+const handlers = HttpApiBuilder.group(api, 'events', (group) =>
+  group.handle('watch', () => Effect.succeed(Stream.empty)),
+)
+
+it.effect('reports declaration identity when an HTTP live stream completes without an event', () =>
+  Effect.gen(function* () {
+    const client = yield* HttpApiTest.groups(api, ['events'])
+    const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['test'] })
+    const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+    try {
+      yield* Effect.promise(async () => {
+        const pending = queryClient.query(http.events.watch.liveOptions())
+        await expect(pending).rejects.toBeInstanceOf(EffectHttpApiQueryEmptyStreamError)
+        await expect(pending).rejects.toMatchObject({
+          _tag: 'EffectHttpApiQueryEmptyStreamError',
+          apiId: 'empty-live',
+          groupId: 'events',
+          endpoint: 'watch',
+          method: 'GET',
+          operation: 'live',
+        })
+      })
+    } finally {
+      queryClient.clear()
+    }
+  }).pipe(Effect.provide(Layer.mergeAll(handlers, HttpServer.layerServices)), Effect.scoped),
+)
diff --git a/tests/http-multipart.test.ts b/tests/http-multipart.test.ts
index 8273f9a..f713e9c 100644
--- a/tests/http-multipart.test.ts
+++ b/tests/http-multipart.test.ts
@@ -37,7 +37,6 @@ const UploadApi = HttpApi.make('uploads').add(
 
 describe('HTTP multipart mutations', () => {
   it('rejects key encoders for retained multipart mutation endpoints', () => {
-    // SAFETY: JavaScript callers can configure an encoder that the published type contract rejects.
     /* oxlint-disable typescript/no-unsafe-type-assertion */
     const options = {
       client: unusedHttpClientFor(UploadApi),
diff --git a/tests/http-query-options.test.ts b/tests/http-query-options.test.ts
index 37456f6..5155a78 100644
--- a/tests/http-query-options.test.ts
+++ b/tests/http-query-options.test.ts
@@ -47,16 +47,12 @@ describe('HTTP query options', () => {
     )
     const utils = createHttpApiQueryUtils(Api, { client, keyPrefix: ['test'] })
     const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
-    // SAFETY: Extra untyped caller fields deliberately verify that generated options retain ownership of query identity.
-    /* oxlint-disable anti-slop/no-known-value-widening */
     const options = utils.users.list.infiniteOptions({
       initialPageParam: 0,
       input: (cursor) => ({ query: { cursor, filter: 'active' } }),
       getNextPageParam: (lastPage) => lastPage.next,
       staleTime: Infinity,
-      ...({ queryHash: 'collision' } as object),
     })
-    /* oxlint-enable anti-slop/no-known-value-widening */
     const observer = new InfiniteQueryObserver(queryClient, options)
     const unsubscribe = observer.subscribe(() => {})
     try {
@@ -69,18 +65,14 @@ describe('HTTP query options', () => {
         ],
         pageParams: [0, 1],
       })
-      // SAFETY: Extra untyped caller fields deliberately verify that generated options retain ownership of query identity.
-      /* oxlint-disable anti-slop/no-known-value-widening */
       await expect(
         queryClient.query(
           utils.users.list.queryOptions({
             input: { query: { cursor: 42, filter: 'active' } },
             staleTime: Infinity,
-            ...({ queryHash: 'collision' } as object),
           }),
         ),
       ).resolves.toStrictEqual({ items: ['active:42'], next: null })
-      /* oxlint-enable anti-slop/no-known-value-widening */
       expect(options.queryKey).toStrictEqual([
         'test',
         'http',
@@ -215,7 +207,7 @@ describe('HTTP query options', () => {
     const unsubscribe = observer.subscribe(() => {})
     const unsubscribePages = pages.subscribe(() => {})
     try {
-      expect(utils.users.list.queryOptions(skipToken).queryFn).toBe(skipToken)
+      expect(utils.users.list.queryOptions({ input: skipToken }).queryFn).toBe(skipToken)
       expect(options).toMatchObject({
         queryFn: skipToken,
         queryKey: ['test', 'http', 'pages', 'users', 'list', 'query'],
@@ -261,7 +253,6 @@ describe('HTTP query options', () => {
     const utils = createHttpApiQueryUtils(api, { client, keyPrefix: ['test'] })
     const queryClient = new QueryClient()
     try {
-      // SAFETY: Extra untyped caller fields deliberately verify that generated options retain ownership of query identity.
       /* oxlint-disable anti-slop/no-known-value-widening */
       const options = utils.refresh.infiniteOptions({
         initialPageParam: 0,
@@ -271,12 +262,11 @@ describe('HTTP query options', () => {
         ...({
           queryKey: ['replacement'],
           queryFn: () => 'replacement',
-          queryKeyHashFn: () => 'replacement',
         } as object),
       })
       /* oxlint-enable anti-slop/no-known-value-widening */
       expect(options.queryKey).toStrictEqual(utils.refresh.infiniteKey())
-      expect(options.queryKeyHashFn(options.queryKey)).toBe(JSON.stringify(options.queryKey))
+      expect(options).not.toHaveProperty('queryKeyHashFn')
       expect(options).toMatchObject({ staleTime: Infinity, meta: { label: 'refresh' } })
       await expect(queryClient.infiniteQuery({ ...options, pages: 2 })).resolves.toStrictEqual({
         pages: [null, null],
diff --git a/tests/http-semantic-keys.test.ts b/tests/http-semantic-keys.test.ts
index 7a8dc56..b609afd 100644
--- a/tests/http-semantic-keys.test.ts
+++ b/tests/http-semantic-keys.test.ts
@@ -36,7 +36,6 @@ const utils = createHttpApiQueryUtils(api, {
   keyPrefix: ['test'],
 })
 
-// SAFETY: The encoder deliberately returns malformed JavaScript values to exercise strict JSON rejection.
 /* oxlint-disable anti-slop/no-unknown-returns, typescript/no-unsafe-type-assertion */
 const encodeTestKey = (encode: () => unknown) =>
   createHttpApiQueryUtils(api, {
@@ -89,7 +88,6 @@ describe('HTTP semantic keys', () => {
       const read = async (request: typeof input) =>
         await queryClient.query(http.requests.read.queryOptions({ input: request }))
       await expect(read(input)).resolves.toBe('[1,null,"Ada","en"]')
-      // SAFETY: A required encoder is deliberately omitted to verify the synchronous configuration-error boundary.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       await expect(
         read({
@@ -201,12 +199,13 @@ describe('HTTP semantic keys', () => {
     }
   })
 
-  it('omits undefined object members and normalizes encoded header names', () => {
-    const key = utils.requests.save.queryKey({
+  it('omits undefined members and normalizes header names without changing the input', () => {
+    const input = {
       query: { filter: undefined },
       headers: { 'X-Locale': 'en', 'x-locale': 'en', ignored: undefined },
       payload: { nested: { kept: [2, 1] } },
-    })
+    }
+    const key = utils.requests.save.queryKey(input)
     expect(key.at(-1)).toStrictEqual({
       query: {},
       headers: { 'x-locale': 'en' },
@@ -219,6 +218,21 @@ describe('HTTP semantic keys', () => {
         payload: { nested: { kept: [2, 1] } },
       }),
     )
+    expect(input.headers).toStrictEqual({
+      'X-Locale': 'en',
+      'x-locale': 'en',
+      ignored: undefined,
+    })
+    expect(input.query).toStrictEqual({ filter: undefined })
+    expect(input.payload.nested).toStrictEqual({ kept: [2, 1] })
+    expect(Object.isFrozen(input.headers)).toBe(false)
+    expect(Object.isFrozen(input.payload.nested.kept)).toBe(false)
+    input.payload.nested.kept[0] = 99
+    expect(key.at(-1)).toStrictEqual({
+      query: {},
+      headers: { 'x-locale': 'en' },
+      payload: { nested: { kept: [2, 1] } },
+    })
     expect(Object.isFrozen(key)).toBe(true)
     expect(Object.isFrozen(key.at(-1))).toBe(true)
   })
@@ -235,6 +249,39 @@ describe('HTTP semantic keys', () => {
     ).toThrow(expect.objectContaining({ code: 'InvalidKeyValue' }))
   })
 
+  it('omits nested undefined query members while preserving shared caller values', () => {
+    const contract = HttpApi.make('nested').add(
+      HttpApiGroup.make('requests').add(
+        HttpApiEndpoint.get('read', '/read', {
+          query: {
+            rows: Schema.Array(
+              Schema.Struct({ id: Schema.String, absent: Schema.optional(Schema.String) }),
+            ),
+          },
+        }),
+      ),
+    )
+    const http = createHttpApiQueryUtils(contract, {
+      client: unusedHttpClientFor(contract),
+      keyPrefix: ['test'],
+    })
+    const shared = { id: 'first' }
+    const input = { query: { rows: [shared, { id: 'second', absent: undefined }, shared] } }
+    const key = http.requests.read.queryKey(input)
+
+    expect(key.at(-1)).toStrictEqual({
+      query: { rows: [{ id: 'first' }, { id: 'second' }, { id: 'first' }] },
+    })
+    expect(input.query.rows[0]).toBe(shared)
+    expect(input.query.rows[1]).toStrictEqual({ id: 'second', absent: undefined })
+    expect(input.query.rows[2]).toBe(shared)
+    expect(Object.isFrozen(input.query.rows)).toBe(false)
+    shared.id = 'changed'
+    expect(key.at(-1)).toStrictEqual({
+      query: { rows: [{ id: 'first' }, { id: 'second' }, { id: 'first' }] },
+    })
+  })
+
   it('preserves array order and rejects missing array entries in default request keys', () => {
     const contract = HttpApi.make('arrays').add(
       HttpApiGroup.make('search').add(
@@ -251,10 +298,8 @@ describe('HTTP semantic keys', () => {
     expect(http.search.find.queryKey({ query: { values: ['b', 'a'] } })).not.toStrictEqual(
       http.search.find.queryKey({ query: { values: ['a', 'b'] } }),
     )
-    // SAFETY: The sparse array deliberately preserves missing entries so strict JSON validation can reject it.
     /* oxlint-disable unicorn/no-new-array */
     for (const values of [new Array<unknown>(1), [undefined]]) {
-      // SAFETY: A required encoder is deliberately omitted to verify the synchronous configuration-error boundary.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       expect(() =>
         http.search.find.queryOptions({ input: { query: { values } } } as never),
@@ -264,6 +309,30 @@ describe('HTTP semantic keys', () => {
     /* oxlint-enable unicorn/no-new-array */
   })
 
+  it('rejects inherited array entries in default request keys', () => {
+    const contract = HttpApi.make('inherited').add(
+      HttpApiGroup.make('requests').add(
+        HttpApiEndpoint.post('read', '/read', { payload: Schema.Unknown }),
+      ),
+    )
+    const http = createHttpApiQueryUtils(contract, {
+      client: unusedHttpClientFor(contract),
+      keyPrefix: ['test'],
+    })
+    const values = ['removed', 'present']
+    Reflect.deleteProperty(values, '0')
+    const prototype = { 0: 'inherited' }
+    Object.setPrototypeOf(prototype, Array.prototype)
+    Object.setPrototypeOf(values, prototype)
+
+    expect(() => http.requests.read.queryKey({ payload: values })).toThrow(
+      expect.objectContaining({ code: 'InvalidKeyValue' }),
+    )
+    expect(() => http.requests.read.queryOptions({ input: { payload: values } })).toThrow(
+      expect.objectContaining({ code: 'InvalidKeyValue' }),
+    )
+  })
+
   it('keeps custom encoder output strict, copied, and deeply frozen', () => {
     const input = { query: {}, headers: {}, payload: null }
     const value = { nested: { values: [2, 1] } }
@@ -280,7 +349,6 @@ describe('HTTP semantic keys', () => {
     }
     const cycle: Cycle = {}
     cycle.self = cycle
-    // SAFETY: The sparse array deliberately preserves missing entries so strict JSON validation can reject it.
     /* oxlint-disable unicorn/no-new-array */
     for (const invalid of [
       undefined,
@@ -324,7 +392,6 @@ describe('HTTP semantic keys', () => {
       { 'forms.v1': { ping: encode } },
       { 'forms.v1': { upload: encode } },
     ]) {
-      // SAFETY: Undeclared encoders deliberately exercise atomic validation of the encoder map.
       /* oxlint-disable typescript/no-unsafe-type-assertion */
       expect(() =>
         createHttpApiQueryUtils(contract, {
@@ -425,7 +492,6 @@ describe('HTTP semantic keys', () => {
             HttpApiEndpoint.post('save', '/:value', { [part]: schema }),
           ),
         )
-        // SAFETY: A required encoder is deliberately omitted to verify the synchronous configuration-error boundary.
         /* oxlint-disable typescript/no-unsafe-type-assertion */
         expect(() =>
           createHttpApiQueryUtils(contract, {
@@ -435,7 +501,6 @@ describe('HTTP semantic keys', () => {
         ).toThrow(expect.objectContaining({ code: 'MissingKeyEncoder' }))
         /* oxlint-enable typescript/no-unsafe-type-assertion */
         let received: unknown
-        // SAFETY: This mock records arbitrary invocation values so request ownership can be asserted without changing the input.
         /* oxlint-disable anti-slop/no-unknown-parameters, typescript/no-unsafe-type-assertion */
         const safe = createHttpApiQueryUtils(contract, {
           client: unusedHttpClientFor(contract),
@@ -451,7 +516,6 @@ describe('HTTP semantic keys', () => {
         } as never)
         /* oxlint-enable anti-slop/no-unknown-parameters, typescript/no-unsafe-type-assertion */
         const input = { [part]: { value: Redacted.make('secret') } }
-        // SAFETY: This mock records arbitrary invocation values so request ownership can be asserted without changing the input.
         /* oxlint-disable anti-slop/no-unknown-parameters */
         expect(
           (safe.requests.save.queryKey as (input: unknown) => readonly unknown[])(input).at(-1),
diff --git a/tests/http-transport-cancellation.test.ts b/tests/http-transport-cancellation.test.ts
index c353187..e393739 100644
--- a/tests/http-transport-cancellation.test.ts
+++ b/tests/http-transport-cancellation.test.ts
@@ -1,8 +1,8 @@
+import { NodeHttpServer } from '@effect/platform-node'
 import { CancelledError, QueryClient } from '@tanstack/query-core'
-import { Cause, Effect, Exit, Predicate, Schema } from 'effect'
+import { Cause, Deferred, Effect, Exit, Predicate, Schema } from 'effect'
 import { FetchHttpClient } from 'effect/http'
 import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
-import { once } from 'node:events'
 import { createServer } from 'node:http'
 import { describe, expect, it } from 'vite-plus/test'
 
@@ -24,102 +24,89 @@ describe('HTTP transport cancellation', () => {
   it.each(['query', 'later page'] as const)(
     'interrupts a %s and closes its real HTTP request',
     async (mode) => {
-      let received!: () => void
-      let disconnected!: () => void
-      // SAFETY: This Promise bridges a callback or externally observed event so cancellation can be awaited.
-      /* oxlint-disable promise/avoid-new */
-      const requestReceived = new Promise<void>((resolve) => {
-        received = resolve
-      })
-      /* oxlint-enable promise/avoid-new */
-      // SAFETY: This Promise bridges a callback or externally observed event so cancellation can be awaited.
-      /* oxlint-disable promise/avoid-new */
-      const requestDisconnected = new Promise<void>((resolve) => {
-        disconnected = resolve
-      })
-      /* oxlint-enable promise/avoid-new */
-      const paths: string[] = []
-      const server = createServer((request, response) => {
-        paths.push(request.url ?? '')
-        if (request.url === '/pages/0') {
-          response.setHeader('content-type', 'application/json')
-          response.end(JSON.stringify('first'))
-          return
-        }
-        response.on('close', disconnected)
-        received()
-      })
-      server.listen(0, '127.0.0.1')
-      await once(server, 'listening')
-      const address = server.address()
-      if (address === null || Predicate.isString(address)) {
-        throw new Error('Expected TCP address')
-      }
-      const queryClient = new QueryClient()
-      try {
-        const client = await Effect.runPromise(
-          HttpApiClient.make(Api, { baseUrl: `http://127.0.0.1:${address.port}` }).pipe(
-            Effect.provide(FetchHttpClient.layer),
-          ),
-        )
-        let interrupted!: (cause: Cause.Cause<unknown>) => void
-        // SAFETY: This Promise bridges a callback or externally observed event so cancellation can be awaited.
-        /* oxlint-disable promise/avoid-new */
-        const interruption = new Promise<Cause.Cause<unknown>>((resolve) => {
-          interrupted = resolve
-        })
-        /* oxlint-enable promise/avoid-new */
-        let requestSignal: AbortSignal | undefined
-        const runPromiseExit: RunPromiseExit = async (effect, options) => {
-          requestSignal = options?.signal
-          const exit = await Effect.runPromiseExit(effect, options)
-          if (Exit.isFailure(exit)) {
-            interrupted(exit.cause)
+      await Effect.runPromise(
+        Effect.gen(function* () {
+          const requestReceived = yield* Deferred.make<undefined>()
+          const requestDisconnected = yield* Deferred.make<undefined>()
+          const interruption = yield* Deferred.make<Cause.Cause<unknown>>()
+          const runSync = Effect.runSyncWith(yield* Effect.context())
+          const paths: string[] = []
+          const server = createServer((request, response) => {
+            paths.push(request.url ?? '')
+            if (request.url === '/pages/0') {
+              response.setHeader('content-type', 'application/json')
+              response.end(JSON.stringify('first'))
+              return
+            }
+            response.on('close', () => {
+              runSync(Deferred.succeed(requestDisconnected, undefined))
+            })
+            runSync(Deferred.succeed(requestReceived, undefined))
+          })
+          yield* NodeHttpServer.make(() => server, {
+            host: '127.0.0.1',
+            port: 0,
+            disablePreemptiveShutdown: true,
+          })
+          yield* Effect.addFinalizer(() =>
+            Effect.sync(() => {
+              server.closeAllConnections()
+            }),
+          )
+          const address = server.address()
+          if (address === null || Predicate.isString(address)) {
+            throw new Error('Expected TCP address')
           }
-          return exit
-        }
-        const utils = createHttpApiQueryUtils(Api, { client, keyPrefix: ['test'], runPromiseExit })
-        const pending =
-          mode === 'query'
-            ? queryClient.query(utils.pages.read.queryOptions({ input: { params: { page: 1 } } }))
-            : queryClient.infiniteQuery({
-                ...utils.pages.read.infiniteOptions({
-                  initialPageParam: 0,
-                  input: (page) => ({ params: { page } }),
-                  getNextPageParam: (_last, _pages, page) => page + 1,
-                }),
-                pages: 2,
-              })
-        const result = captureFailure(pending)
-        await requestReceived
-        expect(requestSignal?.aborted).toBe(false)
-        await queryClient.cancelQueries({ queryKey: utils.pages.read.key() })
-        await expect(result).resolves.toBeInstanceOf(CancelledError)
-        expect(requestSignal?.aborted).toBe(true)
-        expect(Cause.hasInterrupts(await interruption)).toBe(true)
-        await requestDisconnected
-        expect(paths).toStrictEqual(mode === 'query' ? ['/pages/1'] : ['/pages/0', '/pages/1'])
-        expect(queryClient.isFetching()).toBe(0)
-      } finally {
-        queryClient.clear()
-        // SAFETY: The Node server-close callback must be bridged to a Promise to await shutdown.
-        /* oxlint-disable promise/avoid-new */
-        const closed = new Promise<void>((resolve, reject) => {
-          // SAFETY: The Node server-close callback must be bridged to a Promise to await shutdown.
-          /* oxlint-disable promise/prefer-await-to-callbacks */
-          server.close((error) => {
-            if (error === undefined) {
-              resolve()
-            } else {
-              reject(error)
+          const queryClient = new QueryClient()
+          yield* Effect.addFinalizer(() =>
+            Effect.sync(() => {
+              queryClient.clear()
+            }),
+          )
+          const client = yield* HttpApiClient.make(Api, {
+            baseUrl: `http://127.0.0.1:${address.port}`,
+          }).pipe(Effect.provide(FetchHttpClient.layer))
+          let requestSignal: AbortSignal | undefined
+          const runPromiseExit: RunPromiseExit = async (effect, options) => {
+            requestSignal = options?.signal
+            const exit = await Effect.runPromiseExit(effect, options)
+            if (Exit.isFailure(exit)) {
+              runSync(Deferred.succeed(interruption, exit.cause))
             }
+            return exit
+          }
+          const utils = createHttpApiQueryUtils(Api, {
+            client,
+            keyPrefix: ['test'],
+            runPromiseExit,
+          })
+          const pending =
+            mode === 'query'
+              ? queryClient.query(utils.pages.read.queryOptions({ input: { params: { page: 1 } } }))
+              : queryClient.infiniteQuery({
+                  ...utils.pages.read.infiniteOptions({
+                    initialPageParam: 0,
+                    input: (page) => ({ params: { page } }),
+                    getNextPageParam: (_last, _pages, page) => page + 1,
+                  }),
+                  pages: 2,
+                })
+          const result = captureFailure(pending)
+          yield* Deferred.await(requestReceived)
+          expect(requestSignal?.aborted).toBe(false)
+          yield* Effect.promise(async () => {
+            await queryClient.cancelQueries({ queryKey: utils.pages.read.key() })
+          })
+          yield* Effect.promise(async () => {
+            await expect(result).resolves.toBeInstanceOf(CancelledError)
           })
-          /* oxlint-enable promise/prefer-await-to-callbacks */
-        })
-        /* oxlint-enable promise/avoid-new */
-        server.closeAllConnections()
-        await closed
-      }
+          expect(requestSignal?.aborted).toBe(true)
+          expect(Cause.hasInterrupts(yield* Deferred.await(interruption))).toBe(true)
+          yield* Deferred.await(requestDisconnected)
+          expect(paths).toStrictEqual(mode === 'query' ? ['/pages/1'] : ['/pages/0', '/pages/1'])
+          expect(queryClient.isFetching()).toBe(0)
+        }).pipe(Effect.scoped),
+      )
     },
   )
 })
diff --git a/tests/packed-consumer/http-runtime.mts b/tests/packed-consumer/http-runtime.mts
deleted file mode 100644
index cca3a0f..0000000
--- a/tests/packed-consumer/http-runtime.mts
+++ /dev/null
@@ -1,591 +0,0 @@
-// fallow-ignore-file unused-file
-// The packed-package verifier executes this fixture in isolated consumers.
-import { MutationObserver, QueryClient, isCancelledError } from '@tanstack/query-core'
-import { Cause, Effect, Exit, Layer, Schema } from 'effect'
-import {
-  createHttpApiQueryUtils,
-  createRpcQueryUtils,
-  EffectHttpApiQueryError,
-  isEffectHttpApiQueryError,
-  skipToken,
-  type RunPromiseExit,
-} from 'effect-api-query'
-import {
-  FetchHttpClient,
-  HttpClient,
-  HttpClientRequest,
-  HttpClientResponse,
-  HttpServer,
-  Multipart,
-} from 'effect/http'
-import {
-  HttpApi,
-  HttpApiBuilder,
-  HttpApiClient,
-  HttpApiEndpoint,
-  HttpApiGroup,
-  HttpApiMiddleware,
-  HttpApiSchema,
-  HttpApiTest,
-} from 'effect/http-api'
-import { Rpc, RpcGroup, RpcTest } from 'effect/rpc'
-import { deepStrictEqual, equal, notDeepStrictEqual, ok, rejects } from 'node:assert/strict'
-import { once } from 'node:events'
-import { createServer } from 'node:http'
-
-const UploadPayload = Schema.Struct({
-  name: Schema.String,
-  amount: Schema.NumberFromString,
-  file: Multipart.SingleFileSchema,
-}).pipe(HttpApiSchema.asMultipart())
-const api = HttpApi.make('packed-http').add(
-  HttpApiGroup.make('compatibility').add(
-    HttpApiEndpoint.get('read', '/value/:id', {
-      params: { id: Schema.NumberFromString },
-      success: Schema.NumberFromString,
-      error: Schema.String,
-    }),
-    HttpApiEndpoint.post('write', '/value', {
-      payload: Schema.Struct({ value: Schema.NumberFromString }),
-      success: Schema.NumberFromString,
-    }),
-  ),
-  HttpApiGroup.make('other').add(HttpApiEndpoint.get('read', '/other', { success: Schema.String })),
-  HttpApiGroup.make('system', { topLevel: true }).add(
-    HttpApiEndpoint.get('empty', '/empty', { success: HttpApiSchema.NoContent }),
-  ),
-)
-const uploadApi = HttpApi.make('packed-uploads').add(
-  HttpApiGroup.make('files').add(
-    HttpApiEndpoint.post('upload', '/upload/:id', {
-      params: { id: Schema.NumberFromString },
-      query: { factor: Schema.NumberFromString },
-      headers: { 'x-version': Schema.Literal('v1') },
-      payload: UploadPayload,
-      success: Schema.NumberFromString,
-      error: Schema.Literal('upload-rejected'),
-    }),
-    HttpApiEndpoint.post('mixedUpload', '/mixed-upload', {
-      payload: [Schema.Struct({ value: Schema.NumberFromString }), UploadPayload],
-      success: Schema.NumberFromString,
-    }),
-  ),
-  HttpApiGroup.make('system', { topLevel: true }).add(
-    HttpApiEndpoint.post('uploaded', '/uploaded', {
-      payload: UploadPayload,
-      success: HttpApiSchema.NoContent,
-    }),
-  ),
-)
-
-const cancellationApi = HttpApi.make('packed-cancellation').add(
-  HttpApiGroup.make('pages').add(
-    HttpApiEndpoint.get('read', '/pages/:page', {
-      params: { page: Schema.FiniteFromString },
-      success: Schema.String,
-    }),
-  ),
-)
-for (const mode of ['query', 'later page'] as const) {
-  let received!: () => void
-  let disconnected!: () => void
-  const requestReceived = new Promise<void>((resolve) => {
-    received = resolve
-  })
-  const requestDisconnected = new Promise<void>((resolve) => {
-    disconnected = resolve
-  })
-  const paths: string[] = []
-  const server = createServer((request, response) => {
-    paths.push(request.url ?? '')
-    if (request.url === '/pages/0') {
-      response.setHeader('content-type', 'application/json')
-      response.end(JSON.stringify('first'))
-      return
-    }
-    response.on('close', disconnected)
-    received()
-  })
-  const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
-  let timeout: ReturnType<typeof setTimeout> | undefined
-  const deadline = new Promise<never>((_resolve, reject) => {
-    timeout = setTimeout(() => reject(new Error(`HTTP ${mode} cancellation timed out`)), 10_000)
-  })
-  try {
-    server.listen(0, '127.0.0.1')
-    await Promise.race([once(server, 'listening'), deadline])
-    const address = server.address()
-    ok(address !== null && typeof address !== 'string')
-    const client = await Effect.runPromise(
-      HttpApiClient.make(cancellationApi, {
-        baseUrl: `http://127.0.0.1:${address.port}`,
-      }).pipe(Effect.provide(FetchHttpClient.layer)),
-    )
-    let interrupted!: (cause: Cause.Cause<unknown>) => void
-    const interruption = new Promise<Cause.Cause<unknown>>((resolve) => {
-      interrupted = resolve
-    })
-    let requestSignal: AbortSignal | undefined
-    const runPromiseExit: RunPromiseExit = async (effect, options) => {
-      requestSignal = options?.signal
-      const exit = await Effect.runPromiseExit(effect, options)
-      if (Exit.isFailure(exit)) interrupted(exit.cause)
-      return exit
-    }
-    const utils = createHttpApiQueryUtils(cancellationApi, {
-      client,
-      keyPrefix: ['packed'],
-      runPromiseExit,
-    })
-    const pending =
-      mode === 'query'
-        ? queryClient.query(utils.pages.read.queryOptions({ input: { params: { page: 1 } } }))
-        : queryClient.infiniteQuery({
-            ...utils.pages.read.infiniteOptions({
-              initialPageParam: 0,
-              input: (page) => ({ params: { page } }),
-              getNextPageParam: (_last, _pages, page) => page + 1,
-            }),
-            pages: 2,
-          })
-    const result = pending.catch((error: unknown) => error)
-    await Promise.race([requestReceived, deadline])
-    equal(requestSignal?.aborted, false)
-    await queryClient.cancelQueries({ queryKey: utils.pages.read.key() })
-    ok(isCancelledError(await result))
-    equal(requestSignal?.aborted, true)
-    ok(Cause.hasInterrupts(await Promise.race([interruption, deadline])))
-    await Promise.race([requestDisconnected, deadline])
-    deepStrictEqual(paths, mode === 'query' ? ['/pages/1'] : ['/pages/0', '/pages/1'])
-    equal(queryClient.isFetching(), 0)
-  } finally {
-    clearTimeout(timeout)
-    queryClient.clear()
-    if (server.listening) {
-      const closed = new Promise<void>((resolve, reject) => {
-        server.close((error) => (error === undefined ? resolve() : reject(error)))
-      })
-      server.closeAllConnections()
-      await closed
-    }
-  }
-}
-
-class Authentication extends HttpApiMiddleware.Service<Authentication>()(
-  'PackedHttp/Authentication',
-  {
-    requiredForClient: true,
-  },
-) {}
-const identityApi = HttpApi.make('identity').add(
-  HttpApiGroup.make('accounts').add(
-    HttpApiEndpoint.get('read', '/account', {
-      query: { locale: Schema.optional(Schema.String) },
-      success: Schema.String,
-    }).middleware(Authentication),
-  ),
-)
-let identityRequests = 0
-const transport = HttpClient.make((request) => {
-  identityRequests += 1
-  return Effect.succeed(
-    HttpClientResponse.fromWeb(
-      request,
-      Response.json(request.headers['authorization'] === 'Bearer token-ada' ? 'Ada' : 'Grace'),
-    ),
-  )
-})
-const readyClientFor = (token: string) =>
-  Effect.runPromise(
-    HttpApiClient.makeWith(identityApi, {
-      httpClient: transport,
-      baseUrl: 'https://example.test',
-    }).pipe(
-      Effect.provide(
-        HttpApiMiddleware.layerClient(Authentication, ({ request, next }) =>
-          next(HttpClientRequest.bearerToken(request, token)),
-        ),
-      ),
-    ),
-  )
-const ada = createHttpApiQueryUtils(identityApi, {
-  client: await readyClientFor('token-ada'),
-  keyPrefix: ['tenant', 'north', 'user', 'ada'],
-})
-const grace = createHttpApiQueryUtils(identityApi, {
-  client: await readyClientFor('token-grace'),
-  keyPrefix: ['tenant', 'north', 'user', 'grace'],
-})
-const south = createHttpApiQueryUtils(identityApi, {
-  client: await readyClientFor('token-ada'),
-  keyPrefix: ['tenant', 'south', 'user', 'ada'],
-})
-const identityCache = new QueryClient({ defaultOptions: { queries: { staleTime: Infinity } } })
-try {
-  equal(await identityCache.query(ada.accounts.read.queryOptions({ input: { query: {} } })), 'Ada')
-  equal(
-    await identityCache.query(
-      ada.accounts.read.queryOptions({ input: { query: { locale: undefined } } }),
-    ),
-    'Ada',
-  )
-  equal(identityRequests, 1)
-  equal(
-    await identityCache.query(grace.accounts.read.queryOptions({ input: { query: {} } })),
-    'Grace',
-  )
-  equal(
-    await identityCache.query(south.accounts.read.queryOptions({ input: { query: {} } })),
-    'Ada',
-  )
-  equal(identityRequests, 3)
-  notDeepStrictEqual(
-    ada.accounts.read.queryKey({ query: {} }),
-    grace.accounts.read.queryKey({ query: {} }),
-  )
-  ok(!JSON.stringify(ada.accounts.read.queryKey({ query: {} })).includes('token-ada'))
-} finally {
-  identityCache.clear()
-}
-
-let value = 1
-const decodedRequests: Array<unknown> = []
-const serializedUploadRequests: Array<unknown> = []
-const uploadKinds: string[] = []
-const handlers = Layer.mergeAll(
-  HttpApiBuilder.group(api, 'compatibility', (group) =>
-    group
-      .handle(
-        'read',
-        Effect.fn('PackedHttp.read')(function* ({ params }) {
-          decodedRequests.push(params)
-          if (params.id < 0) return yield* Effect.fail('missing')
-          return value
-        }),
-      )
-      .handle(
-        'write',
-        Effect.fn('PackedHttp.write')(function* ({ payload }) {
-          decodedRequests.push(payload)
-          value = payload.value
-          return value
-        }),
-      ),
-  ),
-  HttpApiBuilder.group(api, 'other', (group) =>
-    group.handle('read', () => Effect.succeed('other')),
-  ),
-  HttpApiBuilder.group(api, 'system', (group) => group.handle('empty', () => Effect.void)),
-)
-
-const rpc = RpcGroup.make(Rpc.make('compatibility.read', { success: Schema.String }))
-
-await Effect.runPromise(
-  Effect.scoped(
-    Effect.gen(function* () {
-      const client = yield* HttpApiTest.groups(api, ['compatibility', 'other', 'system'])
-      const uploadClient = yield* HttpApiClient.makeWith(uploadApi, {
-        baseUrl: 'https://uploads.test',
-        httpClient: HttpClient.make((request) =>
-          Effect.gen(function* () {
-            const web = yield* HttpClientRequest.toWeb(request).pipe(Effect.orDie)
-            const url = new URL(web.url)
-            if (
-              url.pathname === '/mixed-upload' &&
-              web.headers.get('content-type')?.startsWith('application/json')
-            ) {
-              const body = yield* Effect.promise(() => web.json())
-              deepStrictEqual(body, { value: '9' })
-              uploadKinds.push('plain')
-              return HttpClientResponse.fromWeb(request, Response.json('9'))
-            }
-            const body = yield* Effect.promise(() => web.formData())
-            if (url.pathname === '/uploaded') {
-              return HttpClientResponse.fromWeb(request, new Response(null, { status: 204 }))
-            }
-            if (url.pathname === '/mixed-upload') {
-              equal(body.get('amount'), '7')
-              uploadKinds.push('multipart')
-              return HttpClientResponse.fromWeb(request, Response.json('7'))
-            }
-            if (body.get('name') === 'reject') {
-              return HttpClientResponse.fromWeb(
-                request,
-                Response.json('upload-rejected', { status: 500 }),
-              )
-            }
-            const file = body.get('file')
-            ok(file instanceof File)
-            serializedUploadRequests.push({
-              url: web.url,
-              version: web.headers.get('x-version'),
-              name: body.get('name'),
-              amount: body.get('amount'),
-              fileName: file.name,
-              contents: yield* Effect.promise(() => file.text()),
-            })
-            return HttpClientResponse.fromWeb(request, Response.json('17'))
-          }),
-        ),
-      })
-      const rpcClient = yield* RpcTest.makeClient(rpc, { flatten: true }).pipe(
-        Effect.provide(rpc.toLayer({ 'compatibility.read': () => Effect.succeed('rpc') })),
-      )
-      const queryClient = new QueryClient({
-        defaultOptions: {
-          queries: { retry: false, staleTime: Infinity },
-          mutations: { retry: false, gcTime: Infinity },
-        },
-      })
-      yield* Effect.addFinalizer(() => Effect.sync(() => queryClient.clear()))
-      const http = createHttpApiQueryUtils(api, { client, keyPrefix: ['shared'] as const })
-      const uploads = createHttpApiQueryUtils(uploadApi, {
-        client: uploadClient,
-        keyPrefix: ['shared'] as const,
-      })
-      const rpcUtils = createRpcQueryUtils(rpc, {
-        client: rpcClient,
-        keyPrefix: ['shared'] as const,
-      })
-
-      const readInput = { params: { id: 1 }, responseMode: 'response-only' } as const
-      // @ts-expect-error Runtime misuse still returns decoded data; response controls are private.
-      const readOptions = http.compatibility.read.queryOptions({ input: readInput })
-      equal(yield* Effect.promise(() => queryClient.query(readOptions)), 1)
-      equal(yield* Effect.promise(() => queryClient.query(readOptions)), 1)
-      deepStrictEqual(decodedRequests, [{ id: 1 }])
-
-      const writeInput = { payload: { value: 7 }, responseMode: 'response-only' } as const
-      const write = new MutationObserver(queryClient, http.compatibility.write.mutationOptions())
-      // @ts-expect-error Runtime misuse cannot select a raw mutation response.
-      equal(yield* Effect.promise(() => write.mutate(writeInput)), 7)
-      deepStrictEqual(decodedRequests, [{ id: 1 }, { value: 7 }])
-      equal(queryClient.getQueryData(readOptions.queryKey), 1)
-
-      yield* Effect.promise(() =>
-        queryClient.invalidateQueries({ queryKey: http.compatibility.read.key() }),
-      )
-      equal(yield* Effect.promise(() => queryClient.query(readOptions)), 7)
-      equal(yield* Effect.promise(() => queryClient.query(http.empty.queryOptions())), null)
-      const emptyMutation = new MutationObserver(queryClient, http.empty.mutationOptions())
-      equal(yield* Effect.promise(() => emptyMutation.mutate(undefined)), undefined)
-      equal(
-        queryClient.getMutationCache().findAll({ mutationKey: http.empty.mutationKey() }).length,
-        1,
-      )
-      notDeepStrictEqual(http.empty.queryKey(), http.empty.mutationKey())
-
-      const formData = new FormData()
-      formData.set('name', 'Ada')
-      formData.set('amount', '7')
-      formData.set('file', new File(['release upload'], 'release.txt', { type: 'text/plain' }))
-      const uploadInput = {
-        params: { id: 3 },
-        query: { factor: 2 },
-        headers: { 'x-version': 'v1' as const },
-        payload: formData,
-      }
-      const uploadCallbacks: string[] = []
-      const upload = new MutationObserver(
-        queryClient,
-        uploads.files.upload.mutationOptions({
-          onMutate: (request) => {
-            equal(request, uploadInput)
-            equal(request.payload, formData)
-            uploadCallbacks.push('mutate')
-            return 'prepared'
-          },
-          onSuccess: (data, request, mutateResult) => {
-            equal(data, 17)
-            equal(request, uploadInput)
-            equal(mutateResult, 'prepared')
-            uploadCallbacks.push('success')
-          },
-          onSettled: (data, error, request, mutateResult) => {
-            equal(data, 17)
-            equal(error, null)
-            equal(request, uploadInput)
-            equal(mutateResult, 'prepared')
-            uploadCallbacks.push('settled')
-          },
-        }),
-      )
-      equal(yield* Effect.promise(() => upload.mutate(uploadInput)), 17)
-      deepStrictEqual(uploadCallbacks, ['mutate', 'success', 'settled'])
-      deepStrictEqual(serializedUploadRequests, [
-        {
-          url: 'https://uploads.test/upload/3?factor=2',
-          version: 'v1',
-          name: 'Ada',
-          amount: '7',
-          fileName: 'release.txt',
-          contents: 'release upload',
-        },
-      ])
-      deepStrictEqual(uploads.files.upload.mutationKey(), [
-        'shared',
-        'http',
-        'packed-uploads',
-        'files',
-        'upload',
-        'mutation',
-      ])
-      equal(
-        queryClient.getMutationCache().findAll({ mutationKey: uploads.files.upload.key() }).length,
-        1,
-      )
-      const mixedUpload = new MutationObserver(
-        queryClient,
-        uploads.files.mixedUpload.mutationOptions(),
-      )
-      equal(yield* Effect.promise(() => mixedUpload.mutate({ payload: { value: 9 } })), 9)
-      equal(yield* Effect.promise(() => mixedUpload.mutate({ payload: formData })), 7)
-      deepStrictEqual(uploadKinds, ['plain', 'multipart'])
-      const completedUpload = new MutationObserver(queryClient, uploads.uploaded.mutationOptions())
-      equal(yield* Effect.promise(() => completedUpload.mutate({ payload: formData })), undefined)
-      equal(completedUpload.getCurrentResult().status, 'success')
-      const rejectedFormData = new FormData()
-      rejectedFormData.set('name', 'reject')
-      rejectedFormData.set('amount', '0')
-      const rejectedUpload = new MutationObserver(
-        queryClient,
-        uploads.files.upload.mutationOptions(),
-      )
-      yield* Effect.promise(() =>
-        rejects(
-          rejectedUpload.mutate({ ...uploadInput, payload: rejectedFormData }),
-          (error: unknown) => {
-            ok(isEffectHttpApiQueryError(error))
-            equal(error.apiId, 'packed-uploads')
-            equal(error.groupId, 'files')
-            equal(error.endpoint, 'upload')
-            equal(error.method, 'POST')
-            equal(error.operation, 'mutation')
-            deepStrictEqual(
-              error.cause.reasons.map((reason) =>
-                reason._tag === 'Fail' ? reason.error : undefined,
-              ),
-              ['upload-rejected'],
-            )
-            return true
-          },
-        ),
-      )
-
-      const rpcOptions = rpcUtils.compatibility.read.queryOptions()
-      equal(yield* Effect.promise(() => queryClient.query(rpcOptions)), 'rpc')
-      equal(yield* Effect.promise(() => queryClient.query(http.other.read.queryOptions())), 'other')
-      const secondRead = http.compatibility.read.queryOptions({ input: { params: { id: 2 } } })
-      equal(yield* Effect.promise(() => queryClient.query(secondRead)), 7)
-      deepStrictEqual(http.key(), ['shared', 'http', 'packed-http'])
-      deepStrictEqual(rpcUtils.key(), ['shared', 'rpc'])
-      notDeepStrictEqual(readOptions.queryKey, rpcOptions.queryKey)
-      equal(queryClient.getQueryCache().findAll({ queryKey: http.key() }).length, 4)
-      equal(queryClient.getQueryCache().findAll({ queryKey: rpcUtils.key() }).length, 1)
-      equal(
-        queryClient.getQueryCache().findAll({ queryKey: http.compatibility.read.key() }).length,
-        2,
-      )
-
-      yield* Effect.promise(() =>
-        queryClient.invalidateQueries({ queryKey: http.compatibility.key() }),
-      )
-      equal(queryClient.getQueryState(readOptions.queryKey)?.isInvalidated, true)
-      equal(queryClient.getQueryState(secondRead.queryKey)?.isInvalidated, true)
-      equal(queryClient.getQueryState(http.other.read.queryKey())?.isInvalidated, false)
-      equal(queryClient.getQueryState(http.empty.queryKey())?.isInvalidated, false)
-      equal(queryClient.getQueryState(rpcOptions.queryKey)?.isInvalidated, false)
-
-      yield* Effect.promise(() => queryClient.invalidateQueries({ queryKey: http.key() }))
-      equal(queryClient.getQueryState(http.other.read.queryKey())?.isInvalidated, true)
-      equal(queryClient.getQueryState(http.empty.queryKey())?.isInvalidated, true)
-      equal(queryClient.getQueryState(rpcOptions.queryKey)?.isInvalidated, false)
-      yield* Effect.promise(() => queryClient.invalidateQueries({ queryKey: ['shared'] }))
-      equal(queryClient.getQueryState(rpcOptions.queryKey)?.isInvalidated, true)
-
-      yield* Effect.promise(() =>
-        rejects(
-          queryClient.query(
-            http.compatibility.read.queryOptions({ input: { params: { id: -1 } } }),
-          ),
-          (error: unknown) => {
-            ok(error instanceof EffectHttpApiQueryError)
-            ok(isEffectHttpApiQueryError(error))
-            deepStrictEqual(
-              error.cause.reasons.map((reason) => reason._tag),
-              ['Fail'],
-            )
-            deepStrictEqual(
-              error.cause.reasons.map((reason) =>
-                reason._tag === 'Fail' ? reason.error : undefined,
-              ),
-              ['missing'],
-            )
-            return true
-          },
-        ),
-      )
-
-      const skipped = http.compatibility.read.queryOptions({ input: skipToken, staleTime: 123 })
-      equal(skipped.queryFn, skipToken)
-      equal(skipped.staleTime, 123)
-      deepStrictEqual(skipped.queryKey, [...http.compatibility.read.key(), 'query'])
-      const pages = http.compatibility.read.infiniteOptions({
-        initialPageParam: 0,
-        input: (id) => ({ params: { id } }),
-        getNextPageParam: (_last, _pages, id) => (id < 1 ? id + 1 : undefined),
-      })
-      decodedRequests.length = 0
-      deepStrictEqual(
-        yield* Effect.promise(() => queryClient.infiniteQuery({ ...pages, pages: 2 })),
-        {
-          pages: [7, 7],
-          pageParams: [0, 1],
-        },
-      )
-      deepStrictEqual(decodedRequests, [{ id: 0 }, { id: 1 }])
-      notDeepStrictEqual(pages.queryKey, http.compatibility.read.queryKey({ params: { id: 0 } }))
-      deepStrictEqual(
-        yield* Effect.promise(() =>
-          queryClient.infiniteQuery(
-            http.empty.infiniteOptions({
-              initialPageParam: 0,
-              getNextPageParam: () => undefined,
-            }),
-          ),
-        ),
-        { pages: [null], pageParams: [0] },
-      )
-
-      let completeCause: Cause.Cause<unknown> | undefined
-      const runPromiseExit: RunPromiseExit = async (effect, options) => {
-        const exit = await Effect.runPromiseExit(effect, options)
-        if (Exit.isSuccess(exit)) return exit
-        const cause = Cause.combine(
-          exit.cause,
-          Cause.combine(Cause.die(new Error('defect')), Cause.interrupt(123)),
-        )
-        completeCause = cause
-        return Exit.failCause(cause)
-      }
-      const failingHttp = createHttpApiQueryUtils(api, {
-        client,
-        keyPrefix: ['failure'] as const,
-        runPromiseExit,
-      })
-      yield* Effect.promise(() =>
-        rejects(
-          queryClient.query(
-            failingHttp.compatibility.read.queryOptions({ input: { params: { id: -1 } } }),
-          ),
-          (error: unknown) => {
-            ok(error instanceof EffectHttpApiQueryError)
-            ok(completeCause)
-            equal(error.cause, completeCause)
-            return true
-          },
-        ),
-      )
-    }).pipe(Effect.provide(Layer.mergeAll(handlers, HttpServer.layerServices))),
-  ),
-)
diff --git a/tests/packed-consumer/runtime.mts b/tests/packed-consumer/runtime.mts
deleted file mode 100644
index 9e67e4a..0000000
--- a/tests/packed-consumer/runtime.mts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { QueryClient, skipToken } from '@tanstack/query-core'
-import { skipToken as reactQuerySkipToken } from '@tanstack/react-query'
-import { Effect, Schema, Stream } from 'effect'
-import * as rpcQuery from 'effect-api-query'
-import type {
-  CreateRpcQueryUtilsOptions,
-  EffectRpcQueryConfigErrorCode,
-  EffectRpcQueryKeyErrorCode,
-  JsonValue,
-  KeyEncoder,
-  QueryData,
-  RpcQueryUtils,
-  RunPromiseExit,
-  SkipToken,
-} from 'effect-api-query'
-import { Rpc, RpcGroup, RpcTest } from 'effect/rpc'
-// fallow-ignore-file unused-file
-// The packed-package verifier copies and executes this fixture in temporary consumers.
-import { deepStrictEqual, equal, ok, rejects } from 'node:assert/strict'
-
-type PublicTypes = [
-  CreateRpcQueryUtilsOptions<any, readonly [JsonValue, ...JsonValue[]]>,
-  EffectRpcQueryConfigErrorCode,
-  EffectRpcQueryKeyErrorCode,
-  KeyEncoder<any>,
-  QueryData<unknown>,
-  RpcQueryUtils<any, readonly [JsonValue, ...JsonValue[]]>,
-  RunPromiseExit,
-  SkipToken,
-]
-
-const expectedExports = [
-  'EffectHttpApiQueryConfigError',
-  'EffectHttpApiQueryError',
-  'EffectHttpApiQueryKeyError',
-  'EffectRpcQueryConfigError',
-  'EffectRpcQueryEmptyStreamError',
-  'EffectRpcQueryError',
-  'EffectRpcQueryKeyError',
-  'createHttpApiQueryUtils',
-  'createRpcQueryUtils',
-  'isEffectHttpApiQueryError',
-  'isEffectRpcQueryError',
-  'skipToken',
-] as const satisfies ReadonlyArray<keyof typeof rpcQuery>
-
-if (JSON.stringify(Object.keys(rpcQuery).sort()) !== JSON.stringify(expectedExports)) {
-  throw new Error('The package root exposed an unexpected runtime surface')
-}
-if (rpcQuery.skipToken !== skipToken || rpcQuery.skipToken !== reactQuerySkipToken) {
-  throw new Error('The package returned a different skipToken instance')
-}
-
-const resolveFrom = import.meta.resolve as (specifier: string, parent?: string) => string
-const packageEntry = resolveFrom('effect-api-query')
-const consumerModules = new URL('./node_modules/', import.meta.url).href
-
-for (const specifier of ['effect-api-query', 'effect', '@tanstack/query-core']) {
-  ok(
-    resolveFrom(specifier).startsWith(consumerModules),
-    `${specifier} must resolve inside the isolated consumer`,
-  )
-}
-for (const specifier of [
-  '#effect-api-query',
-  '#effect-api-query/core',
-  'effect-api-query/core',
-  'effect-api-query/rpc',
-  'effect-api-query/http',
-  'effect-api-query/src/index.ts',
-  'effect-api-query/dist/index.mjs',
-]) {
-  await rejects(import(specifier), (error: unknown) => {
-    ok(error instanceof Error && 'code' in error)
-    equal(
-      error.code,
-      specifier.startsWith('#')
-        ? 'ERR_PACKAGE_IMPORT_NOT_DEFINED'
-        : 'ERR_PACKAGE_PATH_NOT_EXPORTED',
-    )
-    return true
-  })
-}
-
-equal(
-  resolveFrom('@tanstack/query-core', packageEntry),
-  resolveFrom('@tanstack/query-core'),
-  'The package must resolve the consumer Query Core runtime',
-)
-equal(
-  resolveFrom('effect', packageEntry),
-  resolveFrom('effect'),
-  'The package must resolve the consumer Effect runtime',
-)
-
-const Read = Rpc.make('compatibility.read', { success: Schema.String })
-const Page = Rpc.make('compatibility.page', {
-  payload: { cursor: Schema.Int },
-  success: Schema.Int,
-})
-const Watch = Rpc.make('compatibility.watch', { success: Schema.String, stream: true })
-const group = RpcGroup.make(Read, Page, Watch)
-const handlers = group.of({
-  'compatibility.page': Effect.fn('CompatibilityRpc.page')(({ cursor }) => Effect.succeed(cursor)),
-  'compatibility.read': Effect.fn('CompatibilityRpc.read')(() => Effect.succeed('ordinary')),
-  'compatibility.watch': () => Stream.make('first', 'second'),
-})
-
-await Effect.runPromise(
-  Effect.scoped(
-    Effect.gen(function* () {
-      const client = yield* RpcTest.makeClient(group, { flatten: true }).pipe(
-        Effect.provide(group.toLayer(handlers)),
-      )
-      const queryClient = new QueryClient()
-      const rpcUtilityTree = rpcQuery.createRpcQueryUtils(group, {
-        client,
-        keyPrefix: ['compatibility'] as const,
-      })
-
-      equal(
-        yield* Effect.promise(() =>
-          queryClient.query(rpcUtilityTree.compatibility.read.queryOptions()),
-        ),
-        'ordinary',
-      )
-      deepStrictEqual(
-        yield* Effect.promise(() =>
-          queryClient.infiniteQuery(
-            rpcUtilityTree.compatibility.page.infiniteOptions({
-              getNextPageParam: () => undefined,
-              initialPageParam: 0,
-              input: (cursor) => ({ cursor }),
-            }),
-          ),
-        ),
-        { pageParams: [0], pages: [0] },
-      )
-      deepStrictEqual(
-        yield* Effect.promise(() =>
-          queryClient.query(rpcUtilityTree.compatibility.watch.streamedOptions()),
-        ),
-        ['first', 'second'],
-      )
-      equal(
-        yield* Effect.promise(() =>
-          queryClient.query(rpcUtilityTree.compatibility.watch.liveOptions()),
-        ),
-        'second',
-      )
-    }),
-  ),
-)
diff --git a/tests/packed-consumer/tsconfig.json b/tests/packed-consumer/tsconfig.json
deleted file mode 100644
index ddd1c69..0000000
--- a/tests/packed-consumer/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": ["ES2022", "DOM", "DOM.Iterable", "ESNext.Disposable"],
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "noEmit": true,
-    "exactOptionalPropertyTypes": true,
-    "noUncheckedIndexedAccess": true,
-    "skipLibCheck": false,
-    "strict": true,
-    "target": "ES2022",
-    "types": ["node"]
-  },
-  "include": [
-    "runtime.mts",
-    "http-runtime.mts",
-    "public-contract.ts",
-    "http-contract.ts",
-    "docs-rpc-quick-start.ts",
-    "docs-http-quick-start.ts",
-    "skill-example-*.ts"
-  ]
-}
diff --git a/tests/packed-consumer/tsconfig.tanstack-start.json b/tests/packed-consumer/tsconfig.tanstack-start.json
deleted file mode 100644
index 6dbaad5..0000000
--- a/tests/packed-consumer/tsconfig.tanstack-start.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "skipLibCheck": true
-  },
-  "include": ["public-contract.ts", "tanstack-start-contract.ts"]
-}
diff --git a/tests/packed-consumer/tsconfig.type-scale.json b/tests/packed-consumer/tsconfig.type-scale.json
deleted file mode 100644
index fcc8130..0000000
--- a/tests/packed-consumer/tsconfig.type-scale.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["type-scale.ts", "http-type-scale.ts"]
-}
diff --git a/tests/query-policy.test.ts b/tests/query-policy.test.ts
new file mode 100644
index 0000000..e200517
--- /dev/null
+++ b/tests/query-policy.test.ts
@@ -0,0 +1,96 @@
+import { expect, it } from '@effect/vitest'
+import { MutationObserver, QueryClient } from '@tanstack/query-core'
+import { Effect, Schema } from 'effect'
+import { Rpc, RpcGroup } from 'effect/rpc'
+
+import { createRpcQueryUtils, withMutationPolicy, withQueryPolicy } from '#effect-api-query'
+
+import { makeRpcTestClient } from './fixtures/effect-rpc'
+
+it.effect('reuses typed query defaults while allowing call-site policy overrides', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(Rpc.make('read', { success: Schema.Int }))
+    let version = 0
+    const client = yield* makeRpcTestClient(group, {
+      read: () =>
+        Effect.sync(() => {
+          version += 1
+          return version
+        }),
+    })
+    const utils = createRpcQueryUtils(group, { client, keyPrefix: ['query-policy'] })
+    const read = withQueryPolicy(utils.read, 'query', { staleTime: Infinity })
+    const queryClient = new QueryClient()
+    expect(yield* Effect.promise(async () => await queryClient.query(read()))).toBe(1)
+    expect(yield* Effect.promise(async () => await queryClient.query(read()))).toBe(1)
+    expect(yield* Effect.promise(async () => await queryClient.query(read({ staleTime: 0 })))).toBe(
+      2,
+    )
+  }),
+)
+
+it.effect('applies a reusable typed retry policy during native query execution', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(
+      Rpc.make('read', { success: Schema.Int, error: Schema.Literal('busy') }),
+    )
+    let attempts = 0
+    const client = yield* makeRpcTestClient(group, {
+      read: () =>
+        Effect.suspend(() => {
+          attempts += 1
+          return attempts === 1 ? Effect.fail('busy' as const) : Effect.succeed(42)
+        }),
+    })
+    const utils = createRpcQueryUtils(group, { client, keyPrefix: ['retry-policy'] })
+    const read = withQueryPolicy(utils.read, 'query', {
+      retry: (count, error) => count === 0 && error.operation === 'query',
+      retryDelay: 0,
+    })
+    expect(yield* Effect.promise(async () => await new QueryClient().query(read()))).toBe(42)
+  }),
+)
+
+it.effect('shares mutation invalidation while call-site callbacks replace policy callbacks', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(
+      Rpc.make('read', { success: Schema.Int }),
+      Rpc.make('write', { payload: { value: Schema.Int }, success: Schema.Int }),
+    )
+    let value = 1
+    const client = yield* makeRpcTestClient(group, {
+      read: () => Effect.sync(() => value),
+      write: ({ value: nextValue }) =>
+        Effect.sync(() => {
+          value = nextValue
+          return value
+        }),
+    })
+    const utils = createRpcQueryUtils(group, { client, keyPrefix: ['mutation-policy'] })
+    const queryClient = new QueryClient()
+    const read = withQueryPolicy(utils.read, 'query', { staleTime: Infinity })
+    const write = withMutationPolicy(utils.write, {
+      onSuccess: async (_data, _variables, _result, context) => {
+        await context.client.invalidateQueries({ queryKey: utils.read.key() })
+      },
+    })
+    yield* Effect.promise(async () => await queryClient.query(read()))
+    const shared = new MutationObserver(queryClient, write())
+    expect(yield* Effect.promise(async () => await shared.mutate({ value: 2 }))).toBe(2)
+    expect(yield* Effect.promise(async () => await queryClient.query(read()))).toBe(2)
+
+    let optimisticResult: number | undefined
+    const local = new MutationObserver(
+      queryClient,
+      write({
+        onMutate: (variables) => ({ previous: variables.value - 1 }),
+        onSuccess: (_data, _variables, result) => {
+          optimisticResult = result.previous
+        },
+      }),
+    )
+    expect(yield* Effect.promise(async () => await local.mutate({ value: 3 }))).toBe(3)
+    expect(optimisticResult).toBe(2)
+    expect(yield* Effect.promise(async () => await queryClient.query(read()))).toBe(2)
+  }),
+)
diff --git a/tests/query-view-prefix.test.ts b/tests/query-view-prefix.test.ts
new file mode 100644
index 0000000..46d19c7
--- /dev/null
+++ b/tests/query-view-prefix.test.ts
@@ -0,0 +1,39 @@
+import { expect, it } from '@effect/vitest'
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Schema } from 'effect'
+import { Rpc, RpcGroup } from 'effect/rpc'
+
+import { createRpcQueryUtils, viewPrefix } from '#effect-api-query'
+
+import { makeRpcTestClient } from './fixtures/effect-rpc'
+
+it.effect('invalidates every ordinary input while keeping infinite data fresh', () =>
+  Effect.gen(function* () {
+    const group = RpcGroup.make(
+      Rpc.make('users.read', { payload: { id: Schema.Int }, success: Schema.String }),
+    )
+    const client = yield* makeRpcTestClient(group, { 'users.read': () => Effect.succeed('Ada') })
+    const utils = createRpcQueryUtils(group, { client, keyPrefix: ['view-prefix'] })
+    const queryClient = new QueryClient()
+    const first = utils.users.read.queryKey({ id: 1 })
+    const second = utils.users.read.queryKey({ id: 2 })
+    const paged = utils.users.read.infiniteKey({ id: 1 })
+    try {
+      queryClient.setQueryData(first, 'Ada')
+      queryClient.setQueryData(second, 'Grace')
+      queryClient.setQueryData(paged, { pages: ['Ada'], pageParams: [1] })
+      const prefix = viewPrefix(utils.users.read, 'query')
+      yield* Effect.promise(async () => {
+        await queryClient.invalidateQueries({ queryKey: prefix })
+      })
+      expect(queryClient.getQueryState(first)?.isInvalidated).toBe(true)
+      expect(queryClient.getQueryState(second)?.isInvalidated).toBe(true)
+      expect(queryClient.getQueryState(paged)?.isInvalidated).toBe(false)
+      queryClient.setQueryDefaults(prefix, { staleTime: 60_000 })
+      expect(queryClient.getQueryDefaults(first).staleTime).toBe(60_000)
+      expect(queryClient.getQueryDefaults(paged).staleTime).toBeUndefined()
+    } finally {
+      queryClient.clear()
+    }
+  }),
+)
diff --git a/tests/stream-snapshot.test.ts b/tests/stream-snapshot.test.ts
new file mode 100644
index 0000000..e4b2df8
--- /dev/null
+++ b/tests/stream-snapshot.test.ts
@@ -0,0 +1,288 @@
+import { it } from '@effect/vitest'
+import { QueryClient, QueryObserver } from '@tanstack/query-core'
+import { Deferred, Effect, Exit, Schema, Stream } from 'effect'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import { describe, expect, it as test } from 'vite-plus/test'
+
+import { createRpcQueryUtils, fetchStreamSnapshot } from '#effect-api-query'
+
+import { captureFailure } from './fixtures/async.ts'
+import { makeRpcTestClient } from './fixtures/effect-rpc.ts'
+
+describe('stream snapshots', () => {
+  it.effect(
+    'uses cached snapshots without acquiring a stream and requires ownership for fresh capture',
+    () =>
+      Effect.gen(function* () {
+        const group = RpcGroup.make(Rpc.make('watch', { success: Schema.Int, stream: true }))
+        const entered = yield* Deferred.make<undefined>()
+        const emit = yield* Deferred.make<undefined>()
+        const finalized = yield* Deferred.make<undefined>()
+        let executions = 0
+        const client = yield* makeRpcTestClient(group, {
+          watch: () =>
+            Stream.fromEffect(
+              Effect.sync(() => {
+                executions += 1
+              }).pipe(
+                Effect.andThen(Deferred.succeed(entered, undefined)),
+                Effect.andThen(Deferred.await(emit)),
+                Effect.as(1),
+              ),
+            ).pipe(
+              Stream.concat(Stream.never),
+              Stream.ensuring(Deferred.succeed(finalized, undefined)),
+            ),
+        })
+        const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['snapshot'] })
+        const options = rpc.watch.liveOptions({ retry: false, staleTime: Infinity })
+        const queryClient = new QueryClient()
+        try {
+          queryClient.setQueryData(options.queryKey, 0)
+          expect(
+            yield* Effect.promise(
+              async () => await fetchStreamSnapshot(queryClient, options, { mode: 'cached' }),
+            ),
+          ).toBe(0)
+          expect(executions).toBe(0)
+          const pending = captureFailure(fetchStreamSnapshot(queryClient, options))
+          yield* Deferred.await(entered)
+          yield* Effect.promise(async () => {
+            await expect(fetchStreamSnapshot(queryClient, options)).rejects.toThrow(
+              'idle query without observers',
+            )
+          })
+          expect(Deferred.isDoneUnsafe(finalized)).toBe(false)
+          yield* Deferred.succeed(emit, undefined)
+          expect(yield* Effect.promise(async () => await pending)).toBe(1)
+          yield* Deferred.await(finalized)
+          expect(executions).toBe(1)
+          const observer = new QueryObserver(queryClient, { ...options, enabled: false })
+          const stop = observer.subscribe(() => {})
+          try {
+            yield* Effect.promise(async () => {
+              await expect(fetchStreamSnapshot(queryClient, options)).rejects.toThrow(
+                'idle query without observers',
+              )
+            })
+            expect(
+              yield* Effect.promise(
+                async () => await fetchStreamSnapshot(queryClient, options, { mode: 'cached' }),
+              ),
+            ).toBe(1)
+          } finally {
+            stop()
+          }
+          expect(queryClient.isFetching()).toBe(0)
+          expect(queryClient.getQueryCache().hasListeners()).toBe(false)
+        } finally {
+          yield* Effect.promise(async () => {
+            await queryClient.cancelQueries()
+          })
+          queryClient.clear()
+        }
+      }),
+  )
+
+  test.each(['global', 'prefix'] as const)(
+    'captures the current %s hash without cancelling or invalidating a historical observed query',
+    async (hashing) => {
+      const queryClient = new QueryClient({
+        defaultOptions: {
+          queries: { retry: false, queryKeyHashFn: (key) => `old:${JSON.stringify(key)}` },
+        },
+      })
+      const queryKey = ['snapshot-hash', hashing]
+      const entered = Deferred.makeUnsafe<undefined>()
+      let oldSignal: AbortSignal | undefined
+      const observer = new QueryObserver(queryClient, {
+        queryKey,
+        queryFn: async ({ signal }) => {
+          oldSignal = signal
+          queryClient.setQueryData(queryKey, 1)
+          Deferred.doneUnsafe(entered, Exit.succeed(undefined))
+          return await Effect.runPromise(Effect.never, { signal }).catch(() => 1)
+        },
+      })
+      const unsubscribe = observer.subscribe(() => {})
+      let executions = 0
+      let finalized = false
+      const options = {
+        queryKey,
+        queryFn: async ({ signal }: { readonly signal: AbortSignal }) => {
+          executions += 1
+          queryClient.setQueryData(queryKey, 2)
+          await Effect.runPromise(Effect.never, { signal }).catch(() => {})
+          finalized = true
+          return 2
+        },
+      }
+      try {
+        await Effect.runPromise(Deferred.await(entered))
+        const historical = observer.getCurrentQuery()
+        const currentDefaults = {
+          retry: false as const,
+          queryKeyHashFn: (key: readonly unknown[]) => `new:${JSON.stringify(key)}`,
+        }
+        if (hashing === 'global') {
+          queryClient.setDefaultOptions({ queries: currentDefaults })
+        } else {
+          queryClient.setQueryDefaults(['snapshot-hash'], currentDefaults)
+        }
+        await expect(fetchStreamSnapshot(queryClient, options)).resolves.toBe(2)
+        expect(finalized).toBe(true)
+        expect(historical.state).toMatchObject({
+          data: 1,
+          fetchStatus: 'fetching',
+          isInvalidated: false,
+        })
+        expect(oldSignal?.aborted).toBe(false)
+        expect(queryClient.getQueryData(queryKey)).toBe(2)
+        await expect(fetchStreamSnapshot(queryClient, options, { mode: 'cached' })).resolves.toBe(2)
+        expect(executions).toBe(1)
+      } finally {
+        unsubscribe()
+        await queryClient.cancelQueries()
+        queryClient.clear()
+      }
+    },
+  )
+
+  test.each(['global', 'prefix'] as const)(
+    'times out cached %s capture when only a historical hash has data',
+    async (hashing) => {
+      const queryClient = new QueryClient({
+        defaultOptions: {
+          queries: { retry: false, queryKeyHashFn: (key) => `old:${JSON.stringify(key)}` },
+        },
+      })
+      const queryKey = ['snapshot-timeout', hashing]
+      queryClient.setQueryData(queryKey, 1)
+      const currentDefaults = {
+        retry: false as const,
+        queryKeyHashFn: (key: readonly unknown[]) => `new:${JSON.stringify(key)}`,
+      }
+      if (hashing === 'global') {
+        queryClient.setDefaultOptions({ queries: currentDefaults })
+      } else {
+        queryClient.setQueryDefaults(['snapshot-timeout'], currentDefaults)
+      }
+      let finalized = false
+      try {
+        await expect(
+          fetchStreamSnapshot(
+            queryClient,
+            {
+              queryKey,
+              queryFn: async ({ signal }) => {
+                try {
+                  return await Effect.runPromise(Effect.never, { signal })
+                } finally {
+                  finalized = true
+                }
+              },
+            },
+            { mode: 'cached', timeoutMs: 10 },
+          ),
+        ).rejects.toMatchObject({ name: 'TimeoutError' })
+        expect(finalized).toBe(true)
+        expect(queryClient.isFetching()).toBe(0)
+        expect(queryClient.getQueryCache().hasListeners()).toBe(false)
+      } finally {
+        await queryClient.cancelQueries()
+        queryClient.clear()
+      }
+    },
+  )
+
+  test.each(['timeout', 'abort', 'cleanup-failure'] as const)(
+    'settles a %s snapshot after query cleanup',
+    async (path) => {
+      const queryClient = new QueryClient()
+      const entered = Deferred.makeUnsafe<undefined>()
+      const closing = Deferred.makeUnsafe<undefined>()
+      const release = Deferred.makeUnsafe<undefined>()
+      const controller = new AbortController()
+      const abortReason = new Error('request aborted')
+      const cleanupError = new Error('cleanup failed')
+      let finalized = false
+      let settled = false
+      const options = {
+        queryKey: ['snapshot-cleanup', path],
+        retry: false,
+        queryFn: async ({ signal }: { signal: AbortSignal }): Promise<number> => {
+          Deferred.doneUnsafe(entered, Exit.succeed(undefined))
+          if (path === 'cleanup-failure') {
+            queryClient.setQueryData(options.queryKey, 1)
+          }
+          const interrupted = await captureFailure(Effect.runPromise(Effect.never, { signal }))
+          Deferred.doneUnsafe(closing, Exit.succeed(undefined))
+          await Effect.runPromise(Deferred.await(release))
+          finalized = true
+          throw path === 'cleanup-failure' ? cleanupError : interrupted
+        },
+      }
+      const pending = fetchStreamSnapshot(queryClient, options, {
+        signal: controller.signal,
+        timeoutMs: path === 'timeout' ? 10 : 1000,
+      })
+      const outcome = captureFailure(pending).then((result) => {
+        settled = true
+        return result
+      })
+      try {
+        await Effect.runPromise(Deferred.await(entered))
+        if (path === 'abort') {
+          controller.abort(abortReason)
+        }
+        await Effect.runPromise(Deferred.await(closing))
+        expect(settled).toBe(false)
+        expect(finalized).toBe(false)
+        Effect.runSync(Deferred.succeed(release, undefined))
+        const result = await outcome
+        const failure = {
+          timeout: { name: 'TimeoutError' },
+          abort: abortReason,
+          'cleanup-failure': cleanupError,
+        }[path]
+        expect(result).toMatchObject(failure)
+        expect(path === 'timeout' || result === failure).toBe(true)
+        expect(finalized).toBe(true)
+        expect(queryClient.isFetching()).toBe(0)
+        expect(queryClient.getQueryCache().hasListeners()).toBe(false)
+      } finally {
+        Effect.runSync(Deferred.succeed(release, undefined))
+        await queryClient.cancelQueries()
+        await outcome
+        queryClient.clear()
+      }
+    },
+  )
+
+  test('rejects an aborted snapshot before executing the query', async () => {
+    const queryClient = new QueryClient()
+    const controller = new AbortController()
+    const reason = new Error('request already aborted')
+    controller.abort(reason)
+    let executions = 0
+    try {
+      await expect(
+        fetchStreamSnapshot(
+          queryClient,
+          {
+            queryKey: ['aborted'],
+            queryFn: async () => {
+              executions += 1
+              return await Promise.resolve(1)
+            },
+          },
+          { signal: controller.signal },
+        ),
+      ).rejects.toBe(reason)
+      expect(executions).toBe(0)
+      expect(queryClient.getQueryCache().getAll()).toHaveLength(0)
+    } finally {
+      queryClient.clear()
+    }
+  })
+})
diff --git a/tests/types/docs-functionality.ts b/tests/types/docs-functionality.ts
new file mode 100644
index 0000000..7184b8d
--- /dev/null
+++ b/tests/types/docs-functionality.ts
@@ -0,0 +1,195 @@
+import { MutationObserver, QueryClient, QueryObserver } from '@tanstack/query-core'
+import { Effect, Schema } from 'effect'
+import { createHttpApiQueryUtils, createRpcQueryUtils } from 'effect-api-query'
+import { Multipart } from 'effect/http'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+const User = Schema.Struct({ id: Schema.Int, name: Schema.String })
+const UserPage = Schema.Struct({
+  users: Schema.Array(User),
+  nextCursor: Schema.NullOr(Schema.Int),
+})
+const locale = Schema.String.pipe(Schema.withConstructorDefault(Effect.succeed('en')))
+const group = RpcGroup.make(
+  Rpc.make('users.get', { payload: { id: Schema.Int, locale }, success: User }),
+  Rpc.make('users.list', { success: Schema.Array(User) }),
+  Rpc.make('users.create', { payload: { name: Schema.String }, success: User }),
+  Rpc.make('users.page', {
+    payload: { cursor: Schema.Int, pageSize: Schema.Int },
+    success: UserPage,
+  }),
+  Rpc.make('diagnostics.stream', { success: Schema.String, stream: true }),
+)
+const upload = HttpApiEndpoint.post('upload', '/users/:id/files', {
+  params: { id: Schema.Int },
+  payload: Schema.Struct({ file: Multipart.SingleFileSchema }).pipe(HttpApiSchema.asMultipart()),
+  success: Schema.Struct({ name: Schema.String }),
+})
+const api = HttpApi.make('docs-users').add(
+  HttpApiGroup.make('users').add(
+    HttpApiEndpoint.get('get', '/users/:id', {
+      params: { id: Schema.Int },
+      query: { locale },
+      success: User,
+    }),
+    HttpApiEndpoint.post('create', '/users', {
+      payload: Schema.Struct({ name: Schema.String }),
+      success: User,
+    }),
+    HttpApiEndpoint.put('update', '/users/:id', {
+      params: { id: Schema.Int },
+      headers: { 'if-match': Schema.String },
+      payload: Schema.Struct({ name: Schema.String }),
+      success: User,
+      error: Schema.Literal('precondition-failed').pipe(HttpApiSchema.status(412)),
+    }),
+    HttpApiEndpoint.get('page', '/users/page', {
+      query: { cursor: Schema.Int, pageSize: Schema.Int },
+      success: UserPage,
+    }),
+    upload,
+  ),
+  HttpApiGroup.make('events').add(
+    HttpApiEndpoint.get('watch', '/events', {
+      query: { channel: Schema.String },
+      success: HttpApiSchema.StreamSse({ data: Schema.String }),
+    }),
+  ),
+)
+
+declare const rpcClient: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>
+declare const httpClient: HttpApiClient.ForApi<typeof api>
+const rpc = createRpcQueryUtils(group, { client: rpcClient, keyPrefix: ['docs-users'] })
+const http = createHttpApiQueryUtils(api, { client: httpClient, keyPrefix: ['docs-users'] })
+const queryClient = new QueryClient()
+
+async function queryUsers() {
+  const userOptions = rpc.users.get.queryOptions({ input: { id: 1 }, staleTime: 30_000 })
+  const user = await queryClient.query(userOptions)
+
+  const httpUserOptions = http.users.get.queryOptions({
+    input: { params: { id: 1 }, query: { locale: 'en' } },
+    staleTime: 30_000,
+  })
+  const httpUser = await queryClient.query(httpUserOptions)
+
+  const nameOptions = rpc.users.get.queryOptions({
+    input: { id: 1 },
+    select: (user) => user.name,
+  })
+  const selectedName = await queryClient.query(nameOptions)
+  const cachedUser = queryClient.getQueryData(nameOptions.queryKey)
+
+  rpc.users.list.queryOptions()
+  selectedName satisfies string
+  cachedUser satisfies typeof User.Type | undefined
+  new QueryObserver(queryClient, nameOptions).getCurrentResult().data satisfies string | undefined
+  return { user, httpUser }
+}
+
+async function createUsers() {
+  const createUser = new MutationObserver(
+    queryClient,
+    rpc.users.create.mutationOptions({
+      onSuccess: () => queryClient.invalidateQueries({ queryKey: rpc.users.key() }),
+    }),
+  )
+  const created = await createUser.mutate({ name: 'Ada' })
+
+  const createHttpUser = new MutationObserver(
+    queryClient,
+    http.users.create.mutationOptions({
+      onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.key() }),
+    }),
+  )
+  const createdHttpUser = await createHttpUser.mutate({ payload: { name: 'Ada' } })
+  created satisfies typeof User.Type
+  createdHttpUser satisfies typeof User.Type
+}
+
+async function loadPages() {
+  const rpcPages = rpc.users.page.infiniteOptions({
+    initialPageParam: 0,
+    input: (cursor) => ({ cursor, pageSize: 20 }),
+    getNextPageParam: (page) => page.nextCursor ?? undefined,
+  })
+  const pages = await queryClient.infiniteQuery(rpcPages)
+
+  const httpPages = http.users.page.infiniteOptions({
+    initialPageParam: 0,
+    input: (cursor) => ({ query: { cursor, pageSize: 20 } }),
+    getNextPageParam: (page) => page.nextCursor ?? undefined,
+  })
+
+  const cachedPages = queryClient.getQueryData(httpPages.queryKey)
+  cachedPages?.pages satisfies readonly (typeof UserPage.Type)[] | undefined
+  cachedPages?.pageParams satisfies readonly number[] | undefined
+  return pages.pages.flatMap((page) => page.users)
+}
+
+function observeStreams() {
+  const history = rpc.diagnostics.stream.streamedOptions({
+    maxChunks: 100,
+    refetchMode: 'reset',
+  })
+  const sseHistory = http.events.watch.streamedOptions({
+    input: { query: { channel: 'news' } },
+    maxChunks: 100,
+    sseOptions: { maxEventSize: 1024 * 1024 },
+  })
+
+  const latest = rpc.diagnostics.stream.liveOptions()
+  const latestSse = http.events.watch.liveOptions({
+    input: { query: { channel: 'news' } },
+    sseOptions: { maxEventSize: 1024 * 1024 },
+  })
+
+  queryClient.getQueryData(history.queryKey) satisfies readonly string[] | undefined
+  queryClient.getQueryData(sseHistory.queryKey) satisfies readonly string[] | undefined
+  queryClient.getQueryData(latest.queryKey) satisfies string | undefined
+  queryClient.getQueryData(latestSse.queryKey) satisfies string | undefined
+}
+
+async function readMetadata() {
+  const input = { params: { id: 1 }, query: { locale: 'en' } }
+  const metadataOptions = http.users.get.metadataOptions({ input })
+  const current = await queryClient.query(metadataOptions)
+  console.log(current.data.name, current.status)
+  const etag = current.headers['etag']
+
+  if (etag === undefined) throw new Error('The server supplied no ETag')
+  await queryClient.cancelQueries({ queryKey: http.users.get.key() })
+  const updateUser = new MutationObserver(
+    queryClient,
+    http.users.update.mutationOptions({
+      onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.get.key() }),
+    }),
+  )
+
+  await updateUser.mutate({
+    params: input.params,
+    headers: { 'if-match': etag },
+    payload: { name: 'Ada' },
+  })
+  const refreshed = await queryClient.query(metadataOptions)
+  current.data satisfies typeof User.Type
+  current.headers satisfies Readonly<Record<string, string>>
+  return refreshed
+}
+
+async function uploadFile() {
+  const uploadFile = new MutationObserver(
+    queryClient,
+    http.users.upload.mutationOptions({
+      onSuccess: () => queryClient.invalidateQueries({ queryKey: http.users.key() }),
+    }),
+  )
+
+  const payload = new FormData()
+  payload.set('file', new Blob(['profile notes'], { type: 'text/plain' }), 'notes.txt')
+  const uploaded = await uploadFile.mutate({ params: { id: 1 }, payload })
+  uploaded satisfies { readonly name: string }
+}
diff --git a/tests/types/docs-hydration-async.ts b/tests/types/docs-hydration-async.ts
new file mode 100644
index 0000000..a797468
--- /dev/null
+++ b/tests/types/docs-hydration-async.ts
@@ -0,0 +1,53 @@
+import { defaultShouldDehydrateQuery, dehydrate, hydrate } from '@tanstack/query-core'
+import type { DehydratedState, QueryClient } from '@tanstack/query-core'
+import { Context, Effect, Schema } from 'effect'
+
+import { Profile } from './docs-hydration-rich.ts'
+
+class HydrationPreparation extends Context.Service<
+  HydrationPreparation,
+  {
+    readonly beforeEncode: Effect.Effect<void>
+    readonly beforeDecode: Effect.Effect<void>
+  }
+>()('HydrationPreparation') {}
+
+const PreparedProfile = Profile.pipe(
+  Schema.middlewareEncoding<typeof Profile, HydrationPreparation>((encoding) =>
+    Effect.flatMap(HydrationPreparation, ({ beforeEncode }) =>
+      Effect.andThen(beforeEncode, encoding),
+    ),
+  ),
+  Schema.middlewareDecoding((decoding) =>
+    Effect.flatMap(HydrationPreparation, ({ beforeDecode }) =>
+      Effect.andThen(beforeDecode, decoding),
+    ),
+  ),
+)
+
+const prepareProfileSnapshot = Effect.fnUntraced(function* (queryClient: QueryClient) {
+  const snapshot = dehydrate(queryClient, {
+    shouldDehydrateMutation: () => false,
+    shouldDehydrateQuery: (query) =>
+      defaultShouldDehydrateQuery(query) && query.queryKey[0] === 'profile',
+  })
+  const queries = yield* Effect.forEach(snapshot.queries, (query) =>
+    Schema.encodeUnknownEffect(PreparedProfile)(query.state.data).pipe(
+      Effect.map((data) => ({ ...query, state: { ...query.state, data } })),
+    ),
+  )
+  return JSON.stringify({ ...snapshot, queries })
+})
+
+const prepareProfileHydration = Effect.fnUntraced(function* (
+  queryClient: QueryClient,
+  json: string,
+) {
+  const snapshot: DehydratedState = JSON.parse(json)
+  const queries = yield* Effect.forEach(snapshot.queries, (query) =>
+    Schema.decodeUnknownEffect(PreparedProfile)(query.state.data).pipe(
+      Effect.map((data) => ({ ...query, state: { ...query.state, data } })),
+    ),
+  )
+  yield* Effect.sync(() => hydrate(queryClient, { ...snapshot, queries }))
+})
diff --git a/tests/types/docs-hydration-dto.ts b/tests/types/docs-hydration-dto.ts
new file mode 100644
index 0000000..a75d5bf
--- /dev/null
+++ b/tests/types/docs-hydration-dto.ts
@@ -0,0 +1,45 @@
+import { defaultShouldDehydrateQuery, dehydrate, hydrate } from '@tanstack/query-core'
+import type { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import { createHttpApiQueryUtils, createRpcQueryUtils } from 'effect-api-query'
+import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import { Rpc, RpcClient, RpcGroup } from 'effect/rpc'
+
+const ProfileDto = Schema.Struct({
+  name: Schema.String,
+  credits: Schema.String,
+  avatar: Schema.String.check(Schema.isBase64()),
+})
+
+const dtoGroup = RpcGroup.make(Rpc.make('profile.read', { success: ProfileDto }))
+const dtoApi = HttpApi.make('dto').add(
+  HttpApiGroup.make('profile').add(
+    HttpApiEndpoint.get('read', '/profile', { success: ProfileDto }),
+  ),
+)
+
+function dtoRpcOptions<E>(client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof dtoGroup>, E>) {
+  return createRpcQueryUtils<typeof dtoGroup, readonly ['dto', 'rpc'], E>(dtoGroup, {
+    client,
+    keyPrefix: ['dto', 'rpc'],
+  }).profile.read.queryOptions({ retry: false, staleTime: 60_000 })
+}
+
+function dtoHttpOptions(client: HttpApiClient.ForApi<typeof dtoApi>) {
+  return createHttpApiQueryUtils(dtoApi, {
+    client,
+    keyPrefix: ['dto', 'http'],
+  }).profile.read.queryOptions({ retry: false, staleTime: 60_000 })
+}
+
+const snapshotDto = (queryClient: QueryClient): string =>
+  JSON.stringify(
+    dehydrate(queryClient, {
+      shouldDehydrateMutation: () => false,
+      shouldDehydrateQuery: (query) =>
+        defaultShouldDehydrateQuery(query) && query.queryKey[0] === 'dto',
+    }),
+  )
+
+const hydrateDto = (queryClient: QueryClient, json: string): void =>
+  hydrate(queryClient, JSON.parse(json))
diff --git a/tests/types/docs-hydration-rich.ts b/tests/types/docs-hydration-rich.ts
new file mode 100644
index 0000000..fff45ac
--- /dev/null
+++ b/tests/types/docs-hydration-rich.ts
@@ -0,0 +1,56 @@
+import { defaultShouldDehydrateQuery, dehydrate, hydrate } from '@tanstack/query-core'
+import type { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import { createHttpApiQueryUtils, createRpcQueryUtils } from 'effect-api-query'
+import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import { Rpc, RpcClient, RpcGroup } from 'effect/rpc'
+
+export class Profile extends Schema.Class<Profile>('Profile')({
+  name: Schema.String,
+  credits: Schema.BigIntFromString,
+  avatar: Schema.Uint8ArrayFromBase64,
+}) {
+  summary(): string {
+    return `${this.name}: ${this.credits} credits`
+  }
+}
+
+const profileGroup = RpcGroup.make(
+  Rpc.make('profile.read', { success: Profile, error: Schema.String }),
+)
+const profileApi = HttpApi.make('rich').add(
+  HttpApiGroup.make('profile').add(
+    HttpApiEndpoint.get('read', '/profile', { success: Profile, error: Schema.String }),
+  ),
+)
+
+function profileRpcOptions<E>(
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof profileGroup>, E>,
+) {
+  return createRpcQueryUtils<typeof profileGroup, readonly ['profile', 'rpc'], E>(profileGroup, {
+    client,
+    keyPrefix: ['profile', 'rpc'],
+  }).profile.read.queryOptions({ retry: false, staleTime: 60_000 })
+}
+
+function profileHttpOptions(client: HttpApiClient.ForApi<typeof profileApi>) {
+  return createHttpApiQueryUtils(profileApi, {
+    client,
+    keyPrefix: ['profile', 'http'],
+  }).profile.read.queryOptions({ retry: false, staleTime: 60_000 })
+}
+
+const snapshotProfile = (queryClient: QueryClient): string =>
+  JSON.stringify(
+    dehydrate(queryClient, {
+      shouldDehydrateMutation: () => false,
+      shouldDehydrateQuery: (query) =>
+        defaultShouldDehydrateQuery(query) && query.queryKey[0] === 'profile',
+      serializeData: Schema.encodeUnknownSync(Profile),
+    }),
+  )
+
+const hydrateProfile = (queryClient: QueryClient, json: string): void =>
+  hydrate(queryClient, JSON.parse(json), {
+    defaultOptions: { deserializeData: Schema.decodeUnknownSync(Profile) },
+  })
diff --git a/tests/types/docs-hydration-views.ts b/tests/types/docs-hydration-views.ts
new file mode 100644
index 0000000..caca5ee
--- /dev/null
+++ b/tests/types/docs-hydration-views.ts
@@ -0,0 +1,159 @@
+import { defaultShouldDehydrateQuery, dehydrate, hydrate } from '@tanstack/query-core'
+import type { DehydratedState, QueryClient, QueryKey } from '@tanstack/query-core'
+import { Context, Effect, Schema, SchemaTransformation } from 'effect'
+import { HttpApiSchema } from 'effect/http-api'
+
+import { Profile } from './docs-hydration-rich.ts'
+
+const UndefinedElement = Schema.Struct({ _tag: Schema.Literal('Undefined') }).pipe(
+  Schema.decodeTo(
+    Schema.Undefined,
+    SchemaTransformation.transform({
+      decode: () => undefined,
+      encode: () => ({ _tag: 'Undefined' as const }),
+    }),
+  ),
+)
+
+export const HistoryElement = Schema.Union([Profile, Schema.Null, UndefinedElement])
+const ProfileHistory = Schema.Array(HistoryElement)
+
+export class Cursor extends Schema.Class<Cursor>('Cursor')({ offset: Schema.BigIntFromString }) {
+  isStart(): boolean {
+    return this.offset === 0n
+  }
+}
+
+export const ProfilePage = Schema.Struct({
+  rows: Schema.Array(Profile),
+  next: Schema.NullOr(Schema.Finite),
+})
+const ProfilePages = Schema.Struct({
+  pages: Schema.Array(ProfilePage),
+  pageParams: Schema.Array(Cursor),
+})
+
+export class ArchivedProfile extends Schema.Class<ArchivedProfile>('ArchivedProfile')({
+  archived: Schema.Literal(true),
+  name: Schema.String,
+  credits: Schema.BigIntFromString,
+}) {
+  summary(): string {
+    return `${this.name}: ${this.credits} archived credits`
+  }
+}
+
+const DecodedHeaders = Schema.Struct({ 'x-version': Schema.FiniteFromString })
+const WrappedElement = Schema.Struct({ body: HistoryElement, headers: DecodedHeaders }).pipe(
+  Schema.decodeTo(
+    Schema.toType(HttpApiSchema.WithHeaders(HistoryElement, DecodedHeaders)),
+    SchemaTransformation.transform({
+      decode: HttpApiSchema.withHeaders,
+      encode: ({ body, headers }) => ({ body, headers }),
+    }),
+  ),
+)
+const BufferedBody = Schema.Union([Profile, ArchivedProfile])
+const BufferedProfile = Schema.Struct({
+  body: BufferedBody,
+  headers: DecodedHeaders,
+}).pipe(
+  Schema.decodeTo(
+    Schema.toType(HttpApiSchema.WithHeaders(BufferedBody, DecodedHeaders)),
+    SchemaTransformation.transform({
+      decode: HttpApiSchema.withHeaders,
+      encode: ({ body, headers }) => ({ body, headers }),
+    }),
+  ),
+)
+const ProfileMetadata = Schema.Struct({
+  data: BufferedProfile,
+  status: Schema.Finite,
+  headers: Schema.Record(Schema.String, Schema.String),
+})
+
+export class SnapshotEncoding extends Context.Service<
+  SnapshotEncoding,
+  {
+    readonly beforeEncode: Effect.Effect<void>
+  }
+>()('SnapshotEncoding') {}
+
+export class SnapshotDecoding extends Context.Service<
+  SnapshotDecoding,
+  {
+    readonly beforeDecode: Effect.Effect<void>
+  }
+>()('SnapshotDecoding') {}
+
+const prepared = <S extends Schema.Codec<unknown, unknown, never, never>>(schema: S) =>
+  schema.pipe(
+    Schema.middlewareEncoding<S, SnapshotEncoding | S['EncodingServices']>((encoding) =>
+      Effect.flatMap(SnapshotEncoding, ({ beforeEncode }) =>
+        Effect.andThen(beforeEncode, encoding),
+      ),
+    ),
+    Schema.middlewareDecoding((decoding) =>
+      Effect.flatMap(SnapshotDecoding, ({ beforeDecode }) =>
+        Effect.andThen(beforeDecode, decoding),
+      ),
+    ),
+  )
+
+const codecs = {
+  history: prepared(ProfileHistory),
+  infinite: prepared(ProfilePages),
+  live: prepared(Schema.NullOr(Profile)),
+  buffered: prepared(BufferedProfile),
+  metadata: prepared(ProfileMetadata),
+  'wrapped-history': prepared(Schema.Array(WrappedElement)),
+  'wrapped-live': prepared(WrappedElement),
+}
+const ViewId = Schema.Literals([
+  'history',
+  'infinite',
+  'live',
+  'buffered',
+  'metadata',
+  'wrapped-history',
+  'wrapped-live',
+])
+
+const codecFor = Effect.fnUntraced(function* (key: QueryKey) {
+  yield* Schema.decodeUnknownEffect(Schema.Literal('hydration-views'))(key[0])
+  const id = yield* Schema.decodeUnknownEffect(ViewId)(key[1])
+  return codecs[id]
+})
+
+export const prepareViewSnapshot = Effect.fnUntraced(function* (queryClient: QueryClient) {
+  const snapshot = dehydrate(queryClient, {
+    shouldDehydrateMutation: () => false,
+    shouldDehydrateQuery: (query) =>
+      defaultShouldDehydrateQuery(query) && query.queryKey[0] === 'hydration-views',
+  })
+  const queries = yield* Effect.forEach(
+    snapshot.queries,
+    Effect.fnUntraced(function* (query) {
+      const codec = yield* codecFor(query.queryKey)
+      const data = yield* Schema.encodeUnknownEffect(codec)(query.state.data)
+      return { ...query, state: { ...query.state, data } }
+    }),
+  )
+  return JSON.stringify({ ...snapshot, queries })
+})
+
+export const prepareViewHydration = Effect.fnUntraced(function* (
+  queryClient: QueryClient,
+  json: string,
+) {
+  const snapshot: DehydratedState = JSON.parse(json)
+  const queries = yield* Effect.forEach(
+    snapshot.queries,
+    Effect.fnUntraced(function* (query) {
+      const codec = yield* codecFor(query.queryKey)
+      const data = yield* Schema.decodeUnknownEffect(codec)(query.state.data)
+      return { ...query, state: { ...query.state, data } }
+    }),
+  )
+  yield* Effect.sync(() => hydrate(queryClient, { ...snapshot, queries }))
+})
diff --git a/tests/types/docs-policies.ts b/tests/types/docs-policies.ts
new file mode 100644
index 0000000..ca33e7e
--- /dev/null
+++ b/tests/types/docs-policies.ts
@@ -0,0 +1,106 @@
+import { QueryClient } from '@tanstack/query-core'
+import {
+  createHttpApiQueryUtils,
+  createRpcQueryUtils,
+  viewPrefix,
+  withMutationPolicy,
+  withQueryPolicy,
+} from 'effect-api-query'
+import type {
+  InferInput,
+  InferMutationData,
+  InferMutationError,
+  InferQueryData,
+  InferQueryError,
+  QueryPolicy,
+} from 'effect-api-query'
+import type { HttpApiClient } from 'effect/http-api'
+import type { RpcClient, RpcGroup } from 'effect/rpc'
+
+import { exampleRpcGroup } from '../../examples/contracts/src/contracts'
+import { exampleHttpApi } from '../../examples/contracts/src/http-api'
+
+declare const client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof exampleRpcGroup>>
+declare const httpClient: HttpApiClient.ForApi<typeof exampleHttpApi>
+const rpc = createRpcQueryUtils(exampleRpcGroup, { client, keyPrefix: ['policy-app'] })
+const http = createHttpApiQueryUtils(exampleHttpApi, {
+  client: httpClient,
+  keyPrefix: ['policy-app'],
+})
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: { staleTime: 30_000, gcTime: 600_000, retry: false, retryDelay: 250 },
+    mutations: { retry: false },
+  },
+})
+
+const registerDefaults = () => {
+  queryClient.setQueryDefaults(rpc.key(), { staleTime: 60_000 })
+  queryClient.setQueryDefaults(rpc.users.key(), { retry: 2 })
+  queryClient.setQueryDefaults(viewPrefix(rpc.users.get, 'query'), { staleTime: 120_000 })
+
+  const user = rpc.users.get.queryOptions({
+    input: { id: 1 },
+    select: (value) => value.name,
+  })
+  const refreshUser = rpc.users.get.queryOptions({
+    input: { id: 1 },
+    staleTime: 0,
+    retry: false,
+  })
+
+  queryClient.setQueryDefaults(http.key(), {
+    queryKeyHashFn: (key) => `users:${JSON.stringify(key)}`,
+  })
+  queryClient.setQueryDefaults(http.users.key(), { retry: 1 })
+  queryClient.setQueryDefaults(viewPrefix(http.users.get, 'metadata'), { staleTime: 5_000 })
+
+  const input = { params: { id: 1 }, query: {} }
+  const httpUser = http.users.get.queryOptions({ input })
+  const metadata = http.users.get.metadataOptions({ input })
+}
+
+const policy = {
+  staleTime: 30_000,
+  refetchOnWindowFocus: false,
+  retry: false,
+} satisfies QueryPolicy<typeof rpc.users.get>
+const userOptions = withQueryPolicy(rpc.users.get, 'query', policy)
+const user = userOptions({ input: { id: 1 }, select: (value) => value.name })
+const refreshUser = userOptions({ input: { id: 1 }, staleTime: 0, retry: false })
+
+const createUserOptions = withMutationPolicy(rpc.users.create, {
+  onSuccess: async (created) => {
+    queryClient.setQueryData(rpc.users.get.queryKey({ id: created.id }), created)
+    await queryClient.invalidateQueries({ queryKey: rpc.users.key() })
+  },
+})
+declare const reportCreationFailure: (name: string | undefined, error: unknown) => void
+const createUser = createUserOptions({
+  onMutate: (variables) => ({ submittedName: variables.name }),
+  onError: (error, _variables, context) => {
+    reportCreationFailure(context?.submittedName, error)
+  },
+})
+
+queryClient.setQueryDefaults(viewPrefix(rpc.users.get, 'query'), { staleTime: 120_000 })
+queryClient.setQueryDefaults(viewPrefix(http.users.get, 'metadata'), { staleTime: 5_000 })
+const queryPrefix = viewPrefix(rpc.users.get, 'query')
+await queryClient.invalidateQueries({ queryKey: queryPrefix, type: 'inactive' })
+const historyPrefix = viewPrefix(rpc.diagnostics.stream, 'streamed')
+await queryClient.invalidateQueries({ queryKey: historyPrefix })
+
+const input: InferInput<typeof rpc.users.get> = { id: 1 }
+type UserData = InferQueryData<typeof rpc.users.get>
+type HistoryData = InferQueryData<typeof rpc.diagnostics.stream, 'streamed'>
+type UserError = InferQueryError<typeof rpc.users.get>
+type CreateUserInput = InferInput<typeof rpc.users.create>
+type CreatedUser = InferMutationData<typeof rpc.users.create>
+type CreateUserError = InferMutationError<typeof rpc.users.create>
+
+const selectedOptions = rpc.users.get.queryOptions({
+  input: { id: 1 },
+  select: (value) => value.name,
+})
+const selectedName = await queryClient.query(selectedOptions)
+const cachedUser = queryClient.getQueryData(selectedOptions.queryKey)
diff --git a/tests/types/docs-react-entry.ts b/tests/types/docs-react-entry.ts
new file mode 100644
index 0000000..efbfbba
--- /dev/null
+++ b/tests/types/docs-react-entry.ts
@@ -0,0 +1,9 @@
+// fallow-ignore-file unused-export
+import { mountUsersApplication } from './docs-react-setup.tsx'
+
+const element = document.getElementById('root')
+if (element === null) {
+  throw new Error('Missing application root element')
+}
+
+export const stopUsers = await mountUsersApplication(element, 'http://localhost:3000')
diff --git a/tests/types/docs-react-setup.tsx b/tests/types/docs-react-setup.tsx
new file mode 100644
index 0000000..16fa02e
--- /dev/null
+++ b/tests/types/docs-react-setup.tsx
@@ -0,0 +1,85 @@
+import { QueryClient, QueryClientProvider, useQuery } from '@tanstack/react-query'
+import { ManagedRuntime, Schema } from 'effect'
+import { createHttpApiQueryUtils } from 'effect-api-query'
+import type { RunPromiseExit } from 'effect-api-query'
+import { FetchHttpClient } from 'effect/http'
+import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import { createRoot } from 'react-dom/client'
+
+const usersApi = HttpApi.make('users-api').add(
+  HttpApiGroup.make('users').add(
+    HttpApiEndpoint.get('get', '/users/:id', {
+      params: { id: Schema.Int },
+      success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+    }),
+  ),
+)
+
+const startUsersApplication = async (baseUrl: string) => {
+  const runtime = ManagedRuntime.make(FetchHttpClient.layer)
+  const running = new Set<Promise<unknown>>()
+  const runPromiseExit: RunPromiseExit = (effect, options) => {
+    const pending = runtime.runPromiseExit(effect, options)
+    running.add(pending)
+    void pending.then(
+      () => running.delete(pending),
+      () => running.delete(pending),
+    )
+    return pending
+  }
+  try {
+    const client = await runtime.runPromise(HttpApiClient.make(usersApi, { baseUrl }))
+    const queryClient = new QueryClient()
+    const http = createHttpApiQueryUtils(usersApi, {
+      client,
+      keyPrefix: ['users-app'],
+      runPromiseExit,
+    })
+    return {
+      http,
+      queryClient,
+      dispose: async () => {
+        try {
+          await queryClient.cancelQueries()
+        } finally {
+          try {
+            await Promise.allSettled([...running])
+          } finally {
+            queryClient.clear()
+            await runtime.dispose()
+          }
+        }
+      },
+    }
+  } catch (error) {
+    await runtime.dispose()
+    throw error
+  }
+}
+
+type UsersApplication = Awaited<ReturnType<typeof startUsersApplication>>
+
+const User = ({ application }: { readonly application: UsersApplication }) => {
+  const user = useQuery(application.http.users.get.queryOptions({ input: { params: { id: 1 } } }))
+  if (user.isPending) {
+    return <p>Loading user…</p>
+  }
+  if (user.isError) {
+    return <p role="alert">Could not load the user.</p>
+  }
+  return <h1>{user.data.name}</h1>
+}
+
+export const mountUsersApplication = async (element: HTMLElement, baseUrl: string) => {
+  const application = await startUsersApplication(baseUrl)
+  const root = createRoot(element)
+  root.render(
+    <QueryClientProvider client={application.queryClient}>
+      <User application={application} />
+    </QueryClientProvider>,
+  )
+  return async () => {
+    root.unmount()
+    await application.dispose()
+  }
+}
diff --git a/tests/types/docs-readme-http.ts b/tests/types/docs-readme-http.ts
new file mode 100644
index 0000000..1da70fa
--- /dev/null
+++ b/tests/types/docs-readme-http.ts
@@ -0,0 +1,24 @@
+import { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import { createHttpApiQueryUtils } from 'effect-api-query'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+
+const usersApi = HttpApi.make('users-api').add(
+  HttpApiGroup.make('users').add(
+    HttpApiEndpoint.get('get', '/users/:id', {
+      params: { id: Schema.Int },
+      success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+    }),
+  ),
+)
+
+async function readUser(client: HttpApiClient.ForApi<typeof usersApi>, queryClient: QueryClient) {
+  const http = createHttpApiQueryUtils(usersApi, { client, keyPrefix: ['users-app'] })
+  const user = await queryClient.query(
+    http.users.get.queryOptions({ input: { params: { id: 1 } } }),
+  )
+  return user.name
+}
+
+void readUser
diff --git a/tests/types/docs-readme-rpc.ts b/tests/types/docs-readme-rpc.ts
new file mode 100644
index 0000000..00f5343
--- /dev/null
+++ b/tests/types/docs-readme-rpc.ts
@@ -0,0 +1,23 @@
+import { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import { createRpcQueryUtils } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+const usersRpc = RpcGroup.make(
+  Rpc.make('users.get', {
+    payload: { id: Schema.Int },
+    success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+  }),
+)
+
+async function readUser(
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof usersRpc>>,
+  queryClient: QueryClient,
+) {
+  const rpc = createRpcQueryUtils(usersRpc, { client, keyPrefix: ['users-app'] })
+  const user = await queryClient.query(rpc.users.get.queryOptions({ input: { id: 1 } }))
+  return user.name
+}
+
+void readUser
diff --git a/tests/types/docs-retry.ts b/tests/types/docs-retry.ts
new file mode 100644
index 0000000..6084e22
--- /dev/null
+++ b/tests/types/docs-retry.ts
@@ -0,0 +1,104 @@
+import { Cause, Result, Schema } from 'effect'
+import {
+  createHttpApiQueryUtils,
+  createRpcQueryUtils,
+  isEffectHttpApiQueryError,
+  isEffectRpcQueryError,
+  withQueryPolicy,
+} from 'effect-api-query'
+import type { InferQueryError } from 'effect-api-query'
+import { HttpClientError } from 'effect/http'
+import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
+import { Rpc, RpcClient, RpcClientError, RpcGroup } from 'effect/rpc'
+
+class NotFound extends Schema.TaggedError<NotFound>()('NotFound', {}) {}
+class AuthenticationRequired extends Schema.TaggedError<AuthenticationRequired>()(
+  'AuthenticationRequired',
+  {},
+) {}
+class RetryLater extends Schema.TaggedError<RetryLater>()('RetryLater', {
+  retryAfterMs: Schema.Finite,
+}) {}
+
+const ReadError = Schema.Union([NotFound, AuthenticationRequired, RetryLater])
+const readGroup = RpcGroup.make(
+  Rpc.make('profile.read', { success: Schema.String, error: ReadError }),
+)
+const readApi = HttpApi.make('profile-api').add(
+  HttpApiGroup.make('profile').add(
+    HttpApiEndpoint.get('read', '/profile', { success: Schema.String, error: ReadError }),
+  ),
+)
+
+const retryPolicy = <Error, Failure>(
+  causeOf: (error: Error) => Cause.Cause<Failure> | undefined,
+  isTransient: (failure: Failure) => boolean,
+) => ({
+  retry: (failureCount: number, error: Error) => {
+    const cause = causeOf(error)
+    if (
+      !cause ||
+      failureCount >= 2 ||
+      Cause.hasDies(cause) ||
+      Cause.hasInterrupts(cause) ||
+      cause.reasons.length !== 1
+    ) {
+      return false
+    }
+    const failure = Cause.findError(cause)
+    return (
+      Result.isSuccess(failure) &&
+      (Schema.is(RetryLater)(failure.success) || isTransient(failure.success))
+    )
+  },
+  retryDelay: (attemptIndex: number, error: Error) => {
+    const cause = causeOf(error)
+    if (cause) {
+      const failure = Cause.findError(cause)
+      if (Result.isSuccess(failure) && Schema.is(RetryLater)(failure.success)) {
+        return Math.min(30_000, Math.max(0, failure.success.retryAfterMs))
+      }
+    }
+    return Math.min(1_000 * 2 ** attemptIndex, 30_000)
+  },
+})
+
+const rpcReadOptions = (
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof readGroup>, RpcClientError.RpcClientError>,
+) => {
+  const rpc = createRpcQueryUtils<
+    typeof readGroup,
+    readonly ['profile-app'],
+    RpcClientError.RpcClientError
+  >(readGroup, { client, keyPrefix: ['profile-app'] })
+
+  type Error = InferQueryError<typeof rpc.profile.read>
+  const read = withQueryPolicy(
+    rpc.profile.read,
+    'query',
+    retryPolicy(
+      (error: Error) => (isEffectRpcQueryError(error) ? error.cause : undefined),
+      (failure) =>
+        Schema.is(RpcClientError.RpcClientError)(failure) &&
+        failure.reason._tag === 'HttpError' &&
+        failure.reason.kind === 'TransportError',
+    ),
+  )
+  return read()
+}
+
+const httpReadOptions = (client: HttpApiClient.ForApi<typeof readApi>) => {
+  const http = createHttpApiQueryUtils(readApi, { client, keyPrefix: ['profile-app'] })
+
+  type Error = InferQueryError<typeof http.profile.read>
+  const read = withQueryPolicy(
+    http.profile.read,
+    'query',
+    retryPolicy(
+      (error: Error) => (isEffectHttpApiQueryError(error) ? error.cause : undefined),
+      (failure) =>
+        HttpClientError.isHttpClientError(failure) && failure.reason._tag === 'TransportError',
+    ),
+  )
+  return read()
+}
diff --git a/tests/types/docs-stream-snapshot.ts b/tests/types/docs-stream-snapshot.ts
new file mode 100644
index 0000000..dc738b5
--- /dev/null
+++ b/tests/types/docs-stream-snapshot.ts
@@ -0,0 +1,43 @@
+import type { QueryClient } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import { createRpcQueryUtils, fetchStreamSnapshot } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+const updates = RpcGroup.make(
+  Rpc.make('updates.watch', {
+    payload: { channel: Schema.String },
+    success: Schema.String,
+    stream: true,
+  }),
+)
+
+async function captureUpdates<E>(
+  queryClient: QueryClient,
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof updates>, E>,
+  signal: AbortSignal,
+) {
+  const rpc = createRpcQueryUtils<typeof updates, readonly ['updates'], E>(updates, {
+    client,
+    keyPrefix: ['updates'],
+  })
+  const input = { channel: 'announcements' }
+  const history = await fetchStreamSnapshot(
+    queryClient,
+    rpc.updates.watch.streamedOptions({
+      input,
+      retry: false,
+      maxChunks: 20,
+    }),
+    { signal, timeoutMs: 5_000 },
+  )
+  const latest = await fetchStreamSnapshot(
+    queryClient,
+    rpc.updates.watch.liveOptions({
+      input,
+      retry: false,
+    }),
+    { signal, timeoutMs: 5_000 },
+  )
+  return { history, latest }
+}
diff --git a/tests/types/docs-stream-tracing.ts b/tests/types/docs-stream-tracing.ts
new file mode 100644
index 0000000..399c50b
--- /dev/null
+++ b/tests/types/docs-stream-tracing.ts
@@ -0,0 +1,70 @@
+import { QueryClient } from '@tanstack/query-core'
+import { Effect, Layer, ManagedRuntime, Schema, Stream, Tracer } from 'effect'
+import { createHttpApiQueryUtils, fetchStreamSnapshot } from 'effect-api-query'
+import type { RunPromiseExit } from 'effect-api-query'
+import { FetchHttpClient } from 'effect/http'
+import {
+  HttpApi,
+  HttpApiClient,
+  HttpApiEndpoint,
+  HttpApiGroup,
+  HttpApiSchema,
+} from 'effect/http-api'
+import { OtlpSerialization, OtlpTracer } from 'effect/observability'
+
+const feedApi = HttpApi.make('feed-api').add(
+  HttpApiGroup.make('events').add(
+    HttpApiEndpoint.get('watch', '/events', {
+      success: HttpApiSchema.StreamSse({ data: Schema.String }),
+    }),
+  ),
+)
+
+export const traceFeed = <A, E, R>(source: Stream.Stream<A, E, R>) =>
+  Stream.unwrap(
+    Effect.gen(function* () {
+      const span = yield* Effect.makeSpanScoped('events.watch.consume', {
+        attributes: { 'api.id': 'feed-api', endpoint: 'watch' },
+      })
+      return source.pipe(
+        Stream.tap(() => Effect.sync(() => span.attribute('feed.received', true))),
+        Stream.ensuring(Effect.sync(() => span.attribute('feed.cleanup', true))),
+        Stream.provideService(Tracer.ParentSpan, span),
+      )
+    }),
+  )
+
+const traceDecodedResponse = (effect: Effect.Effect<unknown, unknown, unknown>) =>
+  effect.pipe(Effect.map((value) => (Stream.isStream(value) ? traceFeed(value) : value)))
+
+const captureTracedFeed = async (baseUrl: string, collectorUrl: string, signal: AbortSignal) => {
+  const telemetry = OtlpTracer.layer({
+    url: collectorUrl,
+    resource: { serviceName: 'users-browser' },
+  }).pipe(Layer.provide(OtlpSerialization.layerJson), Layer.provide(FetchHttpClient.layer))
+  const runtime = ManagedRuntime.make(Layer.merge(FetchHttpClient.layer, telemetry))
+  const queryClient = new QueryClient()
+  try {
+    const client = await runtime.runPromise(
+      HttpApiClient.make(feedApi, { baseUrl, transformResponse: traceDecodedResponse }),
+    )
+    const runPromiseExit: RunPromiseExit = (effect, options) =>
+      runtime.runPromiseExit(effect, options)
+    const http = createHttpApiQueryUtils(feedApi, {
+      client,
+      keyPrefix: ['feed-app'],
+      runPromiseExit,
+    })
+    return await fetchStreamSnapshot(queryClient, http.events.watch.liveOptions({ retry: false }), {
+      signal,
+      timeoutMs: 5_000,
+    })
+  } finally {
+    try {
+      await queryClient.cancelQueries()
+    } finally {
+      queryClient.clear()
+      await runtime.dispose()
+    }
+  }
+}
diff --git a/tests/types/docs-suspense.tsx b/tests/types/docs-suspense.tsx
new file mode 100644
index 0000000..a49f573
--- /dev/null
+++ b/tests/types/docs-suspense.tsx
@@ -0,0 +1,132 @@
+import {
+  QueryErrorResetBoundary,
+  useSuspenseQueries,
+  useSuspenseQuery,
+} from '@tanstack/react-query'
+import { Cause, Result, Schema } from 'effect'
+import { createRpcQueryUtils, isEffectRpcQueryError } from 'effect-api-query'
+import type { InferQueryData, InferQueryError } from 'effect-api-query'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+import { Component, Suspense } from 'react'
+import type { ReactNode } from 'react'
+
+export class UserUnavailable extends Schema.TaggedError<UserUnavailable>()('UserUnavailable', {
+  message: Schema.String,
+}) {}
+
+export const suspenseGroup = RpcGroup.make(
+  Rpc.make('users.get', {
+    payload: { id: Schema.Int },
+    success: Schema.Struct({ id: Schema.Int, name: Schema.String }),
+    error: UserUnavailable,
+  }),
+)
+
+export const makeSuspenseQueries = <E,>(
+  client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof suspenseGroup>, E>,
+) =>
+  createRpcQueryUtils<typeof suspenseGroup, readonly ['suspense-users'], E>(suspenseGroup, {
+    client,
+    keyPrefix: ['suspense-users'],
+  })
+
+export type Queries<E> = ReturnType<typeof makeSuspenseQueries<E>>
+
+export const failureMessage = (error: unknown): string => {
+  if (isEffectRpcQueryError(error)) {
+    const failure = Cause.findError(error.cause)
+    if (
+      error.cause.reasons.length === 1 &&
+      Result.isSuccess(failure) &&
+      Schema.is(UserUnavailable)(failure.success)
+    ) {
+      return failure.success.message
+    }
+  }
+  return 'The request failed. Please try again.'
+}
+
+interface BoundaryProps {
+  readonly children: ReactNode
+  readonly onReset: () => void
+}
+
+interface BoundaryState {
+  readonly failed: boolean
+  readonly error: unknown
+}
+
+class RequestErrorBoundary extends Component<BoundaryProps, BoundaryState> {
+  override state: BoundaryState = { failed: false, error: undefined }
+
+  static getDerivedStateFromError(error: unknown): BoundaryState {
+    return { failed: true, error }
+  }
+
+  reset = () => {
+    this.props.onReset()
+    this.setState({ failed: false, error: undefined })
+  }
+
+  override render() {
+    if (this.state.failed) {
+      return (
+        <div role="alert">
+          <p>{failureMessage(this.state.error)}</p>
+          <button type="button" onClick={this.reset}>
+            Try again
+          </button>
+        </div>
+      )
+    }
+    return this.props.children
+  }
+}
+
+const UserDetails = <E,>({ rpc }: { readonly rpc: Queries<E> }) => {
+  const user = useSuspenseQuery(
+    rpc.users.get.queryOptions({ input: { id: 1 }, retry: false, staleTime: 30_000 }),
+  )
+  return (
+    <>
+      <h2>{user.data.name}</h2>
+      {user.error !== null && !user.isFetching ? (
+        <p role="alert">{failureMessage(user.error)}</p>
+      ) : null}
+      <button type="button" onClick={() => void user.refetch()} disabled={user.isFetching}>
+        Refresh
+      </button>
+    </>
+  )
+}
+
+export const UserScreen = <E,>({ rpc }: { readonly rpc: Queries<E> }) => (
+  <QueryErrorResetBoundary>
+    {({ reset }) => (
+      <RequestErrorBoundary onReset={reset}>
+        <Suspense fallback={<p>Loading user…</p>}>
+          <UserDetails rpc={rpc} />
+        </Suspense>
+      </RequestErrorBoundary>
+    )}
+  </QueryErrorResetBoundary>
+)
+
+export const TwoUsers = <E,>({ rpc }: { readonly rpc: Queries<E> }) => {
+  type UserQuery = {
+    queryFnData: InferQueryData<typeof rpc.users.get>
+    error: InferQueryError<typeof rpc.users.get>
+  }
+  const [ada, grace] = useSuspenseQueries<[UserQuery, UserQuery]>({
+    queries: [
+      rpc.users.get.queryOptions({ input: { id: 1 }, retry: false, staleTime: 30_000 }),
+      rpc.users.get.queryOptions({ input: { id: 2 }, retry: false, staleTime: 30_000 }),
+    ],
+  })
+  return (
+    <p>
+      {ada.data.name} and {grace.data.name}
+    </p>
+  )
+}
diff --git a/tests/types/docs-user-events.ts b/tests/types/docs-user-events.ts
new file mode 100644
index 0000000..16b7cc2
--- /dev/null
+++ b/tests/types/docs-user-events.ts
@@ -0,0 +1,29 @@
+import { Effect, Stream } from 'effect'
+import type { Reactivity } from 'effect/reactivity'
+
+import { decodeUserEvent, makeUserEventConsumer } from '../fixtures/user-events.ts'
+import type { UserEventOwner } from '../fixtures/user-events.ts'
+
+const attachUserEvents = Effect.fnUntraced(function* (
+  owner: UserEventOwner,
+  reactivity: Reactivity.Reactivity,
+) {
+  const consumer = yield* makeUserEventConsumer(owner, reactivity, {
+    observedUsers: [{ id: 1, locale: 'en' }],
+  })
+  const consume = <E, R>(events: Stream.Stream<unknown, E, R>) =>
+    events.pipe(
+      Stream.mapEffect((event) => decodeUserEvent(event)),
+      Stream.runForEach(consumer.deliver),
+      Effect.ensuring(Effect.promise(consumer.flush)),
+    )
+  return {
+    consumer,
+    consume,
+    latestDiagnostic: owner.rpcQuery.diagnostics.stream.liveOptions(),
+    diagnosticHistory: owner.rpcQuery.diagnostics.stream.streamedOptions({
+      maxChunks: 64,
+      refetchMode: 'reset',
+    }),
+  }
+})
diff --git a/tests/types/example-owner-contract.ts b/tests/types/example-owner-contract.ts
new file mode 100644
index 0000000..f8be010
--- /dev/null
+++ b/tests/types/example-owner-contract.ts
@@ -0,0 +1,46 @@
+import { QueryClient } from '@tanstack/react-query'
+import type { MutationFunctionContext } from '@tanstack/react-query'
+
+import { makeOwnerCache } from '../../examples/vite-react/src/lib/owner-cache.ts'
+
+const queryClient = new QueryClient()
+const owner = makeOwnerCache({
+  identity: { tenantId: 'a', userId: 'b', sessionGeneration: 0, permissionGeneration: 0 },
+  queryClient,
+  directoryKeys: { rpc: ['rpc'], http: ['http'] },
+})
+const generated = owner.trackMutationOptions({
+  mutationKey: ['create'] as const,
+  mutationFn: async (input: { readonly name: string }) => ({ id: 1, ...input }),
+  networkMode: 'online' as const,
+  retry: 3,
+})
+generated.mutationKey satisfies readonly ['create']
+generated.mutationFn({ name: 'Ada' }) satisfies Promise<{
+  readonly id: number
+  readonly name: string
+}>
+generated.networkMode satisfies 'always'
+generated.retry satisfies false
+// @ts-expect-error The tracked function preserves required variables.
+generated.mutationFn()
+// @ts-expect-error The generated function keeps its original arity.
+generated.mutationFn({ name: 'Ada' }, {})
+
+const native = owner.trackMutationOptions({
+  mutationFn: async (input: number, context: MutationFunctionContext) => ({
+    input,
+    client: context.client,
+  }),
+})
+native.mutationFn(1, {
+  client: queryClient,
+  meta: undefined,
+}) satisfies Promise<{
+  readonly input: number
+  readonly client: QueryClient
+}>
+// @ts-expect-error The native function preserves its required context.
+native.mutationFn(1)
+// @ts-expect-error Tracking does not invent an absent key.
+native.mutationKey
diff --git a/tests/types/helper-contract.ts b/tests/types/helper-contract.ts
new file mode 100644
index 0000000..cce57da
--- /dev/null
+++ b/tests/types/helper-contract.ts
@@ -0,0 +1,309 @@
+import type { dataTagSymbol, InfiniteData, QueryClient, SkipToken } from '@tanstack/query-core'
+import { useInfiniteQuery, useMutation, useQuery, useSuspenseQuery } from '@tanstack/react-query'
+import { Effect, Schema } from 'effect'
+import {
+  createHttpApiQueryUtils,
+  createRpcQueryUtils,
+  skipToken,
+  viewPrefix,
+  withMutationPolicy,
+  withQueryPolicy,
+} from 'effect-api-query'
+import type {
+  EffectHttpApiQueryError,
+  EffectRpcQueryError,
+  InferInput,
+  InferMutationData,
+  InferMutationError,
+  InferQueryData,
+  InferQueryError,
+  MutationPolicy,
+  QueryPolicy,
+  RpcQueryUtils,
+} from 'effect-api-query'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+type Equal<Left, Right> =
+  (<Value>() => Value extends Left ? 1 : 2) extends <Value>() => Value extends Right ? 1 : 2
+    ? true
+    : false
+type Assert<Value extends true> = Value
+
+const group = RpcGroup.make(
+  Rpc.make('read', {
+    payload: {
+      id: Schema.Int,
+      locale: Schema.String.pipe(
+        Schema.optionalKey,
+        Schema.withConstructorDefault(Effect.succeed('en')),
+      ),
+    },
+    success: Schema.UndefinedOr(Schema.Int),
+    error: Schema.Literal('missing'),
+  }),
+  Rpc.make('ping'),
+  Rpc.make('watch', {
+    payload: { channel: Schema.String },
+    success: Schema.UndefinedOr(Schema.Int),
+    stream: true,
+  }),
+  Rpc.make('watchAll', { success: Schema.Int, stream: true }),
+)
+declare const client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>
+declare const queryClient: QueryClient
+const rpc = createRpcQueryUtils(group, { client, keyPrefix: ['helpers'] })
+
+const input = { id: 1 } satisfies InferInput<typeof rpc.read>
+type ReadData = Assert<Equal<InferQueryData<typeof rpc.read>, number | null>>
+type ReadMutationData = Assert<Equal<InferMutationData<typeof rpc.read>, number | undefined>>
+type ReadMutationError = Assert<
+  Equal<InferMutationError<typeof rpc.read>, InferQueryError<typeof rpc.read>>
+>
+type PingInput = Assert<Equal<InferInput<typeof rpc.ping>, void>>
+type PingQueryData = Assert<Equal<InferQueryData<typeof rpc.ping>, null>>
+type PingMutationData = Assert<Equal<InferMutationData<typeof rpc.ping>, void>>
+type WatchInput = Assert<Equal<InferInput<typeof rpc.watch>, { readonly channel: string }>>
+type WatchAllInput = Assert<Equal<InferInput<typeof rpc.watchAll>, void>>
+type WatchData = Assert<
+  Equal<InferQueryData<typeof rpc.watch, 'streamed'>, readonly (number | undefined)[]>
+>
+type WatchLiveData = Assert<Equal<InferQueryData<typeof rpc.watch, 'live'>, number | null>>
+type InfiniteReadData = Assert<
+  Equal<InferQueryData<typeof rpc.read, 'infinite'>, InfiniteData<number | null, unknown>>
+>
+type BranchInput = Assert<Equal<InferInput<typeof rpc>, never>>
+const broadGroup = RpcGroup.make(
+  Rpc.make('unknownRead', { payload: Schema.Unknown, success: Schema.String }),
+  Rpc.make('anyRead', { payload: Schema.Any, success: Schema.String }),
+  Rpc.make('optionalRead', {
+    payload: Schema.Union([Schema.String, Schema.Void]),
+    success: Schema.String,
+  }),
+  Rpc.make('unknownWatch', { payload: Schema.Unknown, success: Schema.String, stream: true }),
+  Rpc.make('anyWatch', { payload: Schema.Any, success: Schema.String, stream: true }),
+  Rpc.make('optionalWatch', {
+    payload: Schema.Union([Schema.String, Schema.Void]),
+    success: Schema.String,
+    stream: true,
+  }),
+)
+declare const broad: RpcQueryUtils<typeof broadGroup, readonly ['broad']>
+type UnknownInput = Assert<Equal<InferInput<typeof broad.unknownRead>, unknown>>
+type AnyInput = Assert<Equal<InferInput<typeof broad.anyRead>, any>>
+type OptionalInput = Assert<Equal<InferInput<typeof broad.optionalRead>, string | void>>
+type UnknownStreamInput = Assert<Equal<InferInput<typeof broad.unknownWatch>, unknown>>
+type AnyStreamInput = Assert<Equal<InferInput<typeof broad.anyWatch>, any>>
+type OptionalStreamInput = Assert<Equal<InferInput<typeof broad.optionalWatch>, string | void>>
+withQueryPolicy(broad.unknownRead, 'query', { retry: false })({ input: { id: 1 } })
+withQueryPolicy(broad.anyRead, 'query', { retry: false })({ input: { id: 1 } })
+withQueryPolicy(broad.optionalRead, 'query', { retry: false })({ input: undefined })
+withQueryPolicy(broad.unknownWatch, 'streamed', { retry: false })({ input: { id: 1 } })
+withQueryPolicy(broad.anyWatch, 'live', { retry: false })({ input: { id: 1 } })
+withQueryPolicy(broad.optionalWatch, 'live', { retry: false })({ input: 'Ada' })
+type StreamMutationData = Assert<Equal<InferMutationData<typeof rpc.watch>, never>>
+type StreamMutationError = Assert<Equal<InferMutationError<typeof rpc.watch>, never>>
+const prefix = viewPrefix(rpc.read, 'query')
+type ViewPrefix = Assert<Equal<typeof prefix, readonly ['helpers', 'rpc', 'read', 'query']>>
+type UntaggedPrefix = Assert<
+  Equal<typeof dataTagSymbol extends keyof typeof prefix ? true : false, false>
+>
+const prefixCacheData = queryClient.getQueryData(prefix)
+type PrefixCacheData = Assert<Equal<typeof prefixCacheData, unknown>>
+queryClient.invalidateQueries({ queryKey: prefix })
+viewPrefix(rpc.watch, 'streamed') satisfies readonly ['helpers', 'rpc', 'watch', 'streamed']
+// @ts-expect-error RPC leaves have no metadata view
+type MissingMetadata = InferQueryData<typeof rpc.read, 'metadata'>
+// @ts-expect-error Buffered RPC leaves have no live view
+type MissingLiveError = InferQueryError<typeof rpc.read, 'live'>
+// @ts-expect-error Streaming RPC leaves have no ordinary query view
+type MissingStreamQuery = InferQueryData<typeof rpc.watch, 'query'>
+// @ts-expect-error A payload constructor still requires its declared id
+const missingInput: InferInput<typeof rpc.read> = {}
+
+const policy = {
+  retry: (count, error) => {
+    error satisfies EffectRpcQueryError<'missing'>
+    return count < 2
+  },
+  staleTime: (query) => {
+    query.state.data satisfies number | null | undefined
+    return query.state.data === undefined ? 0 : 1_000
+  },
+  refetchInterval: (query) => (query.state.data === null ? false : 1_000),
+} satisfies QueryPolicy<typeof rpc.read>
+const read = withQueryPolicy(rpc.read, 'query', policy)
+const selected = read({ input, select: (data) => `${data}` })
+useQuery(selected).data satisfies string | undefined
+useSuspenseQuery(selected).data satisfies string
+queryClient.getQueryData(selected.queryKey) satisfies number | null | undefined
+const initialized = read({ input, initialData: 1, select: (data) => `${data}` })
+useQuery(initialized).data satisfies string
+const skipped = read({ input: skipToken })
+skipped.queryFn satisfies SkipToken
+declare const conditionalInput: InferInput<typeof rpc.read> | SkipToken
+const conditional = read({ input: conditionalInput })
+// @ts-expect-error A conditional function cannot be used as a Suspense query
+useSuspenseQuery(conditional)
+
+const infinite = withQueryPolicy(rpc.read, 'infinite', {
+  staleTime: (query) => {
+    query.state.data satisfies InfiniteData<number | null, unknown> | undefined
+    return 1_000
+  },
+})({
+  input: (page: number) => ({ id: page }),
+  initialPageParam: 0,
+  getNextPageParam: (_last, _all, page) => {
+    page satisfies number
+    return page + 1
+  },
+  select: (data) => data.pages.length,
+})
+useInfiniteQuery(infinite).data satisfies number | undefined
+queryClient.getQueryData(infinite.queryKey) satisfies
+  | InfiniteData<number | null, number>
+  | undefined
+
+const live = withQueryPolicy(rpc.watch, 'live', {
+  retry: (_count, error) => error._tag !== 'EffectRpcQueryEmptyStreamError',
+})({ input: { channel: 'one' }, select: (data) => `${data}` })
+useQuery(live).data satisfies string | undefined
+withQueryPolicy(rpc.watchAll, 'streamed', { gcTime: 60_000 })({ maxChunks: 2 })
+
+const mutationPolicy = {
+  onSuccess: (data, variables, result, context) => {
+    data satisfies number | undefined
+    variables satisfies InferInput<typeof rpc.read>
+    result satisfies unknown
+    return context.client.invalidateQueries({ queryKey: rpc.read.key() })
+  },
+  onError: (error, variables) => {
+    error satisfies EffectRpcQueryError<'missing'>
+    variables satisfies InferInput<typeof rpc.read>
+  },
+} satisfies MutationPolicy<typeof rpc.read>
+const mutate = withMutationPolicy(rpc.read, mutationPolicy)
+const mutation = mutate({
+  onMutate: (variables) => ({ previous: variables.id }),
+  onSuccess: (_data, _variables, result) => {
+    result.previous satisfies number
+  },
+  onError: (_error, _variables, result) => {
+    result?.previous satisfies number | undefined
+  },
+})
+useMutation(mutation).mutate(input)
+// @ts-expect-error Mutation variables retain their required fields
+useMutation(mutation).mutate({})
+
+const api = HttpApi.make('helpers').add(
+  HttpApiGroup.make('items').add(
+    HttpApiEndpoint.get('read', '/items/:id', {
+      params: { id: Schema.Int },
+      success: Schema.Void,
+    }),
+    HttpApiEndpoint.post('upload', '/upload', {
+      payload: Schema.Struct({ name: Schema.String }).pipe(HttpApiSchema.asMultipart()),
+      success: Schema.Int,
+    }),
+    HttpApiEndpoint.get('watch', '/watch', {
+      success: HttpApiSchema.StreamSse({ data: Schema.Int }),
+    }),
+  ),
+)
+declare const httpClient: HttpApiClient.ForApi<typeof api>
+const http = createHttpApiQueryUtils(api, { client: httpClient, keyPrefix: ['helpers'] })
+type HttpInput = Assert<
+  Equal<
+    Omit<InferInput<typeof http.items.read>, 'responseMode' | 'sseOptions'>,
+    { readonly params: { readonly id: number } }
+  >
+>
+type HttpReadData = Assert<Equal<InferQueryData<typeof http.items.read>, null>>
+type MetadataData = Assert<
+  Equal<
+    InferQueryData<typeof http.items.read, 'metadata'>,
+    {
+      readonly data: null
+      readonly status: number
+      readonly headers: Readonly<Record<string, string>>
+    }
+  >
+>
+type MultipartInput = Assert<
+  Equal<
+    Omit<InferInput<typeof http.items.upload>, 'responseMode' | 'sseOptions'>,
+    { readonly payload: FormData }
+  >
+>
+type HttpStreamInput = Assert<Equal<InferInput<typeof http.items.watch>, void>>
+withQueryPolicy(http.items.read, 'metadata', {
+  staleTime: (query) => (query.state.data?.status === 200 ? 30_000 : 0),
+  retry: (_count, error) => {
+    error satisfies EffectHttpApiQueryError<unknown>
+    return false
+  },
+})({ input: { params: { id: 1 } } })
+withMutationPolicy(http.items.upload, {
+  onSuccess: (data, variables) => {
+    data satisfies number
+    variables.payload satisfies FormData
+  },
+})()
+// @ts-expect-error Multipart leaves have no query policy
+withQueryPolicy(http.items.upload, 'query', {})
+// @ts-expect-error Stream leaves have no mutation policy
+withMutationPolicy(rpc.watch, {})
+// @ts-expect-error There is no metadata view on an RPC leaf
+withQueryPolicy(rpc.read, 'metadata', {})
+declare const unresolvedLeaf: typeof rpc.read | typeof rpc.watch
+// @ts-expect-error The chosen view must exist on every possible leaf
+withQueryPolicy(unresolvedLeaf, 'query', {})
+// @ts-expect-error A view prefix also requires a view on every possible leaf
+viewPrefix(unresolvedLeaf, 'live')
+// @ts-expect-error A buffered leaf has no live view prefix
+viewPrefix(rpc.read, 'live')
+// @ts-expect-error Branches have no query view prefix
+viewPrefix(rpc, 'query')
+// @ts-expect-error Multipart leaves have no query view prefix
+viewPrefix(http.items.upload, 'query')
+// @ts-expect-error Inputs belong to each builder invocation
+withQueryPolicy(rpc.read, 'query', { input })
+// @ts-expect-error A policy cannot replace the generated key
+withQueryPolicy(rpc.read, 'query', { queryKey: ['owned'] })
+// @ts-expect-error A policy cannot replace the generated function
+withQueryPolicy(rpc.read, 'query', { queryFn: () => Promise.resolve(1) })
+// @ts-expect-error QueryClient owns hashing
+withQueryPolicy(rpc.read, 'query', { queryKeyHashFn: () => 'custom' })
+// @ts-expect-error Projection inference remains local
+withQueryPolicy(rpc.read, 'query', { select: (value: number | null) => `${value}` })
+// @ts-expect-error Initial data inference remains local
+withQueryPolicy(rpc.read, 'query', { initialData: 1 })
+// @ts-expect-error Placeholder data inference remains local
+withQueryPolicy(rpc.read, 'query', { placeholderData: 1 })
+// @ts-expect-error RPC request options remain local
+withQueryPolicy(rpc.read, 'query', { rpcOptions: { headers: { authorization: 'token' } } })
+// @ts-expect-error Stream identity remains local
+withQueryPolicy(rpc.watch, 'streamed', { maxChunks: 10 })
+// @ts-expect-error SSE decoding remains local
+withQueryPolicy(http.items.watch, 'live', { sseOptions: {} })
+// @ts-expect-error Page setup remains local
+withQueryPolicy(rpc.read, 'infinite', { initialPageParam: 0 })
+// @ts-expect-error Shared callbacks cannot assume a call-site optimistic result
+withMutationPolicy(rpc.read, { onSuccess: (_data, _variables, result) => result.previous })
+// @ts-expect-error Optimistic context inference remains local
+withMutationPolicy(rpc.read, { onMutate: () => ({ previous: 1 }) })
+// @ts-expect-error A mutation policy cannot replace the generated key
+withMutationPolicy(rpc.read, { mutationKey: ['owned'] })
+// @ts-expect-error Request-local adapter options are supplied to the bound builder
+withMutationPolicy(rpc.read, { rpcOptions: {} })
+// @ts-expect-error A typed callback cannot change the leaf's mutation output
+withMutationPolicy(rpc.read, { onSuccess: (_data: string) => {} })
+// @ts-expect-error A typed callback cannot change the leaf's query error
+withQueryPolicy(rpc.read, 'query', { retry: (_count, _error: { different: true }) => false })
+const injected = { retry: false, queryHash: 'custom' }
+// @ts-expect-error Exclusions also apply to stored policy objects
+withQueryPolicy(rpc.read, 'query', injected)
diff --git a/tests/types/http-contract.ts b/tests/types/http-contract.ts
index 70c120b..c1e67a4 100644
--- a/tests/types/http-contract.ts
+++ b/tests/types/http-contract.ts
@@ -122,7 +122,6 @@ const configuration: CreateHttpApiQueryUtilsOptions<typeof api, typeof prefix> =
 const utils = createHttpApiQueryUtils(api, configuration)
 const annotated: HttpApiQueryUtils<typeof api, typeof prefix> = utils
 
-// Generated leaves keep the structural index assignability of the public type alias.
 true satisfies Assert<
   (typeof utils)['user.accounts']['get.user'] extends Record<string, unknown> ? true : false
 >
@@ -169,6 +168,8 @@ true satisfies Assert<
     | 'mutationOptions'
     | 'infiniteKey'
     | 'infiniteOptions'
+    | 'metadataKey'
+    | 'metadataOptions'
   >
 >
 true satisfies Assert<Equal<Parameters<typeof utils.ping.queryKey>, []>>
@@ -467,6 +468,12 @@ const emptyApi = HttpApi.make('empty').add(HttpApiGroup.make('streams').add(Stre
 declare const emptyClient: HttpApiClient.ForApi<typeof emptyApi>
 const emptyUtils = createHttpApiQueryUtils(emptyApi, { client: emptyClient, keyPrefix: ['app'] })
 true satisfies Assert<Equal<keyof typeof emptyUtils, 'key'>>
+createHttpApiQueryUtils(emptyApi, {
+  client: emptyClient,
+  keyPrefix: ['app'],
+  // @ts-expect-error An API without query-input endpoints rejects even an empty encoder map.
+  keyEncoders: {},
+})
 
 const Alternatives = HttpApiEndpoint.post('alternatives', '/alternatives', {
   payload: [Schema.Struct({ name: Schema.String }), Schema.Struct({ id: Schema.Finite })],
@@ -970,6 +977,9 @@ declare const overloadedServiceMethod: typeof serviceClient.work.serviceful &
   RawResponseMethod &
   SpecificRawResponseMethod
 const overloadedServiceClient = { work: { serviceful: overloadedServiceMethod } }
+declare const metadataRunner: RunPromiseExit<
+  EncodeRequest | DecodeSuccess | DecodeError | ExtraClientService | RawResponseService
+>
 // @ts-expect-error A trailing raw-response overload cannot hide decoded execution services.
 createHttpApiQueryUtils(serviceApi, {
   client: overloadedServiceClient,
@@ -980,14 +990,14 @@ const overloadedServiceUtils = createHttpApiQueryUtils(serviceApi, {
   client: overloadedServiceClient,
   keyPrefix: ['app'],
   keyEncoders: { work: { serviceful: encoder } },
-  runPromiseExit: runner,
+  runPromiseExit: metadataRunner,
 })
 type OverloadedRequirements = CreateHttpApiQueryUtilsOptions<
   typeof serviceApi,
   readonly ['app'],
   typeof overloadedServiceClient
 >['runPromiseExit']
-true satisfies Assert<Equal<OverloadedRequirements, typeof runner>>
+true satisfies Assert<Equal<OverloadedRequirements, typeof metadataRunner>>
 const overloadedServiceState = queryClient.getQueryState(
   overloadedServiceUtils.work.serviceful.queryKey({ payload: { id: 1, name: 'Ada' } }),
 )
@@ -1050,13 +1060,126 @@ true satisfies Assert<
   Equal<typeof overloadedCustomMutation.error, EffectHttpApiQueryError<'custom-save-error'> | null>
 >
 
-// HTTP option builders retain native inference for complete requests and buffered results.
 type GetFailure = EffectHttpApiQueryError<
   'not-found' | HttpClientError.HttpClientError | Schema.SchemaError
 >
 const getUser = utils['user.accounts']['get.user']
+const metadata = getUser.metadataOptions({
+  input,
+  select: (view) => view.data.name,
+  retry: (_count, error) => {
+    error satisfies GetFailure
+    return false
+  },
+  staleTime: (query) => {
+    query.state.data?.data satisfies typeof User.Type | undefined
+    query.queryKey satisfies ReturnType<typeof getUser.metadataKey>
+    return 1_000
+  },
+})
+useQuery(metadata).data satisfies string | undefined
+useSuspenseQuery(metadata).data satisfies string
+usePrefetchQuery(metadata)
+type UserMetadata = {
+  readonly data: typeof User.Type
+  readonly status: number
+  readonly headers: Readonly<Record<string, string>>
+}
+true satisfies Assert<Equal<ReturnType<typeof getUser.metadataKey>[5], 'metadata'>>
+const metadataCache = queryClient.getQueryData(getUser.metadataKey(input))
+true satisfies Assert<Equal<typeof metadataCache, UserMetadata | undefined>>
+const initialMetadata = { data: { id: 1, name: 'Ada' }, status: 200, headers: { etag: 'v1' } }
+const definedMetadata = useQuery(
+  getUser.metadataOptions({
+    input,
+    initialData: initialMetadata,
+    select: (view) => view.data.name,
+  }),
+)
+true satisfies Assert<Equal<typeof definedMetadata.data, string>>
+declare const optionalMetadata: UserMetadata | undefined
+const optionalMetadataHook = useQuery(
+  getUser.metadataOptions({
+    input,
+    initialData: optionalMetadata,
+    select: (view) => view.data.name,
+  }),
+)
+true satisfies Assert<Equal<typeof optionalMetadataHook.data, string | undefined>>
+const skippedMetadata = getUser.metadataOptions({ input: skipToken, initialData: initialMetadata })
+skippedMetadata.queryFn satisfies SkipToken
+skippedMetadata.queryKey satisfies readonly [
+  'app',
+  'http',
+  'account.api',
+  'user.accounts',
+  'get.user',
+  'metadata',
+]
+const skippedMetadataHook = useQuery(skippedMetadata)
+true satisfies Assert<Equal<typeof skippedMetadataHook.data, UserMetadata | undefined>>
+getUser.metadataOptions({ input: skipToken }).queryFn satisfies SkipToken
+const conditionalMetadata = getUser.metadataOptions({
+  input: hasUser ? input : skipToken,
+  select: (view) => view.status,
+})
+useQuery(conditionalMetadata).data satisfies number | undefined
+const emptyMetadata = queryClient.getQueryData(utils.ping.metadataKey())
+true satisfies Assert<Equal<NonNullable<typeof emptyMetadata>['data'], null>>
+const wrappedMetadata = queryClient.getQueryData(
+  utils['user.accounts'].wrappedBuffered.metadataKey(),
+)
+true satisfies Assert<
+  Equal<
+    NonNullable<typeof wrappedMetadata>['data'],
+    HttpApiSchema.withHeaders<typeof User.Type, { readonly version: string }>
+  >
+>
+// @ts-expect-error Metadata snapshots have readonly status.
+metadataCache!.status = 201
+// @ts-expect-error Metadata headers form a readonly string snapshot.
+metadataCache!.headers['etag'] = 'other'
+// @ts-expect-error Metadata is available only for query-enabled buffered requests.
+utils.upload.metadataOptions()
+// @ts-expect-error Metadata adds no infinite-query builder.
+getUser.metadataInfiniteOptions()
+// @ts-expect-error Metadata adds no mutation builder.
+getUser.metadataMutationOptions()
+// @ts-expect-error Metadata views retain complete decoded request containers.
+getUser.metadataOptions({ input: { params: { id: 1 } } })
+// @ts-expect-error Response controls belong to the metadata view.
+getUser.metadataKey({ ...input, responseMode: 'response-only' })
+// @ts-expect-error Inputless metadata builders cannot be skipped.
+utils.ping.metadataOptions(skipToken)
+// @ts-expect-error Metadata hash defaults belong to QueryClient.
+getUser.metadataOptions({ input: skipToken, queryHash: 'other' })
+// @ts-expect-error Metadata hash functions belong to QueryClient.
+getUser.metadataOptions({ input, queryKeyHashFn: JSON.stringify })
+// @ts-expect-error Skipped metadata cannot guarantee suspense execution.
+useSuspenseQuery(skippedMetadata)
+true satisfies Assert<Equal<Extract<'queryHash' | 'queryKeyHashFn', keyof typeof metadata>, never>>
+const metadataServiceState = queryClient.getQueryState(
+  overloadedServiceUtils.work.serviceful.metadataKey({ payload: { id: 1, name: 'Ada' } }),
+)
+true satisfies Assert<
+  Equal<
+    NonNullable<typeof metadataServiceState>['error'],
+    EffectHttpApiQueryError<
+      | 'service-error'
+      | 'extra-client-error'
+      | 'tuple-error'
+      | HttpClientError.HttpClientError
+      | Schema.SchemaError
+    > | null
+  >
+>
 const nativeQuery = getUser.queryOptions({
   input,
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies GetFailure
+    return 0
+  },
   select: (user) => user.name,
   retry: (_count, error) => {
     error satisfies GetFailure
@@ -1087,7 +1210,7 @@ queryClient.refetchQueries({ queryKey: getUser.key() })
 nativeQuery.input
 // @ts-expect-error Query keys belong to the package.
 getUser.queryOptions({ input, queryKey: ['other'] })
-// @ts-expect-error Query hashing belongs to the package.
+// @ts-expect-error QueryClient defaults own hashing.
 getUser.queryOptions({ input, queryKeyHashFn: () => 'other' })
 const optionalInitial = (): typeof User.Type | undefined => undefined
 const maybeInitial = useQuery(
@@ -1103,7 +1226,11 @@ const definedInitial = useQuery(
 )
 true satisfies Assert<Equal<typeof definedInitial.data, string>>
 
-const skippedDirect = getUser.queryOptions(skipToken)
+// @ts-expect-error Query builders accept options objects.
+getUser.queryOptions(skipToken)
+// @ts-expect-error Metadata builders accept options objects.
+getUser.metadataOptions(skipToken)
+const skippedDirect = getUser.queryOptions({ input: skipToken })
 skippedDirect.queryFn satisfies SkipToken
 const skippedObject = getUser.queryOptions({
   input: skipToken,
@@ -1192,6 +1319,11 @@ const userPages = getUser.infiniteOptions({
   },
   getPreviousPageParam: (_first, _pages, firstParam) =>
     firstParam > 0 ? firstParam - 1 : undefined,
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies GetFailure
+    return 0
+  },
   retry: (_count, error) => {
     error satisfies GetFailure
     return false
@@ -1336,6 +1468,11 @@ const inputlessPages = utils.ping.infiniteOptions({
 useInfiniteQuery(inputlessPages).data satisfies InfiniteData<null, number> | undefined
 
 const callbackMutation = getUser.mutationOptions({
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies GetFailure
+    return 0
+  },
   onMutate: (request) => ({ previousId: request.params.id }),
   onSuccess: (user, request, result) => {
     user satisfies typeof User.Type
@@ -1477,3 +1614,24 @@ getUser.infiniteOptions({
   // @ts-expect-error A caller hash cannot merge ordinary and infinite caches.
   queryHash: 'shared',
 })
+
+true satisfies Assert<
+  Equal<
+    Extract<
+      'queryKeyHashFn' | 'queryHash',
+      | keyof typeof userPages
+      | keyof typeof skippedPages
+      | keyof typeof conditionalPages
+      | keyof ReturnType<typeof getUser.queryOptions>
+    >,
+    never
+  >
+>
+
+getUser.infiniteOptions({
+  initialPageParam: 0,
+  input: () => input,
+  getNextPageParam: () => undefined,
+  // @ts-expect-error QueryClient defaults own hashing.
+  queryKeyHashFn: JSON.stringify,
+})
diff --git a/tests/types/http-stream-contract.ts b/tests/types/http-stream-contract.ts
new file mode 100644
index 0000000..133253b
--- /dev/null
+++ b/tests/types/http-stream-contract.ts
@@ -0,0 +1,348 @@
+import { QueryClient, QueryObserver, skipToken } from '@tanstack/query-core'
+import { useQuery, useSuspenseQuery } from '@tanstack/react-query'
+import { Context, Effect, Schema, SchemaTransformation } from 'effect'
+import type { Stream } from 'effect'
+import { createHttpApiQueryUtils, EffectHttpApiQueryEmptyStreamError } from 'effect-api-query'
+import type {
+  CreateHttpApiQueryUtilsOptions,
+  EffectHttpApiQueryConfigError,
+  EffectHttpApiQueryError,
+  RunPromiseExit,
+} from 'effect-api-query'
+import type { Sse } from 'effect/encoding'
+import type { HttpClientError } from 'effect/http'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+
+type Equal<A, B> =
+  (<T>() => T extends A ? 1 : 2) extends <T>() => T extends B ? 1 : 2 ? true : false
+type Assert<T extends true> = T
+
+class Scale extends Context.Service<Scale, { readonly factor: number }>()('HttpStream/Scale') {}
+const Scaled = Schema.Finite.pipe(
+  Schema.decodeTo(
+    Schema.Finite,
+    SchemaTransformation.transformEffect({
+      decode: (value) => Scale.pipe(Effect.map(({ factor }) => value * factor)),
+      encode: Effect.succeed,
+    }),
+  ),
+)
+const Expired = Schema.TaggedStruct('Expired', { reason: Schema.String })
+const Plain = HttpApiEndpoint.get('plain', '/plain/:id', {
+  params: { id: Schema.FiniteFromString },
+  success: HttpApiSchema.StreamSse({ data: Scaled, error: Expired }),
+})
+const Wrapped = HttpApiEndpoint.get('wrapped', '/wrapped', {
+  success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamSse({ data: Schema.Finite }), {
+    'x-version': Schema.FiniteFromString,
+  }),
+})
+const Mixed = HttpApiEndpoint.get('mixed', '/mixed', {
+  success: [
+    HttpApiSchema.StreamSse({ data: Schema.Finite }),
+    Schema.String.pipe(HttpApiSchema.status(201)),
+  ],
+})
+const Bytes = HttpApiEndpoint.get('bytes', '/bytes', { success: HttpApiSchema.StreamUint8Array() })
+const WrappedBytes = HttpApiEndpoint.get('wrappedBytes', '/wrapped-bytes', {
+  success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamUint8Array(), { etag: Schema.String }),
+})
+const Multipart = HttpApiEndpoint.post('multipart', '/multipart', {
+  payload: Schema.Struct({ name: Schema.String }).pipe(HttpApiSchema.asMultipart()),
+  success: HttpApiSchema.StreamSse({ data: Schema.Finite }),
+})
+const Events = HttpApiEndpoint.get('events', '/events', {
+  success: HttpApiSchema.StreamSse({
+    events: Schema.Struct({
+      id: Schema.String,
+      event: Schema.Literal('changed'),
+      data: Schema.String,
+    }),
+  }),
+})
+const api = HttpApi.make('stream-contract').add(
+  HttpApiGroup.make('views').add(Plain, Wrapped, Mixed, Bytes, WrappedBytes, Multipart),
+  HttpApiGroup.make('system', { topLevel: true }).add(Events),
+  HttpApiGroup.make('omitted').add(Bytes),
+)
+declare const client: HttpApiClient.ForApi<typeof api, 'client-error', 'client-service'>
+declare const runPromiseExit: RunPromiseExit<Scale | 'client-service'>
+const utils = createHttpApiQueryUtils(api, { client, keyPrefix: ['consumer'], runPromiseExit })
+true satisfies Assert<Equal<keyof typeof utils, 'key' | 'views' | 'events'>>
+true satisfies Assert<Equal<keyof typeof utils.views, 'key' | 'plain' | 'wrapped'>>
+true satisfies Assert<
+  Equal<
+    keyof typeof utils.views.plain,
+    'key' | 'streamedKey' | 'streamedOptions' | 'liveKey' | 'liveOptions'
+  >
+>
+const queryClient = new QueryClient()
+const input = { params: { id: 1 } }
+const options = utils.views.plain.streamedOptions({
+  input,
+  maxChunks: 3,
+  refetchMode: 'append',
+  sseOptions: { maxEventSize: 1024 },
+  select: (values) => values.length,
+  staleTime: Infinity,
+})
+const data = queryClient.getQueryData(options.queryKey)
+true satisfies Assert<Equal<typeof data, readonly number[] | undefined>>
+const state = queryClient.getQueryState(options.queryKey)
+type Error =
+  | EffectHttpApiQueryConfigError
+  | EffectHttpApiQueryError<
+      | 'client-error'
+      | typeof Expired.Type
+      | HttpClientError.HttpClientError
+      | Schema.SchemaError
+      | Sse.Retry
+      | Sse.SseError
+    >
+true satisfies Assert<Equal<NonNullable<typeof state>['error'], Error | null>>
+const observer = new QueryObserver(queryClient, options)
+true satisfies Assert<
+  Equal<ReturnType<typeof observer.getCurrentResult>['data'], number | undefined>
+>
+const key = utils.views.plain.streamedKey(input, {
+  maxChunks: 3,
+  sseOptions: { maxEventSize: 1024 },
+})
+queryClient.setQueryData(key, [1, 2])
+const skipped = utils.views.plain.streamedOptions({
+  input: skipToken,
+  sseOptions: { maxEventSize: 1024 },
+  maxChunks: 2,
+})
+skipped.queryFn satisfies typeof skipToken
+const conditional = utils.views.plain.streamedOptions({
+  input: Math.random() > 0.5 ? input : skipToken,
+})
+new QueryObserver(queryClient, conditional)
+const initial = utils.views.plain.streamedOptions({
+  input,
+  initialData: [1],
+  select: (values) => values.length,
+})
+const wrapped = queryClient.getQueryData(
+  utils.views.wrapped.streamedKey({ refetchMode: 'replace' }),
+)
+true satisfies Assert<
+  Equal<
+    typeof wrapped,
+    readonly HttpApiSchema.withHeaders<number, { readonly 'x-version': number }>[] | undefined
+  >
+>
+const events = queryClient.getQueryData(utils.events.streamedKey())
+true satisfies Assert<
+  Equal<
+    typeof events,
+    readonly { readonly id: string; readonly event: 'changed'; readonly data: string }[] | undefined
+  >
+>
+const captured = { params: { id: 1 }, sseOptions: { maxEventSize: 1024 } }
+// @ts-expect-error Decoder controls remain separate from request input.
+utils.views.plain.streamedKey(captured)
+// @ts-expect-error The adapter owns response mode.
+utils.views.plain.streamedOptions({ input: { ...input, responseMode: 'response-only' } })
+// @ts-expect-error SSE endpoints expose accumulated query builders.
+utils.views.plain.queryOptions({ input })
+// @ts-expect-error SSE endpoints expose accumulated query builders.
+utils.views.plain.mutationOptions()
+// @ts-expect-error Inputless endpoints do not accept skipToken.
+utils.views.wrapped.streamedOptions({ input: skipToken })
+// @ts-expect-error Caller hashes belong in QueryClient defaults.
+utils.views.plain.streamedOptions({ input, queryHash: 'shared' })
+// @ts-expect-error The acquisition decoding services require a runner.
+createHttpApiQueryUtils(api, { client, keyPrefix: ['missing'] })
+const custom = createHttpApiQueryUtils(api, {
+  client,
+  keyPrefix: ['custom'],
+  runPromiseExit,
+  keyEncoders: { views: { plain: (request) => request.params.id } },
+})
+custom.views.plain.streamedKey(input)
+initial.queryKey satisfies typeof key
+
+declare const extraStream: Stream.Stream<number, 'stream-error', 'stream-service'>
+declare const extraClient: HttpApiClient.ForApi<typeof api> & {
+  readonly views: {
+    readonly plain: (request: {
+      readonly params: { readonly id: number }
+      readonly responseMode: 'decoded-only'
+    }) => Effect.Effect<typeof extraStream, 'extra-error', Scale | 'stream-service'>
+  }
+}
+declare const extraRunner: RunPromiseExit<Scale | 'stream-service'>
+const extra = createHttpApiQueryUtils(api, {
+  client: extraClient,
+  keyPrefix: ['extra'],
+  runPromiseExit: extraRunner,
+})
+queryClient.getQueryData(extra.views.plain.streamedKey(input)) satisfies
+  | readonly number[]
+  | undefined
+
+const extraState = queryClient.getQueryState(extra.views.plain.streamedKey(input))
+type ExtraFailure =
+  Exclude<
+    NonNullable<typeof extraState>['error'],
+    EffectHttpApiQueryConfigError | null
+  > extends EffectHttpApiQueryError<infer E>
+    ? E
+    : never
+true satisfies Assert<
+  Equal<Extract<ExtraFailure, 'extra-error' | 'stream-error'>, 'extra-error' | 'stream-error'>
+>
+type ExtraRequirements = CreateHttpApiQueryUtilsOptions<
+  typeof api,
+  readonly ['extra'],
+  typeof extraClient
+>['runPromiseExit']
+true satisfies Assert<Equal<ExtraRequirements, typeof extraRunner>>
+true satisfies Assert<RunPromiseExit extends ExtraRequirements ? false : true>
+
+const liveOptions = utils.views.plain.liveOptions({
+  input,
+  sseOptions: { maxEventSize: 1024 },
+  select: (value) => value.toFixed(2),
+  staleTime: Infinity,
+})
+const liveKey = utils.views.plain.liveKey(input, { sseOptions: { maxEventSize: 1024 } })
+const liveData = queryClient.getQueryData(liveKey)
+true satisfies Assert<Equal<typeof liveData, number | undefined>>
+const liveState = queryClient.getQueryState(liveOptions.queryKey)
+true satisfies Assert<
+  Equal<NonNullable<typeof liveState>['error'], Error | EffectHttpApiQueryEmptyStreamError | null>
+>
+const liveObserver = new QueryObserver(queryClient, liveOptions)
+true satisfies Assert<
+  Equal<ReturnType<typeof liveObserver.getCurrentResult>['data'], string | undefined>
+>
+const liveSkipped = utils.views.plain.liveOptions({
+  input: skipToken,
+  sseOptions: { maxEventSize: 1024 },
+  initialData: 1,
+})
+liveSkipped.queryFn satisfies typeof skipToken
+utils.views.plain.liveOptions({ input: skipToken }).queryFn satisfies typeof skipToken
+const liveConditional = utils.views.plain.liveOptions({
+  input: Math.random() > 0.5 ? input : skipToken,
+  initialData: () => 1,
+  select: (value) => value.toString(),
+})
+const liveDefined = useQuery(
+  utils.views.plain.liveOptions({ input, initialData: 1, select: (value) => value.toString() }),
+)
+true satisfies Assert<Equal<typeof liveDefined.data, string>>
+const optionalNumber: number | undefined = Math.random() > 0.5 ? 1 : undefined
+const liveOptional = useQuery(
+  utils.views.plain.liveOptions({
+    input,
+    initialData: optionalNumber,
+    select: (value) => value.toString(),
+  }),
+)
+true satisfies Assert<Equal<typeof liveOptional.data, string | undefined>>
+const liveSkippedResult = useQuery(liveSkipped)
+true satisfies Assert<Equal<typeof liveSkippedResult.data, number | undefined>>
+useQuery(liveConditional)
+// @ts-expect-error Skipped live queries cannot guarantee suspense execution.
+useSuspenseQuery(liveSkipped)
+const liveWrapped = queryClient.getQueryData(utils.views.wrapped.liveKey())
+true satisfies Assert<
+  Equal<
+    typeof liveWrapped,
+    HttpApiSchema.withHeaders<number, { readonly 'x-version': number }> | undefined
+  >
+>
+const liveEvents = queryClient.getQueryData(utils.events.liveKey())
+true satisfies Assert<
+  Equal<
+    typeof liveEvents,
+    { readonly id: string; readonly event: 'changed'; readonly data: string } | undefined
+  >
+>
+const extraLiveState = queryClient.getQueryState(extra.views.plain.liveKey(input))
+type ExtraLiveFailure =
+  Exclude<
+    NonNullable<typeof extraLiveState>['error'],
+    EffectHttpApiQueryConfigError | EffectHttpApiQueryEmptyStreamError | null
+  > extends EffectHttpApiQueryError<infer E>
+    ? E
+    : never
+true satisfies Assert<
+  Equal<Extract<ExtraLiveFailure, 'extra-error' | 'stream-error'>, 'extra-error' | 'stream-error'>
+>
+// @ts-expect-error Decoder controls remain separate from captured requests.
+utils.views.plain.liveKey(captured)
+// @ts-expect-error The adapter owns response mode.
+utils.views.plain.liveOptions({ input: { ...input, responseMode: 'response-only' } })
+// @ts-expect-error Live queries retain one value and expose no history bound.
+utils.views.plain.liveOptions({ input, maxChunks: 2 })
+// @ts-expect-error Live queries expose no accumulated refetch mode.
+utils.views.plain.liveKey(input, { refetchMode: 'append' })
+// @ts-expect-error Caller hashes belong in QueryClient defaults.
+utils.views.plain.liveOptions({ input, queryKeyHashFn: JSON.stringify })
+// @ts-expect-error Inputless live endpoints reject skipToken.
+utils.events.liveOptions({ input: skipToken })
+custom.views.plain.liveKey(input)
+
+const UndefinedValue = Schema.Null.pipe(
+  Schema.decodeTo(
+    Schema.Void,
+    SchemaTransformation.transform({
+      decode: (): void => undefined,
+      encode: (_value: void) => null,
+    }),
+  ),
+)
+const normalizationApi = HttpApi.make('live-normalization').add(
+  HttpApiGroup.make('values').add(
+    HttpApiEndpoint.get('plain', '/plain', {
+      success: HttpApiSchema.StreamSse({ data: UndefinedValue }),
+    }),
+    HttpApiEndpoint.get('wrapped', '/wrapped', {
+      success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamSse({ data: UndefinedValue }), {
+        etag: Schema.String,
+      }),
+    }),
+    HttpApiEndpoint.get('union', '/union', {
+      success: HttpApiSchema.StreamSse({ data: Schema.Union([Schema.Finite, UndefinedValue]) }),
+    }),
+  ),
+)
+declare const normalizationClient: HttpApiClient.ForApi<typeof normalizationApi>
+const normalized = createHttpApiQueryUtils(normalizationApi, {
+  client: normalizationClient,
+  keyPrefix: ['normalized'],
+})
+const undefinedData = queryClient.getQueryData(normalized.values.plain.liveKey())
+true satisfies Assert<Equal<typeof undefinedData, null | undefined>>
+const unionData = queryClient.getQueryData(normalized.values.union.liveKey())
+true satisfies Assert<Equal<typeof unionData, number | null | undefined>>
+const wrappedUndefinedData = queryClient.getQueryData(normalized.values.wrapped.liveKey())
+true satisfies Assert<
+  Equal<
+    typeof wrappedUndefinedData,
+    HttpApiSchema.withHeaders<void, { readonly etag: string }> | undefined
+  >
+>
+const undefinedLive = useQuery(
+  normalized.values.plain.liveOptions({
+    initialData: null,
+    select: (value) => {
+      value satisfies null
+      return 'ready' as const
+    },
+  }),
+)
+true satisfies Assert<Equal<typeof undefinedLive.data, 'ready'>>
+const emptyError: EffectHttpApiQueryEmptyStreamError = new EffectHttpApiQueryEmptyStreamError({
+  apiId: 'api',
+  groupId: 'group',
+  endpoint: 'empty',
+  method: 'GET',
+})
+emptyError.operation satisfies 'live'
diff --git a/tests/types/http-type-scale.ts b/tests/types/http-type-scale.ts
index 0eb4b78..a64d60b 100644
--- a/tests/types/http-type-scale.ts
+++ b/tests/types/http-type-scale.ts
@@ -8,8 +8,6 @@ import {
 import type { HttpClientError } from 'effect/http'
 import { HttpApi, HttpApiClient, HttpApiEndpoint, HttpApiGroup } from 'effect/http-api'
 
-// Five groups retain 250 literal endpoint identifiers. The packed verifier records
-// extended diagnostics for this fixture without timing or memory thresholds.
 const indexes = [
   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
   27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
diff --git a/tests/types/http-view-proof.ts b/tests/types/http-view-proof.ts
new file mode 100644
index 0000000..555e854
--- /dev/null
+++ b/tests/types/http-view-proof.ts
@@ -0,0 +1,110 @@
+import { Context, Effect, Schema, SchemaTransformation } from 'effect'
+import type { Stream } from 'effect'
+import type { Sse } from 'effect/encoding'
+import type { HttpClientError } from 'effect/http'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+
+type Equal<Left, Right> =
+  (<Value>() => Value extends Left ? 1 : 2) extends <Value>() => Value extends Right ? 1 : 2
+    ? true
+    : false
+type Assert<Value extends true> = Value
+
+class Scale extends Context.Service<Scale, { readonly factor: number }>()('HttpViewProof/Scale') {}
+const Value = Schema.Finite.pipe(
+  Schema.decodeTo(
+    Schema.Finite,
+    SchemaTransformation.transformEffect({
+      decode: (value) => Scale.pipe(Effect.map(({ factor }) => value * factor)),
+      encode: Effect.succeed,
+    }),
+  ),
+)
+const Expired = Schema.TaggedStruct('Expired', { reason: Schema.String })
+const Plain = HttpApiEndpoint.get('plain', '/plain', {
+  params: { id: Schema.FiniteFromString },
+  success: HttpApiSchema.StreamSse({ data: Value, error: Expired }),
+})
+const Wrapped = HttpApiEndpoint.get('wrapped', '/wrapped', {
+  success: HttpApiSchema.WithHeaders(HttpApiSchema.StreamSse({ data: Value }), {
+    'x-version': Schema.FiniteFromString,
+  }),
+})
+const Buffered = HttpApiEndpoint.get('buffered', '/buffered', {
+  success: HttpApiSchema.WithHeaders(Schema.FiniteFromString, {
+    'x-version': Schema.FiniteFromString,
+  }),
+})
+const Api = HttpApi.make('proof').add(HttpApiGroup.make('views').add(Plain, Wrapped, Buffered))
+declare const client: HttpApiClient.ForApi<typeof Api, 'client-error', 'client-service'>
+
+const plain = client.views.plain({ params: { id: 1 }, responseMode: 'decoded-only' })
+type PlainStream = Effect.Success<typeof plain>
+true satisfies Assert<Equal<Stream.Success<PlainStream>, number>>
+true satisfies Assert<Equal<Stream.Services<PlainStream>, never>>
+true satisfies Assert<
+  Equal<
+    Stream.Error<PlainStream>,
+    | typeof Expired.Type
+    | HttpClientError.HttpClientError
+    | Schema.SchemaError
+    | Sse.Retry
+    | Sse.SseError
+  >
+>
+true satisfies Assert<Equal<Effect.Services<typeof plain>, Scale | 'client-service'>>
+true satisfies Assert<
+  Equal<
+    Effect.Error<typeof plain>,
+    'client-error' | HttpClientError.HttpClientError | Schema.SchemaError
+  >
+>
+
+const wrapped = client.views.wrapped({ responseMode: 'decoded-only' })
+type WrappedSuccess = Effect.Success<typeof wrapped>
+true satisfies Assert<Equal<Stream.Success<WrappedSuccess['body']>, number>>
+true satisfies Assert<Equal<WrappedSuccess['headers'], { readonly 'x-version': number }>>
+true satisfies Assert<Equal<Effect.Services<typeof wrapped>, Scale | 'client-service'>>
+
+type Chunk<Value> =
+  Value extends HttpApiSchema.withHeaders<infer Body, infer Headers>
+    ? HttpApiSchema.withHeaders<Chunk<Body>, Headers>
+    : Value extends Stream.Stream<infer Data, infer _Error, infer _Services>
+      ? Data
+      : never
+true satisfies Assert<
+  Equal<Chunk<WrappedSuccess>, HttpApiSchema.withHeaders<number, { readonly 'x-version': number }>>
+>
+
+type Request<Endpoint extends HttpApiEndpoint.ConstraintRequest> = Omit<
+  Exclude<
+    HttpApiEndpoint.ClientRequest<
+      Endpoint['~Params'],
+      Endpoint['~Query'],
+      Endpoint['~Payload'],
+      Endpoint['~Headers'],
+      'decoded-only'
+    >,
+    void
+  >,
+  'responseMode' | 'sseOptions'
+> & { readonly responseMode?: never; readonly sseOptions?: never }
+declare const encodeKey: (request: Request<typeof Plain>) => string
+encodeKey({ params: { id: 1 } })
+// @ts-expect-error SSE controls are separate from decoded request identity input.
+encodeKey({ params: { id: 1 }, sseOptions: { maxEventSize: 1024 } })
+// @ts-expect-error An adapter owns the response mode for each concrete view.
+encodeKey({ params: { id: 1 }, responseMode: 'response-only' })
+const requestWithControls = { params: { id: 1 }, sseOptions: { maxEventSize: 1024 } }
+// @ts-expect-error Captured request values cannot carry decoder controls either.
+encodeKey(requestWithControls)
+
+const buffered = client.views.buffered({ responseMode: 'decoded-and-response' })
+true satisfies Assert<
+  Equal<
+    Effect.Success<typeof buffered>[0],
+    HttpApiSchema.withHeaders<number, { readonly 'x-version': number }>
+  >
+>
+true satisfies Assert<Equal<Effect.Services<typeof buffered>, 'client-service'>>
diff --git a/tests/types/public-contract.ts b/tests/types/public-contract.ts
index e3835d1..588c62b 100644
--- a/tests/types/public-contract.ts
+++ b/tests/types/public-contract.ts
@@ -1,5 +1,4 @@
 // fallow-ignore-file code-duplication
-// This fixture stays self-contained so built-declaration checks exercise the full public contract.
 import {
   type InfiniteData,
   MutationObserver,
@@ -26,6 +25,7 @@ import {
   EffectRpcQueryError,
   skipToken,
   type CreateRpcQueryUtilsOptions,
+  type EffectRpcQueryConfigError,
   type EffectRpcQueryConfigErrorCode,
   type EffectRpcQueryKeyErrorCode,
   type JsonValue,
@@ -238,6 +238,8 @@ type ExactStreamLeafInterface = Assert<
 const exactStreamLeafInterface: ExactStreamLeafInterface = true
 const projectKey = utils.projects['by-id'].find.queryKey({ id: 'project-1' })
 const projectPing = utils.projects.health.ping.queryOptions()
+const omittedInputlessArguments: Parameters<typeof utils.health.ping.queryOptions> = []
+void omittedInputlessArguments
 const bracketOnly = utils['billing-history']['list all'].queryOptions({
   input: { accountId: 'account-1' },
 })
@@ -302,6 +304,10 @@ createRpcQueryUtils(group, {
   keyPrefix,
 })
 
+type WatchStreamError =
+  | EffectRpcQueryConfigError
+  | EffectRpcQueryError<'unauthorized' | 'watch-failure' | 'watch-rpc-failure'>
+
 const queryClient = new QueryClient()
 
 const streamedOptions = utils.events.watch.streamedOptions({
@@ -310,36 +316,64 @@ const streamedOptions = utils.events.watch.streamedOptions({
   meta: { source: 'fixture' },
   networkMode: 'offlineFirst',
   refetchMode: 'append',
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies WatchStreamError
+    return 0
+  },
   retry: (_count, error) => {
-    error satisfies EffectRpcQueryError<'unauthorized' | 'watch-failure' | 'watch-rpc-failure'>
+    error satisfies WatchStreamError
     return false
   },
   select: (values) => values.join(', '),
 })
 const streamedHook = useQuery(streamedOptions)
 const streamedHookData: string | undefined = streamedHook.data
-streamedHook.error satisfies EffectRpcQueryError<
-  'unauthorized' | 'watch-failure' | 'watch-rpc-failure'
-> | null
+streamedHook.error satisfies WatchStreamError | null
 const streamedResult: Promise<string> = queryClient.query(streamedOptions)
 const streamedKey = utils.events.watch.streamedKey({ channel: 'news' })
-streamedKey satisfies readonly ['app', 'rpc', 'events', 'watch', 'streamed', JsonValue]
+streamedKey satisfies readonly ['app', 'rpc', 'events', 'watch', 'streamed', ...JsonValue[]]
 const cachedStream = queryClient.getQueryData(utils.events.watch.streamedKey({ channel: 'news' }))
 cachedStream satisfies ReadonlyArray<string> | undefined
+const boundedStreamKey = utils.events.watch.streamedKey(
+  { channel: 'news' },
+  { maxChunks: 2, refetchMode: 'append' },
+)
+const boundedStreamData = queryClient.getQueryData(boundedStreamKey)
+boundedStreamData satisfies ReadonlyArray<string> | undefined
+queryClient.setQueryData(boundedStreamKey, ['latest'])
+queryClient.getQueryState(boundedStreamKey)?.error satisfies WatchStreamError | null | undefined
+utils.events.watch.streamedKey({ channel: 'news' }, { maxChunks: undefined, refetchMode: 'reset' })
+utils.events.audit.watch.streamedKey()
+utils.events.audit.watch.streamedKey({ maxChunks: 2, refetchMode: 'replace' })
+utils.events.audit.watch.streamedKey({ maxChunks: undefined, refetchMode: undefined })
+queryClient.getQueryData(utils.events.audit.watch.streamedKey({ maxChunks: 2 })) satisfies
+  | ReadonlyArray<string>
+  | undefined
+// @ts-expect-error refetch policy is one of the declared modes
+utils.events.watch.streamedKey({ channel: 'news' }, { refetchMode: 'unknown' })
+// @ts-expect-error accumulation bounds are numeric
+utils.events.audit.watch.streamedKey({ maxChunks: '2' })
+// @ts-expect-error a payload-bearing key still requires constructor input
+utils.events.watch.streamedKey({ maxChunks: 2 })
+// @ts-expect-error live keys have no accumulation policy
+utils.events.watch.liveKey({ channel: 'news' }, { maxChunks: 2 })
 queryClient.invalidateQueries({ queryKey: streamedKey })
 queryClient.refetchQueries({ queryKey: streamedKey })
 void [streamedHookData, streamedResult]
 
 const liveOptions = utils.events.watch.liveOptions({
   input: { channel: 'news' },
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies EffectRpcQueryEmptyStreamError | WatchStreamError
+    return 0
+  },
   select: (value) => value.length,
 })
 const liveHook = useQuery(liveOptions)
 const liveHookData: number | undefined = liveHook.data
-liveHook.error satisfies
-  | EffectRpcQueryEmptyStreamError
-  | EffectRpcQueryError<'unauthorized' | 'watch-failure' | 'watch-rpc-failure'>
-  | null
+liveHook.error satisfies EffectRpcQueryEmptyStreamError | WatchStreamError | null
 const liveResult: Promise<number> = queryClient.query(liveOptions)
 const liveKey = utils.events.watch.liveKey({ channel: 'news' })
 liveKey satisfies readonly ['app', 'rpc', 'events', 'watch', 'live', JsonValue]
@@ -364,6 +398,62 @@ const initializedLive = useQuery(
 )
 initializedLive.data satisfies number
 
+const normalizedLiveGroup = RpcGroup.make(
+  Rpc.make('values.undefined', { success: Schema.Undefined, stream: true }),
+  Rpc.make('values.void', { success: Schema.Void, stream: true }),
+  Rpc.make('values.null', { success: Schema.Null, stream: true }),
+  Rpc.make('values.optional', { success: Schema.UndefinedOr(Schema.String), stream: true }),
+)
+declare const normalizedLiveClient: RpcClient.RpcClient.Flat<
+  RpcGroup.Rpcs<typeof normalizedLiveGroup>
+>
+const normalizedLiveUtils = createRpcQueryUtils(normalizedLiveGroup, {
+  client: normalizedLiveClient,
+  keyPrefix,
+})
+createRpcQueryUtils(normalizedLiveGroup, {
+  client: normalizedLiveClient,
+  keyPrefix,
+  // @ts-expect-error Inputless RPC groups reject even an empty encoder map.
+  keyEncoders: {},
+})
+true satisfies Assert<Equal<QueryData<string | undefined>, string | null>>
+true satisfies Assert<Equal<QueryData<void>, null>>
+const undefinedLiveResult = queryClient.query(normalizedLiveUtils.values.undefined.liveOptions())
+true satisfies Assert<Equal<typeof undefinedLiveResult, Promise<null>>>
+const voidLiveResult = queryClient.query(normalizedLiveUtils.values.void.liveOptions())
+true satisfies Assert<Equal<typeof voidLiveResult, Promise<null>>>
+const nullLiveResult = queryClient.query(normalizedLiveUtils.values.null.liveOptions())
+true satisfies Assert<Equal<typeof nullLiveResult, Promise<null>>>
+const optionalLiveKey = normalizedLiveUtils.values.optional.liveKey()
+const cachedOptionalLive = queryClient.getQueryData(optionalLiveKey)
+true satisfies Assert<Equal<typeof cachedOptionalLive, string | null | undefined>>
+const cachedUndefinedLive = queryClient.getQueryData(normalizedLiveUtils.values.undefined.liveKey())
+true satisfies Assert<Equal<typeof cachedUndefinedLive, null | undefined>>
+queryClient.setQueryData(optionalLiveKey, null)
+const initializedNormalizedLive = useQuery(
+  normalizedLiveUtils.values.optional.liveOptions({
+    initialData: null,
+    select: (value) => {
+      true satisfies Assert<Equal<typeof value, string | null>>
+      return value === null ? 0 : value.length
+    },
+  }),
+)
+true satisfies Assert<Equal<typeof initializedNormalizedLive.data, number>>
+const initializedUndefinedLive = useQuery(
+  normalizedLiveUtils.values.undefined.liveOptions({ initialData: () => null }),
+)
+true satisfies Assert<Equal<typeof initializedUndefinedLive.data, null>>
+const optionalNormalizedInitial = useQuery(
+  normalizedLiveUtils.values.optional.liveOptions({ initialData: () => undefined }),
+)
+true satisfies Assert<Equal<typeof optionalNormalizedInitial.data, string | null | undefined>>
+const accumulatedUndefined = queryClient.query(
+  normalizedLiveUtils.values.undefined.streamedOptions({ initialData: [undefined] }),
+)
+true satisfies Assert<Equal<typeof accumulatedUndefined, Promise<readonly undefined[]>>>
+
 declare const clientFailureClient: RpcClient.RpcClient.Flat<Rpcs, 'client-failure'>
 const clientFailureUtils = createRpcQueryUtils<typeof group, typeof keyPrefix, 'client-failure'>(
   group,
@@ -372,16 +462,18 @@ const clientFailureUtils = createRpcQueryUtils<typeof group, typeof keyPrefix, '
 clientFailureUtils.events.watch.streamedOptions({
   input: { channel: 'news' },
   retry: (_count, error) => {
-    error satisfies EffectRpcQueryError<
-      'client-failure' | 'unauthorized' | 'watch-failure' | 'watch-rpc-failure'
-    >
+    error satisfies
+      | EffectRpcQueryConfigError
+      | EffectRpcQueryError<
+          'client-failure' | 'unauthorized' | 'watch-failure' | 'watch-rpc-failure'
+        >
     return false
   },
 })
 
-const skippedStreamed = utils.events.watch.streamedOptions(skipToken)
+const skippedStreamed = utils.events.watch.streamedOptions({ input: skipToken })
 skippedStreamed.queryFn satisfies typeof queryCoreSkipToken
-const skippedLive = utils.events.watch.liveOptions(skipToken)
+const skippedLive = utils.events.watch.liveOptions({ input: skipToken })
 skippedLive.queryFn satisfies typeof queryCoreSkipToken
 useQuery(skippedStreamed)
 useQuery(skippedLive)
@@ -434,6 +526,11 @@ const infiniteOptions = utils.users.pages.infiniteOptions({
     error satisfies EffectRpcQueryError<'page-failure'>
     return false
   },
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies EffectRpcQueryError<'page-failure'>
+    return 0
+  },
   select: (data) => data.pages.flatMap((page) => page.users.map((user) => user.name)),
 })
 const infiniteHook = useInfiniteQuery(infiniteOptions)
@@ -645,6 +742,39 @@ const validPageOptions = {
   initialPageParam: 0,
   input: (cursor: number) => ({ cursor }),
 }
+const instantiatedPages = buildPages({
+  ...validPageOptions,
+  enabled: (query) => query.state.data?.pages.length !== 0,
+  getPreviousPageParam: (_page, _pages, cursor) => cursor - 1,
+  networkMode: 'offlineFirst',
+})
+instantiatedPages.enabled
+instantiatedPages.getPreviousPageParam
+instantiatedPages.networkMode
+const explicitUnary = utils.users.get.queryOptions<string>({
+  input: { id: 1 },
+  enabled: (query) => query.state.data?.id !== 0,
+  select: (user) => user.name,
+  networkMode: 'offlineFirst',
+})
+explicitUnary.enabled
+explicitUnary.networkMode
+true satisfies Assert<
+  Equal<
+    ReturnType<typeof explicitUnary.queryFn>,
+    Rpc.Success<typeof GetUser> | Promise<Rpc.Success<typeof GetUser>>
+  >
+>
+useQuery(explicitUnary).data satisfies string | undefined
+const explicitInfinite = utils.users.pages.infiniteOptions<number, string[]>({
+  ...validPageOptions,
+  initialData: initialInfiniteData,
+  select: (data) => data.pages.flatMap((page) => page.users.map((user) => user.name)),
+  enabled: (query) => query.state.data?.pages.length !== 0,
+})
+explicitInfinite.enabled
+const explicitInfiniteHook = useInfiniteQuery(explicitInfinite)
+true satisfies Assert<Equal<typeof explicitInfiniteHook.data, string[]>>
 // @ts-expect-error infinite input mappers must return the RPC payload constructor input
 buildPages({ ...validPageOptions, input: () => ({ cursor: 'invalid' }) })
 // @ts-expect-error the package owns the infinite-query function
@@ -684,6 +814,7 @@ const queryOptions = utils.users.get.queryOptions({
     return false
   },
   retryDelay: (_attempt, error) => {
+    _attempt satisfies number
     error satisfies EffectRpcQueryError<'not-found'>
     return 0
   },
@@ -691,10 +822,10 @@ const queryOptions = utils.users.get.queryOptions({
   staleTime: (query) => (query.state.data?.name === 'Ada' ? Infinity : 0),
   structuralSharing: false,
 })
-type ExactQueryHashInput = Assert<
-  Equal<Parameters<typeof queryOptions.queryKeyHashFn>[0], typeof queryOptions.queryKey>
+type ClientOwnedQueryHash = Assert<
+  Equal<Extract<'queryKeyHashFn' | 'queryHash', keyof typeof queryOptions>, never>
 >
-const exactQueryHashInput: ExactQueryHashInput = true
+const clientOwnedQueryHash: ClientOwnedQueryHash = true
 
 const queryHook = useQuery(queryOptions)
 const queryHookData: string | undefined = queryHook.data
@@ -704,7 +835,7 @@ const suspenseData: string = suspenseHook.data
 suspenseHook.error satisfies EffectRpcQueryError<'not-found'> | null
 usePrefetchQuery(queryOptions)
 
-void [exactQueryHashInput, queryHookData, suspenseData]
+void [clientOwnedQueryHash, queryHookData, suspenseData]
 
 const possiblyInitialized = utils.users.get.queryOptions({
   input: { id: 1, locale: 'de' },
@@ -750,6 +881,12 @@ const encoderOptions: CreateRpcQueryUtilsOptions<typeof encoderGroup, typeof key
   runPromiseExit: encoderRunner,
 }
 createRpcQueryUtils(encoderGroup, encoderOptions)
+// @ts-expect-error Key encoders do not satisfy residual RPC execution services.
+createRpcQueryUtils(encoderGroup, {
+  client: encoderClient,
+  keyPrefix,
+  keyEncoders: encoderOptions.keyEncoders,
+})
 
 const secretListGroup = RpcGroup.make(SecretList)
 type SecretListRpcs = RpcGroup.Rpcs<typeof secretListGroup>
@@ -774,15 +911,21 @@ concreteQueryKey satisfies readonly ['app', 'rpc', 'users', 'get', 'query', Json
 const cachedState = queryClient.getQueryState(concreteQueryKey)
 cachedState?.error satisfies EffectRpcQueryError<'not-found'> | null | undefined
 
-const skipped = utils.users.get.queryOptions(skipToken)
+// @ts-expect-error Query builders accept options objects.
+utils.users.get.queryOptions(skipToken)
+// @ts-expect-error Stream builders accept options objects.
+utils.events.watch.streamedOptions(skipToken)
+// @ts-expect-error Live builders accept options objects.
+utils.events.watch.liveOptions(skipToken)
+const skipped = utils.users.get.queryOptions({ input: skipToken })
 skipped.queryFn satisfies typeof queryCoreSkipToken
 const typedSkipToken: SkipToken = skipped.queryFn
 void typedSkipToken
-type ExactSkippedQueryHashInput = Assert<
-  Equal<Parameters<typeof skipped.queryKeyHashFn>[0], typeof skipped.queryKey>
+type ClientOwnedSkippedQueryHash = Assert<
+  Equal<Extract<'queryKeyHashFn' | 'queryHash', keyof typeof skipped>, never>
 >
-const exactSkippedQueryHashInput: ExactSkippedQueryHashInput = true
-void exactSkippedQueryHashInput
+const clientOwnedSkippedQueryHash: ClientOwnedSkippedQueryHash = true
+void clientOwnedSkippedQueryHash
 const skippedHook = useQuery(skipped)
 const skippedData: { readonly id: number; readonly name: string } | undefined = skippedHook.data
 skippedHook.error satisfies EffectRpcQueryError<'not-found'> | null
@@ -804,6 +947,11 @@ const getMutationOptions = utils.users.get.mutationOptions<{
   readonly previousName: string
 }>({
   gcTime: 60_000,
+  retryDelay: (attemptIndex, error) => {
+    attemptIndex satisfies number
+    error satisfies EffectRpcQueryError<'not-found'>
+    return 0
+  },
   onError: (error, variables, onMutateResult) => {
     error satisfies EffectRpcQueryError<'not-found'>
     variables satisfies { readonly id: number; readonly locale?: string }
@@ -890,19 +1038,19 @@ utils.health.ping.queryOptions(skipToken)
 utils.users.get.queryKey(skipToken)
 // @ts-expect-error mutation builders never accept the skip sentinel
 utils.users.get.mutationOptions(skipToken)
-// @ts-expect-error the package owns the query function
 utils.users.get.queryOptions({
   input: { id: 1 },
+  // @ts-expect-error the package owns the query function
   queryFn: queryCoreSkipToken,
 })
-// @ts-expect-error the package owns the query key
 utils.users.get.queryOptions({
   input: { id: 1 },
+  // @ts-expect-error the package owns the query key
   queryKey: ['custom'],
 })
-// @ts-expect-error the package owns the per-call query key hash function
 utils.users.get.queryOptions({
   input: { id: 1 },
+  // @ts-expect-error QueryClient defaults own hashing.
   queryKeyHashFn: JSON.stringify,
 })
 void utils.projects.watch.streamedOptions({})
@@ -919,7 +1067,6 @@ if (skipToken !== queryCoreSkipToken || skipToken !== reactQuerySkipToken) {
   throw new Error('skipToken must preserve Query Core and React Query identity')
 }
 
-// Object-form skipping preserves inference through Query Core and React Query.
 const skippedQueryObject = utils.users.get.queryOptions({
   input: skipToken,
   select: (user) => user.name,
@@ -975,10 +1122,7 @@ const skippedLiveObject = utils.events.watch.liveOptions({
 })
 const skippedLiveResult = useQuery(skippedLiveObject)
 skippedLiveResult.data satisfies number | undefined
-skippedLiveResult.error satisfies
-  | EffectRpcQueryEmptyStreamError
-  | EffectRpcQueryError<'unauthorized' | 'watch-failure' | 'watch-rpc-failure'>
-  | null
+skippedLiveResult.error satisfies EffectRpcQueryEmptyStreamError | WatchStreamError | null
 new QueryObserver(queryClient, skippedLiveObject).getCurrentResult().data satisfies
   | number
   | undefined
@@ -1168,7 +1312,7 @@ const conditionalStreamOptions = utils.events.watch.streamedOptions({
   staleTime: (query) => {
     query.queryKey satisfies
       | readonly ['app', 'rpc', 'events', 'watch', 'streamed']
-      | readonly ['app', 'rpc', 'events', 'watch', 'streamed', JsonValue]
+      | readonly ['app', 'rpc', 'events', 'watch', 'streamed', ...JsonValue[]]
     return 30_000
   },
 })
@@ -1177,12 +1321,7 @@ conditionalStreamOptions.queryFn satisfies
   | SkipToken
 const conditionalStreamHook = useQuery(conditionalStreamOptions)
 true satisfies Assert<Equal<typeof conditionalStreamHook.data, string | undefined>>
-true satisfies Assert<
-  Equal<
-    typeof conditionalStreamHook.error,
-    EffectRpcQueryError<'unauthorized' | 'watch-failure' | 'watch-rpc-failure'> | null
-  >
->
+true satisfies Assert<Equal<typeof conditionalStreamHook.error, WatchStreamError | null>>
 new QueryObserver(queryClient, conditionalStreamOptions).getCurrentResult().data satisfies
   | string
   | undefined
@@ -1206,12 +1345,7 @@ conditionalLiveOptions.queryFn satisfies
 const conditionalLiveHook = useQuery(conditionalLiveOptions)
 true satisfies Assert<Equal<typeof conditionalLiveHook.data, number | undefined>>
 true satisfies Assert<
-  Equal<
-    typeof conditionalLiveHook.error,
-    | EffectRpcQueryEmptyStreamError
-    | EffectRpcQueryError<'unauthorized' | 'watch-failure' | 'watch-rpc-failure'>
-    | null
-  >
+  Equal<typeof conditionalLiveHook.error, EffectRpcQueryEmptyStreamError | WatchStreamError | null>
 >
 // @ts-expect-error conditional live queries do not accept accumulation policy
 utils.events.watch.liveOptions({ input: conditionalStreamInput, maxChunks: 2 })
@@ -1297,7 +1431,6 @@ const optionalConditionalUser = useQuery(
 )
 true satisfies Assert<Equal<typeof optionalConditionalUser.data, string | undefined>>
 
-// Request-local inputs retain inference and stay out of the returned Query Core contract.
 const unaryRpcOptions = {
   headers: { 'x-request-id': 'fixture' },
   context: Context.empty(),
@@ -1424,3 +1557,372 @@ utils.users.get.mutationOptions({ rpcOptions: discardOptions })
 
 // @ts-expect-error A caller hash cannot override generated RPC cache identity.
 utils.users.get.queryOptions({ input: skipToken, queryHash: 'shared' })
+
+true satisfies Assert<
+  Equal<
+    Extract<
+      'queryKeyHashFn' | 'queryHash',
+      | keyof typeof infiniteOptions
+      | keyof typeof skippedInfinite
+      | keyof typeof conditionalInfiniteOptions
+      | keyof typeof streamedOptions
+      | keyof typeof liveOptions
+    >,
+    never
+  >
+>
+
+// @ts-expect-error QueryClient defaults own hashing.
+utils.events.watch.streamedOptions({ input: { channel: 'news' }, queryHash: 'shared' })
+// @ts-expect-error QueryClient defaults own hashing.
+utils.events.watch.liveOptions({ input: { channel: 'news' }, queryKeyHashFn: JSON.stringify })
+utils.users.pages.infiniteOptions({
+  initialPageParam: 0,
+  input: (cursor) => ({ cursor }),
+  getNextPageParam: () => undefined,
+  // @ts-expect-error QueryClient defaults own hashing.
+  queryKeyHashFn: JSON.stringify,
+})
+
+const UnknownRead = Rpc.make('payload.unknown', {
+  payload: Schema.Unknown,
+  success: Schema.String,
+})
+const AnyRead = Rpc.make('payload.any', { payload: Schema.Any, success: Schema.String })
+const OptionalRead = Rpc.make('payload.optional', {
+  payload: Schema.Union([Schema.String, Schema.Void]),
+  success: Schema.String,
+})
+const VoidRead = Rpc.make('payload.void', {
+  payload: Schema.Void.annotate({ title: 'Payloadless' }),
+  success: Schema.String,
+})
+const UnknownWatch = Rpc.make('payload.unknownWatch', {
+  payload: Schema.Unknown,
+  success: Schema.String,
+  stream: true,
+})
+const AnyWatch = Rpc.make('payload.anyWatch', {
+  payload: Schema.Any,
+  success: Schema.String,
+  stream: true,
+})
+const OptionalWatch = Rpc.make('payload.optionalWatch', {
+  payload: Schema.Union([Schema.String, Schema.Void]),
+  success: Schema.String,
+  stream: true,
+})
+const VoidWatch = Rpc.make('payload.voidWatch', {
+  payload: Schema.Void,
+  success: Schema.String,
+  stream: true,
+})
+const broadPayloadGroup = RpcGroup.make(
+  UnknownRead,
+  AnyRead,
+  OptionalRead,
+  VoidRead,
+  UnknownWatch,
+  AnyWatch,
+  OptionalWatch,
+  VoidWatch,
+)
+declare const broadPayloadClient: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof broadPayloadGroup>>
+const broadPayloadUtils = createRpcQueryUtils(broadPayloadGroup, {
+  client: broadPayloadClient,
+  keyPrefix: ['payload'],
+})
+createRpcQueryUtils(broadPayloadGroup, {
+  client: broadPayloadClient,
+  keyPrefix: ['payload'],
+  keyEncoders: {
+    'payload.unknown': (payload) => {
+      true satisfies Assert<Equal<typeof payload, unknown>>
+      return 'unknown'
+    },
+    'payload.any': (payload) => {
+      true satisfies Assert<Equal<typeof payload, any>>
+      return 'any'
+    },
+    'payload.optional': (payload) => {
+      true satisfies Assert<Equal<typeof payload, void | string>>
+      return payload ?? null
+    },
+    'payload.unknownWatch': (payload) => {
+      true satisfies Assert<Equal<typeof payload, unknown>>
+      return 'unknown'
+    },
+    'payload.anyWatch': (payload) => {
+      true satisfies Assert<Equal<typeof payload, any>>
+      return 'any'
+    },
+    'payload.optionalWatch': (payload) => {
+      true satisfies Assert<Equal<typeof payload, void | string>>
+      return payload ?? null
+    },
+    // @ts-expect-error Void declarations have no payload identity encoder
+    'payload.void': () => null,
+  },
+})
+const unknownKey = broadPayloadUtils.payload.unknown.queryKey({ id: 1 })
+const anyKey = broadPayloadUtils.payload.any.queryKey({ id: 1 })
+const optionalKey = broadPayloadUtils.payload.optional.queryKey('input')
+unknownKey satisfies readonly ['payload', 'rpc', 'payload', 'unknown', 'query', JsonValue]
+anyKey satisfies readonly ['payload', 'rpc', 'payload', 'any', 'query', JsonValue]
+optionalKey satisfies readonly ['payload', 'rpc', 'payload', 'optional', 'query', JsonValue]
+queryClient.getQueryData(unknownKey) satisfies string | undefined
+queryClient.getQueryData(anyKey) satisfies string | undefined
+queryClient.getQueryData(optionalKey) satisfies string | undefined
+broadPayloadUtils.payload.unknown.queryOptions({ input: { id: 1 } })
+broadPayloadUtils.payload.any.queryOptions({ input: { id: 1 } })
+broadPayloadUtils.payload.optional.queryOptions({ input: undefined })
+// @ts-expect-error Unknown declarations require an input field
+broadPayloadUtils.payload.unknown.queryOptions()
+// @ts-expect-error Any declarations require an input field
+broadPayloadUtils.payload.any.queryOptions()
+// @ts-expect-error void-containing declarations require an input field
+broadPayloadUtils.payload.optional.queryOptions()
+// @ts-expect-error Unknown declarations require constructor input for keys
+broadPayloadUtils.payload.unknown.queryKey()
+// @ts-expect-error Any declarations require constructor input for keys
+broadPayloadUtils.payload.any.queryKey()
+// @ts-expect-error void-containing unions retain their declared constructor type
+broadPayloadUtils.payload.optional.queryKey(1)
+
+const unknownMutation = broadPayloadUtils.payload.unknown.mutationOptions({
+  onMutate: (input) => {
+    true satisfies Assert<Equal<typeof input, unknown>>
+    return 'unknown'
+  },
+})
+const anyMutation = broadPayloadUtils.payload.any.mutationOptions({
+  onMutate: (input) => {
+    true satisfies Assert<Equal<typeof input, any>>
+    return 'any'
+  },
+})
+const optionalMutation = broadPayloadUtils.payload.optional.mutationOptions({
+  onMutate: (input) => {
+    true satisfies Assert<Equal<typeof input, void | string>>
+    return 'optional'
+  },
+})
+unknownMutation.mutationFn({ id: 1 }) satisfies Promise<string>
+anyMutation.mutationFn({ id: 1 }) satisfies Promise<string>
+optionalMutation.mutationFn('input') satisfies Promise<string>
+optionalMutation.mutationFn(undefined) satisfies Promise<string>
+// @ts-expect-error void-containing mutation variables retain their constructor type
+optionalMutation.mutationFn(1)
+
+const broadUnknownPages = broadPayloadUtils.payload.unknown.infiniteOptions({
+  input: (page: number) => ({ page }),
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+const broadAnyPages = broadPayloadUtils.payload.any.infiniteOptions({
+  input: (page: number) => ({ page }),
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+const broadOptionalPages = broadPayloadUtils.payload.optional.infiniteOptions({
+  input: (page: number) => String(page),
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+queryClient.infiniteQuery(broadUnknownPages) satisfies Promise<InfiniteData<string, number>>
+queryClient.infiniteQuery(broadAnyPages) satisfies Promise<InfiniteData<string, number>>
+queryClient.infiniteQuery(broadOptionalPages) satisfies Promise<InfiniteData<string, number>>
+broadPayloadUtils.payload.unknown.infiniteKey({ page: 0 }) satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'unknown',
+  'infinite',
+  JsonValue,
+]
+broadPayloadUtils.payload.any.infiniteKey({ page: 0 }) satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'any',
+  'infinite',
+  JsonValue,
+]
+broadPayloadUtils.payload.optional.infiniteKey('0') satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'optional',
+  'infinite',
+  JsonValue,
+]
+// @ts-expect-error Unknown infinite queries require a page-input mapper
+broadPayloadUtils.payload.unknown.infiniteOptions({
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+// @ts-expect-error Any infinite queries require a page-input mapper
+broadPayloadUtils.payload.any.infiniteOptions({
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+// @ts-expect-error void-containing infinite queries require a page-input mapper
+broadPayloadUtils.payload.optional.infiniteOptions({
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+
+const unknownStreamedKey = broadPayloadUtils.payload.unknownWatch.streamedKey({ id: 1 })
+const anyStreamedKey = broadPayloadUtils.payload.anyWatch.streamedKey({ id: 1 })
+const optionalStreamedKey = broadPayloadUtils.payload.optionalWatch.streamedKey('input')
+const unknownLiveKey = broadPayloadUtils.payload.unknownWatch.liveKey({ id: 1 })
+const anyLiveKey = broadPayloadUtils.payload.anyWatch.liveKey({ id: 1 })
+const broadOptionalLiveKey = broadPayloadUtils.payload.optionalWatch.liveKey('input')
+unknownStreamedKey satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'unknownWatch',
+  'streamed',
+  ...JsonValue[],
+]
+anyStreamedKey satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'anyWatch',
+  'streamed',
+  ...JsonValue[],
+]
+optionalStreamedKey satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'optionalWatch',
+  'streamed',
+  ...JsonValue[],
+]
+unknownLiveKey satisfies readonly ['payload', 'rpc', 'payload', 'unknownWatch', 'live', JsonValue]
+anyLiveKey satisfies readonly ['payload', 'rpc', 'payload', 'anyWatch', 'live', JsonValue]
+broadOptionalLiveKey satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'optionalWatch',
+  'live',
+  JsonValue,
+]
+queryClient.getQueryData(unknownStreamedKey) satisfies readonly string[] | undefined
+queryClient.getQueryData(anyStreamedKey) satisfies readonly string[] | undefined
+queryClient.getQueryData(optionalStreamedKey) satisfies readonly string[] | undefined
+const unknownBoundedStream = broadPayloadUtils.payload.unknownWatch.streamedKey(
+  { id: 1 },
+  { maxChunks: 2, refetchMode: 'append' },
+)
+queryClient.getQueryData(unknownBoundedStream) satisfies readonly string[] | undefined
+broadPayloadUtils.payload.anyWatch.streamedKey({ id: 1 }, { maxChunks: 2 })
+broadPayloadUtils.payload.optionalWatch.streamedKey(undefined, { refetchMode: 'replace' })
+// @ts-expect-error Unknown accumulated keys require constructor input
+broadPayloadUtils.payload.unknownWatch.streamedKey()
+// @ts-expect-error Any accumulated keys require constructor input
+broadPayloadUtils.payload.anyWatch.streamedKey()
+queryClient.getQueryData(unknownLiveKey) satisfies string | undefined
+queryClient.getQueryData(anyLiveKey) satisfies string | undefined
+queryClient.getQueryData(broadOptionalLiveKey) satisfies string | undefined
+broadPayloadUtils.payload.unknownWatch.streamedOptions({ input: { id: 1 } })
+broadPayloadUtils.payload.anyWatch.streamedOptions({ input: { id: 1 } })
+broadPayloadUtils.payload.optionalWatch.streamedOptions({ input: undefined })
+broadPayloadUtils.payload.unknownWatch.liveOptions({ input: { id: 1 } })
+broadPayloadUtils.payload.anyWatch.liveOptions({ input: { id: 1 } })
+broadPayloadUtils.payload.optionalWatch.liveOptions({ input: undefined })
+// @ts-expect-error Unknown accumulated queries require an input field
+broadPayloadUtils.payload.unknownWatch.streamedOptions()
+// @ts-expect-error Any accumulated queries require an input field
+broadPayloadUtils.payload.anyWatch.streamedOptions()
+// @ts-expect-error void-containing accumulated queries require an input field
+broadPayloadUtils.payload.optionalWatch.streamedOptions()
+// @ts-expect-error Unknown live queries require an input field
+broadPayloadUtils.payload.unknownWatch.liveOptions()
+// @ts-expect-error Any live queries require an input field
+broadPayloadUtils.payload.anyWatch.liveOptions()
+// @ts-expect-error void-containing live queries require an input field
+broadPayloadUtils.payload.optionalWatch.liveOptions()
+
+const unknownSkipped = broadPayloadUtils.payload.unknown.queryOptions({ input: skipToken })
+const anySkipped = broadPayloadUtils.payload.any.queryOptions({ input: skipToken })
+const optionalSkipped = broadPayloadUtils.payload.optional.queryOptions({ input: skipToken })
+const unknownStreamSkipped = broadPayloadUtils.payload.unknownWatch.streamedOptions({
+  input: skipToken,
+})
+const anyStreamSkipped = broadPayloadUtils.payload.anyWatch.streamedOptions({ input: skipToken })
+const optionalStreamSkipped = broadPayloadUtils.payload.optionalWatch.streamedOptions({
+  input: skipToken,
+})
+const unknownLiveSkipped = broadPayloadUtils.payload.unknownWatch.liveOptions({ input: skipToken })
+const anyLiveSkipped = broadPayloadUtils.payload.anyWatch.liveOptions({ input: skipToken })
+const optionalLiveSkipped = broadPayloadUtils.payload.optionalWatch.liveOptions({
+  input: skipToken,
+})
+true satisfies Assert<Equal<typeof unknownSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof anySkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof optionalSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof unknownStreamSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof anyStreamSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof optionalStreamSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof unknownLiveSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof anyLiveSkipped.queryFn, SkipToken>>
+true satisfies Assert<Equal<typeof optionalLiveSkipped.queryFn, SkipToken>>
+
+declare const broadUnknownInput: unknown
+declare const broadAnyInput: any
+const broadUnknownOptions = broadPayloadUtils.payload.unknown.queryOptions({
+  input: broadUnknownInput,
+})
+const broadAnyOptions = broadPayloadUtils.payload.any.queryOptions({ input: broadAnyInput })
+true satisfies Assert<Equal<typeof broadUnknownOptions.queryFn, QueryFunction<string> | SkipToken>>
+true satisfies Assert<Equal<typeof broadAnyOptions.queryFn, QueryFunction<string> | SkipToken>>
+
+broadPayloadUtils.payload.void.queryKey() satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'void',
+  'query',
+]
+broadPayloadUtils.payload.void.infiniteKey() satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'void',
+  'infinite',
+]
+broadPayloadUtils.payload.void.queryOptions()
+broadPayloadUtils.payload.void.infiniteOptions({
+  initialPageParam: 0,
+  getNextPageParam: () => undefined,
+})
+broadPayloadUtils.payload.void.mutationOptions().mutationFn() satisfies Promise<string>
+broadPayloadUtils.payload.voidWatch.streamedKey() satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'voidWatch',
+  'streamed',
+  ...JsonValue[],
+]
+broadPayloadUtils.payload.voidWatch.streamedKey({ maxChunks: 2, refetchMode: 'append' })
+broadPayloadUtils.payload.voidWatch.liveKey() satisfies readonly [
+  'payload',
+  'rpc',
+  'payload',
+  'voidWatch',
+  'live',
+]
+broadPayloadUtils.payload.voidWatch.streamedOptions()
+broadPayloadUtils.payload.voidWatch.liveOptions()
+// @ts-expect-error Void query declarations omit the input field
+broadPayloadUtils.payload.void.queryOptions({ input: undefined })
+// @ts-expect-error Void accumulated declarations omit the input field
+broadPayloadUtils.payload.voidWatch.streamedOptions({ input: undefined })
+// @ts-expect-error Void live declarations omit the input field
+broadPayloadUtils.payload.voidWatch.liveOptions({ input: undefined })
diff --git a/tests/types/server-local-client-contract.ts b/tests/types/server-local-client-contract.ts
new file mode 100644
index 0000000..489b6a9
--- /dev/null
+++ b/tests/types/server-local-client-contract.ts
@@ -0,0 +1,34 @@
+import { Context, Effect, Schema } from 'effect'
+import { Rpc, RpcGroup } from 'effect/rpc'
+
+import { makeServerLocalRpcClient } from '../../examples/server/src/server-local-rpc.ts'
+
+class CodecService extends Context.Service<CodecService, { readonly suffix: string }>()(
+  'effect-api-query/tests/ServerLocalCodecService',
+) {}
+
+const Payload = Schema.Struct({ name: Schema.String }).pipe(
+  Schema.middlewareEncoding((encoding) => Effect.flatMap(CodecService, () => encoding)),
+)
+const Read = Rpc.make('profiles.read', {
+  payload: Payload,
+  success: Schema.String,
+  error: Schema.Literal('not-found'),
+})
+const group = RpcGroup.make(Read)
+const construction = makeServerLocalRpcClient(group)
+declare const client: Effect.Success<typeof construction>
+const call = client('profiles.read', {
+  name: 'Ada',
+})
+type Equal<Left, Right> =
+  (<Value>() => Value extends Left ? 1 : 2) extends <Value>() => Value extends Right ? 1 : 2
+    ? true
+    : false
+type Assert<Condition extends true> = Condition
+true satisfies Assert<Equal<Effect.Success<typeof call>, string>>
+true satisfies Assert<Equal<Effect.Error<typeof call>, 'not-found'>>
+true satisfies Assert<Equal<Effect.Services<typeof call>, CodecService>>
+// @ts-expect-error The declaration-derived client does not accept a numeric profile name.
+const invalidCall = client('profiles.read', { name: 1 })
+void [call, invalidCall]
diff --git a/tests/types/snapshot-contract.ts b/tests/types/snapshot-contract.ts
new file mode 100644
index 0000000..e5012cd
--- /dev/null
+++ b/tests/types/snapshot-contract.ts
@@ -0,0 +1,78 @@
+import type { QueryClient, QueryExecuteOptions } from '@tanstack/query-core'
+import { Schema } from 'effect'
+import {
+  createHttpApiQueryUtils,
+  createRpcQueryUtils,
+  fetchStreamSnapshot,
+  skipToken,
+} from 'effect-api-query'
+import type { StreamSnapshotOptions } from 'effect-api-query'
+import { HttpApi, HttpApiEndpoint, HttpApiGroup, HttpApiSchema } from 'effect/http-api'
+import type { HttpApiClient } from 'effect/http-api'
+import { Rpc, RpcGroup } from 'effect/rpc'
+import type { RpcClient } from 'effect/rpc'
+
+const group = RpcGroup.make(
+  Rpc.make('watch', {
+    payload: { channel: Schema.String },
+    success: Schema.UndefinedOr(Schema.Int),
+    stream: true,
+  }),
+)
+declare const client: RpcClient.RpcClient.Flat<RpcGroup.Rpcs<typeof group>>
+declare const queryClient: QueryClient
+const utils = createRpcQueryUtils(group, { client, keyPrefix: ['snapshot-types'] })
+const streamed = utils.watch.streamedOptions({ input: { channel: 'owned' } })
+const live = utils.watch.liveOptions({ input: { channel: 'owned' } })
+
+fetchStreamSnapshot(queryClient, streamed) satisfies Promise<readonly (number | undefined)[]>
+fetchStreamSnapshot(queryClient, live) satisfies Promise<number | null>
+fetchStreamSnapshot(queryClient, {
+  ...streamed,
+  select: (values) => values.length,
+}) satisfies Promise<number>
+fetchStreamSnapshot(queryClient, {
+  ...live,
+  select: (value) => (value === null ? 'empty' : `${value}`),
+}) satisfies Promise<string>
+fetchStreamSnapshot(queryClient, streamed, {
+  mode: 'cached',
+  signal: new AbortController().signal,
+  timeoutMs: 500,
+}) satisfies Promise<readonly (number | undefined)[]>
+const controls = { mode: 'fresh', timeoutMs: 1_000 } as const satisfies StreamSnapshotOptions
+fetchStreamSnapshot(queryClient, live, controls)
+
+declare const native: Omit<
+  QueryExecuteOptions<string, Error, number>,
+  'queryHash' | 'queryKeyHashFn'
+> & {
+  queryFn: () => Promise<string>
+}
+fetchStreamSnapshot(queryClient, native) satisfies Promise<number>
+const api = HttpApi.make('snapshot-types').add(
+  HttpApiGroup.make('events').add(
+    HttpApiEndpoint.get('watch', '/watch', {
+      success: HttpApiSchema.StreamSse({ data: Schema.Int }),
+    }),
+  ),
+)
+declare const httpClient: HttpApiClient.ForApi<typeof api>
+const http = createHttpApiQueryUtils(api, { client: httpClient, keyPrefix: ['snapshot-types'] })
+fetchStreamSnapshot(queryClient, http.events.watch.streamedOptions()) satisfies Promise<
+  readonly number[]
+>
+fetchStreamSnapshot(queryClient, http.events.watch.liveOptions()) satisfies Promise<number>
+// @ts-expect-error Skipped options cannot own a callable query function
+fetchStreamSnapshot(queryClient, utils.watch.liveOptions({ input: skipToken }))
+// @ts-expect-error A snapshot requires a supplied callable query function
+fetchStreamSnapshot(queryClient, { queryKey: ['missing'] })
+// @ts-expect-error Infinite page execution uses a different cache shape and lifecycle
+fetchStreamSnapshot(queryClient, { ...streamed, initialPageParam: 0 })
+// @ts-expect-error Snapshot mode is explicit
+fetchStreamSnapshot(queryClient, live, { mode: 'join' })
+
+// @ts-expect-error QueryClient owns hashing for snapshots
+fetchStreamSnapshot(queryClient, { ...live, queryHash: 'custom' })
+// @ts-expect-error Configure custom hashing through QueryClient defaults
+fetchStreamSnapshot(queryClient, { ...live, queryKeyHashFn: () => 'custom' })
diff --git a/tests/types/tanstack-start-contract.ts b/tests/types/tanstack-start-contract.ts
index 28c374f..2f8892d 100644
--- a/tests/types/tanstack-start-contract.ts
+++ b/tests/types/tanstack-start-contract.ts
@@ -1,5 +1,4 @@
 // fallow-ignore-file unused-file
-// This packed fixture verifies that every generated operation fits one TanStack Start route.
 import { QueryClient } from '@tanstack/query-core'
 import { useInfiniteQuery, useMutation, useQuery, useSuspenseQuery } from '@tanstack/react-query'
 import { createRootRouteWithContext, createRoute, createRouter } from '@tanstack/react-router'
diff --git a/tests/types/tsconfig.json b/tests/types/tsconfig.json
new file mode 100644
index 0000000..ae3395e
--- /dev/null
+++ b/tests/types/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "../../tsconfig.json",
+  "include": ["./*.ts", "./*.tsx"],
+  "exclude": []
+}
diff --git a/tests/types/type-scale.ts b/tests/types/type-scale.ts
index f6af515..18be21c 100644
--- a/tests/types/type-scale.ts
+++ b/tests/types/type-scale.ts
@@ -3,9 +3,6 @@ import { Schema } from 'effect'
 import { createRpcQueryUtils, type RpcQueryUtils } from 'effect-api-query'
 import { Rpc, RpcClient, RpcGroup } from 'effect/rpc'
 
-// Reviewable baseline for TypeScript 7.0.2 with Query Core 5.102.2:
-// 380 files, 169,060 types, and 220,313 instantiations. The packed-package task
-// prints fresh extended diagnostics; timing and memory are intentionally not thresholds.
 const indexes = [
   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
   27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
diff --git a/tsconfig.json b/tsconfig.json
index 7cd6ac4..e13fcb6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -38,6 +38,9 @@
               "examples/server/src/web-handler.ts",
               "examples/server/tests/http-api.test.ts",
               "examples/server/tests/server.test.ts",
+              "examples/server/tests/rpc-transport-overhead.test.ts",
+              "examples/server/tests/rpc-websocket-consumer.test.ts",
+              "examples/server/tests/fixtures/websocket-server.ts",
               "examples/tanstack-start/src/lib/application.ts",
               "examples/tanstack-start/tests/server-render.test.tsx",
               "examples/vite-react/src/lib/application.ts",
@@ -47,8 +50,21 @@
               "tests/create-rpc-query-utils*.test.ts",
               "tests/http-*.test.ts",
               "tests/fixtures/effect-rpc.ts",
+              "examples/server/src/server-local-rpc.ts",
+              "tests/fixtures/rpc-transport-queries.ts",
               "tests/fixtures/http-client.ts",
-              "tests/types/**/*.ts"
+              "tests/fixtures/optimistic-users.ts",
+              "tests/fixtures/user-events.ts",
+              "tests/fixtures/socket-client.ts",
+              "tests/fixtures/websocket-checks.ts",
+              "tests/fixtures/docs-websocket-use.ts",
+              "tests/stream-snapshot.test.ts",
+              "tests/cache-recipes.test.ts",
+              "tests/query-policy.test.ts",
+              "tests/query-view-prefix.test.ts",
+              "scripts/measure-construction.mts",
+              "tests/types/**/*.ts",
+              "tests/types/**/*.tsx"
             ],
             "options": {
               "diagnosticSeverity": {
@@ -70,7 +86,8 @@
     "scripts/**/*.mts",
     "src/**/*.ts",
     "tests/**/*.ts",
+    "tests/**/*.tsx",
     "vite.config.ts"
   ],
-  "exclude": ["dist", "node_modules", "tests/packed-consumer"]
+  "exclude": ["dist", "node_modules"]
 }
diff --git a/vite.config.ts b/vite.config.ts
index f0257cf..a36e59e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,4 +1,5 @@
 import { strict as effectStrict } from '@effect/tsgo/oxlint-presets'
+import { ConfigProvider, Effect } from 'effect'
 import ultraciteAntiSlop from 'ultracite/oxlint/anti-slop'
 import ultraciteCore from 'ultracite/oxlint/core'
 import ultraciteReact from 'ultracite/oxlint/react'
@@ -24,11 +25,9 @@ const ignoredPaths = [
   'test-results/**',
 ]
 
-// Packed fixtures resolve only the installed tarball from isolated temporary projects.
-const packedFixtures = ['tests/packed-consumer/**', 'tests/types/**']
-
 const testFiles = ['tests/**/*.test.ts', 'examples/**/*.test.{ts,tsx}']
 const effectTestBlocks = ['it.effect', 'it.live', 'it.scoped', 'it.scopedLive']
+const applicationBuildTasks = ['vite-react-build', 'tanstack-start-build']
 
 const vitestPreset: OxlintConfig = {
   ...ultraciteVitest,
@@ -42,11 +41,9 @@ const vitestPreset: OxlintConfig = {
         'error',
         { additionalTestBlockFunctions: [...effectTestBlocks, 'it.effect.each', 'it.live.each'] },
       ],
-      // Exact booleans catch values that truthiness-only assertions would accept.
       'vitest/prefer-strict-boolean-matchers': 'error',
       'vitest/prefer-to-be-truthy': 'off',
       'vitest/prefer-to-be-falsy': 'off',
-      // Integration tests assert several states of one operation and its cleanup.
       'vitest/max-expects': ['error', { max: 50 }],
     },
   })),
@@ -91,15 +88,13 @@ export default defineConfig({
     jsPlugins: [...(ultraciteAntiSlop.jsPlugins ?? []), ...(ultraciteShadcn.jsPlugins ?? [])],
     settings: {
       shadcn: {
-        // Start keeps its custom primitives in components/, without components.json.
         componentImports: ['(?:^|/)components/'],
       },
     },
-    // Astro owns diagnostics for the docs package and uses its supported TypeScript 6 compiler.
     ignorePatterns: [
       ...(ultraciteCore.ignorePatterns ?? []),
       ...ignoredPaths,
-      ...packedFixtures,
+      'tests/types/**',
       'apps/docs/**',
     ],
     options: {
@@ -107,23 +102,24 @@ export default defineConfig({
       typeCheck: true,
     },
     rules: {
-      // Effect.fn supplies span names; its generator callbacks are anonymous.
+      'anti-slop/require-safety-comment-for-type-assertion': 'off',
+      'eslint/no-empty': ['error', { allowEmptyCatch: true }],
       'eslint/func-names': ['error', 'as-needed', { generators: 'never' }],
-      // The typed rule accepts async callbacks that forward an existing Promise.
       'eslint/require-await': 'off',
       'typescript/require-await': 'error',
       'typescript/return-await': ['error', 'error-handling-correctness-only'],
-      // Effect/RPC functions require explicit undefined for void arguments.
       'unicorn/no-useless-undefined': ['error', { checkArguments: false }],
-      // toSorted requires ES2023; this library and its consumers target ES2022.
       'unicorn/no-array-sort': 'off',
-      // The patched engine adds defaults beyond the exported strict preset.
       'effecttsgo/any-unknown-in-error-context': 'error',
       'effecttsgo/experimental-api-usage': 'error',
       'effecttsgo/unsafe-effect-type-assertion': 'error',
       'effecttsgo/unstable-api-usage': 'error',
     },
     overrides: [
+      {
+        files: ['src/core/stream-snapshot.ts'],
+        rules: { 'promise/avoid-new': 'off' },
+      },
       {
         files: ['examples/**/*.{ts,tsx}'],
         ...ultraciteReact,
@@ -139,7 +135,6 @@ export default defineConfig({
       {
         files: testFiles,
         rules: {
-          // Context.Service fixtures belong with the tests exercising them.
           'eslint/max-classes-per-file': 'off',
         },
       },
@@ -148,7 +143,6 @@ export default defineConfig({
         rules: ultraciteShadcn.rules ?? {},
       },
       {
-        // shadcn installs primitives here; the custom example UI files stay checked.
         files: ['examples/**/components/ui/**/*.{ts,tsx}'],
         excludeFiles: [
           'examples/vite-react/src/components/ui/action-button.tsx',
@@ -159,43 +153,48 @@ export default defineConfig({
         ),
       },
       {
-        files: ['src/{http,rpc}/**/*.ts', 'tests/**/*.ts', 'examples/**/*.{ts,tsx}'],
+        files: [
+          'src/{http,rpc}/**/*.ts',
+          'tests/**/*.ts',
+          'examples/**/*.{ts,tsx}',
+          'scripts/measure-construction.mts',
+        ],
         rules: {
-          // Effect 4 transports are experimental and pinned; match the compiler policy.
           'effecttsgo/unstable-api-usage': 'off',
         },
       },
       {
         files: ['src/http/errors.ts', 'src/rpc/errors.ts'],
         rules: {
-          // Each transport keeps its related tagged error family together.
           'eslint/max-classes-per-file': ['error', 4],
         },
       },
       {
-        files: ['src/{core,http,rpc}/types.ts'],
+        files: ['src/http/types.ts'],
+        rules: { 'typescript/no-redundant-type-constituents': 'off' },
+      },
+      {
+        files: ['src/{core,http,rpc}/types.ts', 'src/core/inference.ts'],
         rules: {
-          // void is part of Effect channel and no-payload RPC type contracts.
           'typescript/no-invalid-void-type': 'off',
-          // Type aliases and interfaces differ in structural Record assignability;
-          // preserve the published contract instead of enforcing one spelling.
           'typescript/consistent-type-definitions': 'off',
         },
       },
       {
         files: [
           'src/core/operation.ts',
+          'src/core/inference.ts',
+          'src/core/policy.ts',
           'src/core/schema-key.ts',
+          'src/core/streamed-query.ts',
           'src/core/utility-tree.ts',
           'src/http/operation.ts',
           'src/http/request.ts',
+          'src/http/streamed-query.ts',
           'src/rpc/operation.ts',
           'src/rpc/streamed-query.ts',
         ],
         rules: {
-          // These runtime adapters erase caller-defined schemas/options, then validate
-          // inputs with their declaration. A domain-specific replacement loses the
-          // generic public contract, which the packed compile-time fixtures verify.
           'anti-slop/no-unknown-parameters': 'off',
           'anti-slop/no-unknown-returns': 'off',
           'anti-slop/no-unsafe-dictionary-type': 'off',
@@ -261,8 +260,6 @@ export default defineConfig({
         },
       },
       typecheck: {
-        // Vite+ 1.0's --no-lint path reports typed rules without honoring suppressions.
-        // Keep lint active so typechecking uses the same policy as the normal check.
         command: 'vp check --no-fmt',
         dependsOn: ['pack'],
         cache: {
@@ -283,41 +280,44 @@ export default defineConfig({
           output: ['dist/**'],
         },
       },
-      'packed-package': {
-        command: [
-          'vp pm pack --pack-destination .artifacts -- --config.ignore-scripts=true',
-          'fallow dead-code --private-type-leaks --file dist/index.d.mts',
-          'vp run verify-packed-package',
-        ],
-        dependsOn: ['pack', 'skills-check'],
-        cache: {
-          output: ['.artifacts/*.tgz'],
-        },
-      },
-      'verify-packed-package': {
-        command: 'node scripts/verify-packed-consumer.mts',
-        cache: false,
-      },
       'skills-check': {
         command: 'intent validate skills --check',
-        cache: {
-          output: [],
-        },
+        cache: false,
       },
       fallow: {
         command: [
-          // Public barrel exports must be exercised by repository evidence.
-          'fallow dead-code --include-entry-exports',
-          // Test-only reachability must not hide dead shipped internals.
-          'fallow dead-code --production',
-          'fallow dupes',
-          'fallow health --hotspots --file-scores --min-score 75',
+          'fallow dead-code --no-cache --include-entry-exports',
+          'fallow dead-code --no-cache --production',
+          'fallow dupes --no-cache',
+          'fallow health --no-cache --hotspots --file-scores --min-score 75',
         ],
         cache: false,
       },
       test: {
         command: 'vp test',
+        dependsOn: ['pack', 'api-types', 'server-local-types'],
+        cache: {
+          env: ['RPC_TRANSPORT_MEASURE', 'STREAM_MEASURE'],
+          output: [],
+        },
+      },
+      'construction-baseline': {
+        command: 'tsx scripts/measure-construction.mts',
+        cache: false,
+      },
+      'api-types': {
+        command: [
+          'tsc --project tests/types/tsconfig.json',
+          'node node_modules/typescript-5.9/bin/tsc --project tests/types/tsconfig.json',
+        ],
         dependsOn: ['pack'],
+        cache: { output: [] },
+      },
+      'server-local-types': {
+        command: [
+          'tsc --project tests/fixtures/tsconfig.server-local.json',
+          'node node_modules/typescript-5.9/bin/tsc --project tests/fixtures/tsconfig.server-local.json',
+        ],
         cache: {
           output: [],
         },
@@ -325,18 +325,22 @@ export default defineConfig({
       e2e: {
         command: 'playwright test',
         cache: false,
+        dependsOn: applicationBuildTasks,
       },
       'e2e:chromium': {
         command: 'playwright test --project=chromium',
         cache: false,
+        dependsOn: applicationBuildTasks,
       },
       'e2e:firefox': {
         command: 'playwright test --project=firefox',
         cache: false,
+        dependsOn: applicationBuildTasks,
       },
       'e2e:webkit': {
         command: 'playwright test --project=webkit',
         cache: false,
+        dependsOn: applicationBuildTasks,
       },
       quality: {
         command: ['vp run check', 'vp run effect-check', 'vp run fallow', 'vp run test'],
@@ -401,6 +405,12 @@ export default defineConfig({
       'docs-e2e': {
         command: 'playwright test --config playwright.docs.config.ts',
         cache: false,
+        dependsOn:
+          Effect.runSync(
+            ConfigProvider.fromEnv({ preserveEmptyStrings: true }).load(['DOCS_BASE_URL']),
+          )?.value === undefined
+            ? ['docs-build']
+            : [],
       },
       'docs-preview': {
         command: 'vp run --filter @effect-api-query/docs preview',
@@ -415,7 +425,7 @@ export default defineConfig({
       validate: {
         command: [
           'vp run quality',
-          'vp run packed-package',
+          'vp run skills-check',
           'vp run vite-react-build',
           'vp run tanstack-start-build',
           'vp run docs-build',
@@ -426,7 +436,6 @@ export default defineConfig({
     },
   },
   staged: {
-    // Typed lint fixes need the full project context; formatting stays scoped to staged files.
     '*.{js,jsx,mjs,cjs,ts,tsx,mts,cts}': ['vp fmt', () => 'vp run --no-cache typecheck --fix'],
     '*.{json,jsonc,md,yaml,yml}': 'vp fmt',
   },