From 9b1513f7841c0f8c52f6a4c2c0682b7fecadb51b Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Sun, 2 Aug 2026 10:40:54 -0400
Subject: [PATCH 01/17] Incubate decentralized Convex inside Vera

---
 README.md                                     |   47 +-
 apps/web/.env.example                         |    4 +
 apps/web/README.md                            |   31 +
 apps/web/eslint.config.ts                     |   11 +
 apps/web/index.html                           |  208 --
 apps/web/package.json                         |   45 +-
 apps/web/src/auth-client.ts                   |   14 +
 apps/web/src/cloud/AuthForm.tsx               |  138 ++
 apps/web/src/cloud/AuthenticatedSession.tsx   |   64 +
 apps/web/src/cloud/ChatRoom.tsx               |   32 +
 apps/web/src/cloud/ChatSidebar.tsx            |   54 +
 apps/web/src/cloud/ConnectionDiagnostics.tsx  |   44 +
 apps/web/src/cloud/ConversationHeader.tsx     |   38 +
 apps/web/src/cloud/HomeServerSession.tsx      |   36 +
 apps/web/src/cloud/Message.tsx                |   27 +
 apps/web/src/cloud/MessageComposer.tsx        |   46 +
 apps/web/src/cloud/MessageList.tsx            |   28 +
 apps/web/src/cloud/ServerLoading.tsx          |   12 +
 apps/web/src/cloud/SessionGate.tsx            |   21 +
 apps/web/src/cloud/actor.tsx                  |   11 +
 apps/web/src/cloud/use-chat-room.ts           |   53 +
 apps/web/src/env.d.ts                         |   10 +
 .../tanstack-query/root-provider.tsx          |   18 +
 apps/web/src/live/config.ts                   |   40 +
 apps/web/src/live/queries.ts                  |   25 +
 apps/web/src/routeTree.gen.ts                 |   68 +
 apps/web/src/router.tsx                       |   35 +
 apps/web/src/routes/__root.tsx                |   24 +
 apps/web/src/routes/index.tsx                 |   23 +
 apps/web/src/server-picker/ServerPicker.tsx   |   46 +
 apps/web/src/shell/NotFound.tsx               |    9 +
 apps/web/src/shell/RootDocument.tsx           |   16 +
 apps/web/src/styles.css                       |  871 +++++++
 apps/web/tsconfig.json                        |   11 +
 apps/web/tsr.config.json                      |    3 +
 apps/web/vercel.json                          |   25 -
 apps/web/vite.config.ts                       |    7 +
 deps/.gitkeep                                 |    1 +
 package.json                                  |    2 +-
 .../eslint.config.ts                          |    0
 .../decentralized-convex-address/package.json |   31 +
 .../src/address.test.ts                       |   15 +
 .../src/address.ts                            |   40 +
 .../decentralized-convex-address/src/index.ts |    2 +
 .../tsconfig.json                             |    9 +
 .../eslint.config.ts                          |    5 +
 .../decentralized-convex-client/package.json  |   31 +
 .../src/client.test.ts                        |   97 +
 .../decentralized-convex-client/src/client.ts |   93 +
 .../src/connection.ts                         |   56 +
 .../decentralized-convex-client/src/index.ts  |   23 +
 .../src/observer.ts                           |   86 +
 .../src/snapshot.ts                           |   57 +
 .../src/targets.ts                            |   39 +
 .../decentralized-convex-client/src/types.ts  |  107 +
 .../decentralized-convex-client/tsconfig.json |    9 +
 .../eslint.config.ts                          |    6 +
 .../decentralized-convex-react/package.json   |   36 +
 .../decentralized-convex-react/src/index.ts   |    6 +
 .../src/provider.tsx                          |   40 +
 .../decentralized-convex-react/tsconfig.json  |    9 +
 .../eslint.config.ts                          |    5 +
 .../decentralized-convex-server/package.json  |   31 +
 .../src/descriptor.test.ts                    |   19 +
 .../src/descriptor.ts                         |   76 +
 .../decentralized-convex-server/src/index.ts  |   11 +
 .../decentralized-convex-server/tsconfig.json |    9 +
 .../eslint.config.ts                          |    6 +
 .../package.json                              |   38 +
 .../src/index.ts                              |    4 +
 .../src/options.ts                            |   24 +
 .../src/useFederatedQuery.ts                  |  102 +
 .../tsconfig.json                             |    9 +
 pnpm-lock.yaml                                | 2086 ++++++++++++++++-
 pnpm-workspace.yaml                           |    4 +
 services/backend/.env.example                 |    1 +
 services/backend/.gitignore                   |    2 +
 services/backend/README.md                    |   16 +
 services/backend/convex.json                  |    3 +
 services/backend/convex/_generated/api.d.ts   |   57 +
 services/backend/convex/_generated/api.js     |   23 +
 .../backend/convex/_generated/dataModel.d.ts  |   61 +
 .../backend/convex/_generated/server.d.ts     |  144 ++
 services/backend/convex/_generated/server.js  |   93 +
 services/backend/convex/auth.config.ts        |    8 +
 services/backend/convex/auth.ts               |   41 +
 services/backend/convex/convex.config.ts      |    7 +
 services/backend/convex/http.ts               |   23 +
 services/backend/convex/lib.ts                |   16 +
 services/backend/convex/messages.ts           |   59 +
 services/backend/convex/schema.ts             |   16 +
 services/backend/convex/tsconfig.json         |   20 +
 services/backend/eslint.config.ts             |    9 +
 services/backend/package.json                 |   34 +
 shared/app-config/eslint.config.ts            |    5 +
 {packages => shared}/app-config/package.json  |    0
 {packages => shared}/app-config/src/urls.ts   |    0
 {packages => shared}/app-config/tsconfig.json |    0
 {packages => shared}/ui/components.json       |    0
 {packages => shared}/ui/eslint.config.ts      |    0
 {packages => shared}/ui/package.json          |    0
 .../ui/src/components/alert-dialog.tsx        |    0
 .../ui/src/components/button.tsx              |    0
 .../ui/src/components/card.tsx                |    0
 .../ui/src/components/code-block.tsx          |    0
 .../ui/src/components/context-menu.tsx        |    0
 .../ui/src/components/dialog.tsx              |    0
 .../ui/src/components/drawer.tsx              |    0
 .../ui/src/components/dropdown-menu.tsx       |    0
 .../ui/src/components/hover-card.tsx          |    0
 .../ui/src/components/input.tsx               |    0
 .../ui/src/components/label.tsx               |    0
 .../ui/src/components/loader.tsx              |    0
 .../ui/src/components/markdown.tsx            |    0
 .../ui/src/components/popover.tsx             |    0
 .../ui/src/components/progress.tsx            |    0
 .../ui/src/components/scroll-area.tsx         |    0
 .../ui/src/components/select.tsx              |    0
 .../ui/src/components/separator.tsx           |    0
 .../ui/src/components/sheet.tsx               |    0
 .../ui/src/components/sidebar.tsx             |    0
 .../ui/src/components/skeleton.tsx            |    0
 .../ui/src/components/sonner.tsx              |    0
 .../ui/src/components/switch.tsx              |    0
 .../ui/src/components/tooltip.tsx             |    0
 .../ui/src/hooks/use-mobile.ts                |    0
 {packages => shared}/ui/src/lib/utils.ts      |    0
 {packages => shared}/ui/tsconfig.json         |    0
 turbo.json                                    |   12 +-
 129 files changed, 5760 insertions(+), 309 deletions(-)
 create mode 100644 apps/web/.env.example
 create mode 100644 apps/web/README.md
 create mode 100644 apps/web/eslint.config.ts
 delete mode 100644 apps/web/index.html
 create mode 100644 apps/web/src/auth-client.ts
 create mode 100644 apps/web/src/cloud/AuthForm.tsx
 create mode 100644 apps/web/src/cloud/AuthenticatedSession.tsx
 create mode 100644 apps/web/src/cloud/ChatRoom.tsx
 create mode 100644 apps/web/src/cloud/ChatSidebar.tsx
 create mode 100644 apps/web/src/cloud/ConnectionDiagnostics.tsx
 create mode 100644 apps/web/src/cloud/ConversationHeader.tsx
 create mode 100644 apps/web/src/cloud/HomeServerSession.tsx
 create mode 100644 apps/web/src/cloud/Message.tsx
 create mode 100644 apps/web/src/cloud/MessageComposer.tsx
 create mode 100644 apps/web/src/cloud/MessageList.tsx
 create mode 100644 apps/web/src/cloud/ServerLoading.tsx
 create mode 100644 apps/web/src/cloud/SessionGate.tsx
 create mode 100644 apps/web/src/cloud/actor.tsx
 create mode 100644 apps/web/src/cloud/use-chat-room.ts
 create mode 100644 apps/web/src/env.d.ts
 create mode 100644 apps/web/src/integrations/tanstack-query/root-provider.tsx
 create mode 100644 apps/web/src/live/config.ts
 create mode 100644 apps/web/src/live/queries.ts
 create mode 100644 apps/web/src/routeTree.gen.ts
 create mode 100644 apps/web/src/router.tsx
 create mode 100644 apps/web/src/routes/__root.tsx
 create mode 100644 apps/web/src/routes/index.tsx
 create mode 100644 apps/web/src/server-picker/ServerPicker.tsx
 create mode 100644 apps/web/src/shell/NotFound.tsx
 create mode 100644 apps/web/src/shell/RootDocument.tsx
 create mode 100644 apps/web/src/styles.css
 create mode 100644 apps/web/tsconfig.json
 create mode 100644 apps/web/tsr.config.json
 delete mode 100644 apps/web/vercel.json
 create mode 100644 apps/web/vite.config.ts
 create mode 100644 deps/.gitkeep
 rename packages/{app-config => decentralized-convex-address}/eslint.config.ts (100%)
 create mode 100644 packages/decentralized-convex-address/package.json
 create mode 100644 packages/decentralized-convex-address/src/address.test.ts
 create mode 100644 packages/decentralized-convex-address/src/address.ts
 create mode 100644 packages/decentralized-convex-address/src/index.ts
 create mode 100644 packages/decentralized-convex-address/tsconfig.json
 create mode 100644 packages/decentralized-convex-client/eslint.config.ts
 create mode 100644 packages/decentralized-convex-client/package.json
 create mode 100644 packages/decentralized-convex-client/src/client.test.ts
 create mode 100644 packages/decentralized-convex-client/src/client.ts
 create mode 100644 packages/decentralized-convex-client/src/connection.ts
 create mode 100644 packages/decentralized-convex-client/src/index.ts
 create mode 100644 packages/decentralized-convex-client/src/observer.ts
 create mode 100644 packages/decentralized-convex-client/src/snapshot.ts
 create mode 100644 packages/decentralized-convex-client/src/targets.ts
 create mode 100644 packages/decentralized-convex-client/src/types.ts
 create mode 100644 packages/decentralized-convex-client/tsconfig.json
 create mode 100644 packages/decentralized-convex-react/eslint.config.ts
 create mode 100644 packages/decentralized-convex-react/package.json
 create mode 100644 packages/decentralized-convex-react/src/index.ts
 create mode 100644 packages/decentralized-convex-react/src/provider.tsx
 create mode 100644 packages/decentralized-convex-react/tsconfig.json
 create mode 100644 packages/decentralized-convex-server/eslint.config.ts
 create mode 100644 packages/decentralized-convex-server/package.json
 create mode 100644 packages/decentralized-convex-server/src/descriptor.test.ts
 create mode 100644 packages/decentralized-convex-server/src/descriptor.ts
 create mode 100644 packages/decentralized-convex-server/src/index.ts
 create mode 100644 packages/decentralized-convex-server/tsconfig.json
 create mode 100644 packages/decentralized-convex-tanstack-query/eslint.config.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/package.json
 create mode 100644 packages/decentralized-convex-tanstack-query/src/index.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/src/options.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/tsconfig.json
 create mode 100644 services/backend/.env.example
 create mode 100644 services/backend/.gitignore
 create mode 100644 services/backend/README.md
 create mode 100644 services/backend/convex.json
 create mode 100644 services/backend/convex/_generated/api.d.ts
 create mode 100644 services/backend/convex/_generated/api.js
 create mode 100644 services/backend/convex/_generated/dataModel.d.ts
 create mode 100644 services/backend/convex/_generated/server.d.ts
 create mode 100644 services/backend/convex/_generated/server.js
 create mode 100644 services/backend/convex/auth.config.ts
 create mode 100644 services/backend/convex/auth.ts
 create mode 100644 services/backend/convex/convex.config.ts
 create mode 100644 services/backend/convex/http.ts
 create mode 100644 services/backend/convex/lib.ts
 create mode 100644 services/backend/convex/messages.ts
 create mode 100644 services/backend/convex/schema.ts
 create mode 100644 services/backend/convex/tsconfig.json
 create mode 100644 services/backend/eslint.config.ts
 create mode 100644 services/backend/package.json
 create mode 100644 shared/app-config/eslint.config.ts
 rename {packages => shared}/app-config/package.json (100%)
 rename {packages => shared}/app-config/src/urls.ts (100%)
 rename {packages => shared}/app-config/tsconfig.json (100%)
 rename {packages => shared}/ui/components.json (100%)
 rename {packages => shared}/ui/eslint.config.ts (100%)
 rename {packages => shared}/ui/package.json (100%)
 rename {packages => shared}/ui/src/components/alert-dialog.tsx (100%)
 rename {packages => shared}/ui/src/components/button.tsx (100%)
 rename {packages => shared}/ui/src/components/card.tsx (100%)
 rename {packages => shared}/ui/src/components/code-block.tsx (100%)
 rename {packages => shared}/ui/src/components/context-menu.tsx (100%)
 rename {packages => shared}/ui/src/components/dialog.tsx (100%)
 rename {packages => shared}/ui/src/components/drawer.tsx (100%)
 rename {packages => shared}/ui/src/components/dropdown-menu.tsx (100%)
 rename {packages => shared}/ui/src/components/hover-card.tsx (100%)
 rename {packages => shared}/ui/src/components/input.tsx (100%)
 rename {packages => shared}/ui/src/components/label.tsx (100%)
 rename {packages => shared}/ui/src/components/loader.tsx (100%)
 rename {packages => shared}/ui/src/components/markdown.tsx (100%)
 rename {packages => shared}/ui/src/components/popover.tsx (100%)
 rename {packages => shared}/ui/src/components/progress.tsx (100%)
 rename {packages => shared}/ui/src/components/scroll-area.tsx (100%)
 rename {packages => shared}/ui/src/components/select.tsx (100%)
 rename {packages => shared}/ui/src/components/separator.tsx (100%)
 rename {packages => shared}/ui/src/components/sheet.tsx (100%)
 rename {packages => shared}/ui/src/components/sidebar.tsx (100%)
 rename {packages => shared}/ui/src/components/skeleton.tsx (100%)
 rename {packages => shared}/ui/src/components/sonner.tsx (100%)
 rename {packages => shared}/ui/src/components/switch.tsx (100%)
 rename {packages => shared}/ui/src/components/tooltip.tsx (100%)
 rename {packages => shared}/ui/src/hooks/use-mobile.ts (100%)
 rename {packages => shared}/ui/src/lib/utils.ts (100%)
 rename {packages => shared}/ui/tsconfig.json (100%)

diff --git a/README.md b/README.md
index db19fc82..bd0eb25f 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,31 @@
-<a name="readme-top"></a>
+# Vera
 
-<br />
-<div align="center">
-  <img src="https://github.com/user-attachments/assets/c74389d4-faad-4af9-b4e0-d31115ea167f" alt="Animated GIF of advertisement for Vera, showing off its search capability." width="500px">
-  <br />
-  <br />
-  <br />
-  <br />
-  <a href="https://www.vera.chat" target="_blank">
-    vera.chat
-  </a>
-</div>
-<br />
-<br />
-<br />
-<div align="center">
+Vera is a decentralized messaging application built on independently hosted
+Convex deployments. The active application also serves as the real-world
+incubator for the decentralized Convex toolkit while its API is still changing
+quickly.
 
-A great starting point for building agentic applications for the web.
+## Workspace
 
-For more information, head over to the [docs](https://docs.vera.chat)
+- `apps/web` — the TanStack Start Vera client
+- `services/backend` — the Convex backend deployed to each Vera server
+- `packages/decentralized-convex-*` — reusable federation packages
+- `shared` — private code shared by Vera workspace projects
+- `deps` — source dependencies that Vera may need to maintain directly
+- `legacy` — the archived centralized Vera application
 
-<br />
-<br />
+The standalone decentralized-convex repository remains intact as a milestone.
+During incubation, changes are developed and exercised here without an npm
+publish/install cycle.
 
-[x.com/bentsignal](https://x.com/bentsignal)
+## Development
 
-<br />
+Install dependencies and start the active app:
 
-</div>
+```sh
+pnpm install
+pnpm --filter @vera/web dev
+```
+
+The web app runs at `http://localhost:5173`. Copy the checked-in environment
+examples before connecting different Convex deployments.
diff --git a/apps/web/.env.example b/apps/web/.env.example
new file mode 100644
index 00000000..bc86437f
--- /dev/null
+++ b/apps/web/.env.example
@@ -0,0 +1,4 @@
+VITE_HOME_A_CONVEX_URL=https://your-a-deployment.convex.cloud
+VITE_HOME_A_SITE_URL=https://your-a-deployment.convex.site
+VITE_HOME_B_CONVEX_URL=https://your-b-deployment.convex.cloud
+VITE_HOME_B_SITE_URL=https://your-b-deployment.convex.site
diff --git a/apps/web/README.md b/apps/web/README.md
new file mode 100644
index 00000000..f5a20dee
--- /dev/null
+++ b/apps/web/README.md
@@ -0,0 +1,31 @@
+# Vera web
+
+A TanStack Start messaging client that reads one conversation across independent
+Convex deployments.
+
+```sh
+pnpm --filter @vera/web dev
+```
+
+Open `http://localhost:5173` and:
+
+1. Choose a Convex deployment and create a username and password.
+2. Open a second tab.
+3. Choose the other deployment and create another account.
+4. Send messages in either tab.
+
+Each signup and outgoing message is stored only on the selected home
+deployment. Both tabs run the same federated query against both deployments and
+combine the results through TanStack Query.
+
+The account address is derived from the selected deployment, such as
+`alice@your-a-deployment.convex.cloud`. The user chooses only `alice`; the
+server owns the domain. Better Auth is used by this example, not required by the
+decentralized-convex packages.
+
+The checked-in `.env.example` documents the required deployment URLs. Deploy
+the same `convex/` backend to each target and set `SITE_URL` and
+`FEDERATION_DOMAIN` on each deployment. `FEDERATION_DOMAIN` must be the
+deployment's actual `.convex.cloud` hostname or its configured custom hostname.
+Reads are intentionally public in this auth-development room; portable
+private-read authorization is not implemented.
diff --git a/apps/web/eslint.config.ts b/apps/web/eslint.config.ts
new file mode 100644
index 00000000..d9d8cf1b
--- /dev/null
+++ b/apps/web/eslint.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+import { reactConfig } from "@acme/eslint-config/react";
+
+export default defineConfig(
+  { ignores: ["src/routeTree.gen.ts"] },
+  baseConfig,
+  strictConfig,
+  reactConfig,
+);
diff --git a/apps/web/index.html b/apps/web/index.html
deleted file mode 100644
index 9b390577..00000000
--- a/apps/web/index.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#f1eee7" />
-    <meta
-      name="description"
-      content="Vera is being rebuilt. Check back soon."
-    />
-    <link
-      rel="icon"
-      href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 64 64'%3E%3Ccircle cx='32' cy='32' r='24' fill='%23e04b2f'/%3E%3C/svg%3E"
-    />
-    <title>Vera — Rebuilding</title>
-    <style>
-      :root {
-        color-scheme: light;
-        font-family:
-          "Iowan Old Style", "Palatino Linotype", "Book Antiqua", Palatino,
-          serif;
-        color: #171713;
-        background: #f1eee7;
-        font-synthesis: none;
-        text-rendering: optimizeLegibility;
-      }
-
-      * {
-        box-sizing: border-box;
-      }
-
-      html,
-      body {
-        min-height: 100%;
-        margin: 0;
-      }
-
-      body {
-        min-height: 100svh;
-        overflow: hidden;
-      }
-
-      body::before {
-        position: fixed;
-        inset: 0;
-        z-index: 2;
-        pointer-events: none;
-        content: "";
-        opacity: 0.16;
-        background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 180 180' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.92' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)' opacity='.18'/%3E%3C/svg%3E");
-        mix-blend-mode: multiply;
-      }
-
-      main {
-        position: relative;
-        display: grid;
-        min-height: 100svh;
-        place-items: center;
-        padding: clamp(1.5rem, 5vw, 5rem);
-        isolation: isolate;
-      }
-
-      .halo {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: min(74vw, 54rem);
-        aspect-ratio: 1;
-        border: 1px solid rgb(23 23 19 / 14%);
-        border-radius: 50%;
-        transform: translate(-50%, -50%);
-        animation: breathe 8s ease-in-out infinite;
-      }
-
-      .halo::before,
-      .halo::after {
-        position: absolute;
-        border-radius: inherit;
-        content: "";
-      }
-
-      .halo::before {
-        inset: 8%;
-        border: 1px solid rgb(23 23 19 / 8%);
-      }
-
-      .halo::after {
-        inset: 20%;
-        background: radial-gradient(
-          circle at 46% 42%,
-          rgb(255 255 255 / 66%),
-          rgb(233 226 211 / 22%) 57%,
-          transparent 72%
-        );
-        box-shadow: inset 0 0 5rem rgb(255 255 255 / 38%);
-      }
-
-      .message {
-        position: relative;
-        z-index: 1;
-        width: min(100%, 42rem);
-        text-align: center;
-        animation: arrive 1.2s cubic-bezier(0.2, 0.8, 0.2, 1) both;
-      }
-
-      .eyebrow {
-        margin: 0 0 1.4rem;
-        font-family: ui-monospace, "SFMono-Regular", Consolas, monospace;
-        font-size: 0.68rem;
-        font-weight: 500;
-        letter-spacing: 0.24em;
-        line-height: 1;
-        text-transform: uppercase;
-      }
-
-      h1 {
-        margin: 0;
-        font-size: clamp(4.5rem, 16vw, 10rem);
-        font-weight: 400;
-        letter-spacing: -0.075em;
-        line-height: 0.82;
-      }
-
-      p {
-        max-width: 25rem;
-        margin: 2.5rem auto 0;
-        font-size: clamp(1.05rem, 2vw, 1.3rem);
-        letter-spacing: -0.015em;
-        line-height: 1.5;
-      }
-
-      .mark {
-        display: inline-block;
-        width: 0.42em;
-        height: 0.42em;
-        margin-left: 0.12em;
-        border-radius: 50%;
-        vertical-align: 0.08em;
-        background: #e04b2f;
-      }
-
-      footer {
-        position: absolute;
-        right: clamp(1.5rem, 5vw, 5rem);
-        bottom: clamp(1.5rem, 4vw, 3.5rem);
-        left: clamp(1.5rem, 5vw, 5rem);
-        display: flex;
-        justify-content: space-between;
-        font-family: ui-monospace, "SFMono-Regular", Consolas, monospace;
-        font-size: 0.62rem;
-        letter-spacing: 0.16em;
-        line-height: 1;
-        text-transform: uppercase;
-      }
-
-      @keyframes arrive {
-        from {
-          opacity: 0;
-          transform: translateY(1.2rem);
-        }
-      }
-
-      @keyframes breathe {
-        0%,
-        100% {
-          opacity: 0.72;
-          transform: translate(-50%, -50%) scale(0.985);
-        }
-
-        50% {
-          opacity: 1;
-          transform: translate(-50%, -50%) scale(1.015);
-        }
-      }
-
-      @media (max-width: 36rem) {
-        .halo {
-          width: 112vw;
-        }
-
-        footer span:last-child {
-          display: none;
-        }
-      }
-
-      @media (prefers-reduced-motion: reduce) {
-        .halo,
-        .message {
-          animation: none;
-        }
-      }
-    </style>
-  </head>
-  <body>
-    <main>
-      <div class="halo" aria-hidden="true"></div>
-      <section class="message" aria-labelledby="title">
-        <div class="eyebrow">A brief intermission</div>
-        <h1 id="title">Vera<span class="mark" aria-hidden="true"></span></h1>
-        <p>Vera is being rebuilt. Check back soon.</p>
-      </section>
-      <footer aria-hidden="true">
-        <span>Still thinking</span>
-        <span>vera.chat</span>
-      </footer>
-    </main>
-  </body>
-</html>
diff --git a/apps/web/package.json b/apps/web/package.json
index dc1603d7..07250b80 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,23 +1,50 @@
 {
-  "name": "@acme/web",
+  "name": "@vera/web",
   "version": "0.1.0",
   "private": true,
   "type": "module",
+  "imports": {
+    "#/*": "./src/*"
+  },
   "scripts": {
     "build": "vite build",
-    "dev": "portless",
-    "dev:app": "vite",
-    "preview": "vite preview",
+    "clean": "git clean -xdf .cache .turbo .output node_modules",
+    "dev": "vite --port 5173 --strictPort",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "format:fix": "prettier --write . --ignore-path ../../.gitignore",
-    "clean": "git clean -xdf node_modules .cache .turbo dist"
+    "generate-routes": "tsr generate",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "preview": "vite preview",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@convex-dev/better-auth": "0.12.5",
+    "@decentralized-convex/client": "workspace:*",
+    "@decentralized-convex/react": "workspace:*",
+    "@decentralized-convex/tanstack-query": "workspace:*",
+    "@tanstack/react-query": "catalog:",
+    "@tanstack/react-router": "catalog:",
+    "@tanstack/react-router-ssr-query": "catalog:",
+    "@tanstack/react-start": "catalog:",
+    "@vera/backend": "workspace:*",
+    "better-auth": "~1.6.15",
+    "convex": "catalog:",
+    "react": "catalog:react19",
+    "react-dom": "catalog:react19"
   },
   "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@tanstack/router-cli": "catalog:",
+    "@types/node": "catalog:",
+    "@types/react": "catalog:react19",
+    "@types/react-dom": "catalog:react19",
+    "@vitejs/plugin-react": "catalog:",
+    "eslint": "catalog:",
     "prettier": "catalog:",
+    "typescript": "catalog:",
     "vite": "catalog:"
   },
-  "portless": {
-    "name": "www.vera",
-    "script": "dev:app"
-  }
+  "prettier": "@acme/prettier-config"
 }
diff --git a/apps/web/src/auth-client.ts b/apps/web/src/auth-client.ts
new file mode 100644
index 00000000..e9d83a83
--- /dev/null
+++ b/apps/web/src/auth-client.ts
@@ -0,0 +1,14 @@
+import {
+  convexClient,
+  crossDomainClient,
+} from "@convex-dev/better-auth/client/plugins";
+import { createAuthClient } from "better-auth/react";
+
+export function createHomeAuthClient(siteUrl: string) {
+  return createAuthClient({
+    baseURL: siteUrl,
+    plugins: [convexClient(), crossDomainClient()],
+  });
+}
+
+export type HomeAuthClient = ReturnType<typeof createHomeAuthClient>;
diff --git a/apps/web/src/cloud/AuthForm.tsx b/apps/web/src/cloud/AuthForm.tsx
new file mode 100644
index 00000000..6e2cac92
--- /dev/null
+++ b/apps/web/src/cloud/AuthForm.tsx
@@ -0,0 +1,138 @@
+import type { FormEvent } from "react";
+import { useState } from "react";
+
+import type { HomeAuthClient } from "../auth-client.ts";
+import type { HomeServer } from "../live/config.ts";
+
+interface AuthFormProps {
+  authClient: HomeAuthClient;
+  home: HomeServer;
+  onChooseServer: () => void;
+}
+
+export function AuthForm(props: AuthFormProps) {
+  const form = useAuthForm(props);
+  const isSignUp = form.mode === "sign-up";
+
+  return (
+    <main className="account-shell">
+      <section className="account-panel auth-panel">
+        <button
+          className="text-button back-button"
+          onClick={props.onChooseServer}
+          type="button"
+        >
+          ← Servers
+        </button>
+        <header className="account-header">
+          <span className="app-icon" aria-hidden="true">
+            V
+          </span>
+          <div>
+            <h1>{isSignUp ? "Create account" : "Sign in"}</h1>
+            <p>{props.home.domain}</p>
+          </div>
+        </header>
+        <form onSubmit={(event) => void form.submit(event)}>
+          <label>
+            Username
+            <span className="address-input">
+              <input
+                autoCapitalize="none"
+                autoComplete="username"
+                autoCorrect="off"
+                maxLength={32}
+                onChange={(event) => form.setUsername(event.target.value)}
+                placeholder="username"
+                required
+                spellCheck={false}
+                value={form.username}
+              />
+              <span>@{props.home.domain}</span>
+            </span>
+          </label>
+          <label>
+            Password
+            <input
+              autoComplete={isSignUp ? "new-password" : "current-password"}
+              minLength={8}
+              onChange={(event) => form.setPassword(event.target.value)}
+              required
+              type="password"
+              value={form.password}
+            />
+          </label>
+          {form.error === undefined ? null : (
+            <p className="auth-error">{form.error}</p>
+          )}
+          <button
+            className="primary-button"
+            disabled={form.submitting}
+            type="submit"
+          >
+            {form.submitting
+              ? "Please wait…"
+              : isSignUp
+                ? "Create account"
+                : "Sign in"}
+          </button>
+        </form>
+        <button
+          className="text-button auth-mode"
+          onClick={form.toggleMode}
+          type="button"
+        >
+          {isSignUp
+            ? "Already registered here? Sign in"
+            : "Need an account? Sign up"}
+        </button>
+      </section>
+    </main>
+  );
+}
+
+function useAuthForm({ authClient, home }: AuthFormProps) {
+  const [error, setError] = useState<string>();
+  const [mode, setMode] = useState<"sign-in" | "sign-up">("sign-up");
+  const [password, setPassword] = useState("");
+  const [submitting, setSubmitting] = useState(false);
+  const [username, setUsername] = useState("");
+
+  async function submit(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    setError(undefined);
+    const normalized = username.trim().toLowerCase();
+    if (!/^[a-z0-9][a-z0-9._-]{1,31}$/.test(normalized)) {
+      setError(
+        "Use 2–32 lowercase letters, numbers, dots, dashes, or underscores.",
+      );
+      return;
+    }
+
+    setSubmitting(true);
+    try {
+      const email = `${normalized}@${home.domain}`;
+      const result =
+        mode === "sign-up"
+          ? await authClient.signUp.email({ email, name: normalized, password })
+          : await authClient.signIn.email({ email, password });
+      if (result.error !== null) {
+        setError(result.error.message ?? "Authentication failed");
+      }
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  return {
+    error,
+    mode,
+    password,
+    setPassword,
+    setUsername,
+    submit,
+    submitting,
+    toggleMode: () => setMode(mode === "sign-in" ? "sign-up" : "sign-in"),
+    username,
+  };
+}
diff --git a/apps/web/src/cloud/AuthenticatedSession.tsx b/apps/web/src/cloud/AuthenticatedSession.tsx
new file mode 100644
index 00000000..13b8d84b
--- /dev/null
+++ b/apps/web/src/cloud/AuthenticatedSession.tsx
@@ -0,0 +1,64 @@
+import { useEffect, useState } from "react";
+import { DecentralizedConvexClient } from "@decentralized-convex/client";
+import {
+  DecentralizedConvexProvider,
+  useQuery,
+} from "@decentralized-convex/react";
+import { api } from "@vera/backend/api";
+
+import type { HomeAuthClient } from "../auth-client.ts";
+import type { HomeServer } from "../live/config.ts";
+import { ChatRoom } from "./ChatRoom.tsx";
+import { ServerLoading } from "./ServerLoading.tsx";
+
+interface AuthenticatedSessionProps {
+  authClient: HomeAuthClient;
+  home: HomeServer;
+  onChooseServer: () => void;
+}
+
+export function AuthenticatedSession(props: AuthenticatedSessionProps) {
+  const user = useQuery(api.auth.currentUser);
+  const client = useFederationClient(props.authClient, props.home);
+
+  if (user === undefined || user === null || client === undefined) {
+    return <ServerLoading home={props.home} />;
+  }
+
+  return (
+    <DecentralizedConvexProvider client={client}>
+      <ChatRoom
+        home={props.home}
+        onChooseServer={props.onChooseServer}
+        onSignOut={() => props.authClient.signOut()}
+        user={user}
+      />
+    </DecentralizedConvexProvider>
+  );
+}
+
+function useFederationClient(authClient: HomeAuthClient, home: HomeServer) {
+  const [client, setClient] = useState<DecentralizedConvexClient>();
+
+  useEffect(() => {
+    let active = true;
+    const nextClient = new DecentralizedConvexClient({
+      getAuthToken: async ({ url }) => {
+        if (url !== home.convexUrl) return null;
+        const token = await authClient.convex.token({
+          fetchOptions: { throw: false },
+        });
+        return token.data?.token ?? null;
+      },
+    });
+    queueMicrotask(() => {
+      if (active) setClient(nextClient);
+    });
+    return () => {
+      active = false;
+      void nextClient.close();
+    };
+  }, [authClient, home.convexUrl]);
+
+  return client;
+}
diff --git a/apps/web/src/cloud/ChatRoom.tsx b/apps/web/src/cloud/ChatRoom.tsx
new file mode 100644
index 00000000..999016b3
--- /dev/null
+++ b/apps/web/src/cloud/ChatRoom.tsx
@@ -0,0 +1,32 @@
+import type { HomeServer } from "../live/config.ts";
+import { ChatSidebar } from "./ChatSidebar.tsx";
+import { ConversationHeader } from "./ConversationHeader.tsx";
+import { MessageComposer } from "./MessageComposer.tsx";
+import { MessageList } from "./MessageList.tsx";
+import { useChatRoom } from "./use-chat-room.ts";
+
+interface CurrentUser {
+  actor: string;
+}
+
+interface ChatRoomProps {
+  home: HomeServer;
+  onChooseServer: () => void;
+  onSignOut: () => Promise<unknown>;
+  user: CurrentUser;
+}
+
+export function ChatRoom(props: ChatRoomProps) {
+  const chat = useChatRoom({ home: props.home, user: props.user });
+
+  return (
+    <main className="chat-app">
+      <ChatSidebar {...props} />
+      <section className="conversation-panel">
+        <ConversationHeader home={props.home} messages={chat.messages} />
+        <MessageList home={props.home} messages={chat.messages} />
+        <MessageComposer {...chat.composer} />
+      </section>
+    </main>
+  );
+}
diff --git a/apps/web/src/cloud/ChatSidebar.tsx b/apps/web/src/cloud/ChatSidebar.tsx
new file mode 100644
index 00000000..3a10096d
--- /dev/null
+++ b/apps/web/src/cloud/ChatSidebar.tsx
@@ -0,0 +1,54 @@
+import type { HomeServer } from "../live/config.ts";
+import { ActorAvatar, actorUsername } from "./actor.tsx";
+
+interface ChatSidebarProps {
+  home: HomeServer;
+  onChooseServer: () => void;
+  onSignOut: () => Promise<unknown>;
+  user: { actor: string };
+}
+
+export function ChatSidebar({
+  home,
+  onChooseServer,
+  onSignOut,
+  user,
+}: ChatSidebarProps) {
+  return (
+    <aside className="sidebar">
+      <div className="sidebar-title">
+        <span className="app-icon" aria-hidden="true">
+          V
+        </span>
+        <div>
+          <strong>Vera</strong>
+          <small>Federated messaging</small>
+        </div>
+      </div>
+      <nav className="room-list" aria-label="Rooms">
+        <span>Rooms</span>
+        <button aria-current="page" type="button">
+          <span>#</span> general
+        </button>
+      </nav>
+      <div className="sidebar-account">
+        <ActorAvatar actor={user.actor} />
+        <div className="account-address">
+          <strong>{actorUsername(user.actor)}</strong>
+          <small>@{home.domain}</small>
+        </div>
+        <details className="account-menu">
+          <summary aria-label="Account options">•••</summary>
+          <div>
+            <button onClick={onChooseServer} type="button">
+              Change server
+            </button>
+            <button onClick={() => void onSignOut()} type="button">
+              Sign out
+            </button>
+          </div>
+        </details>
+      </div>
+    </aside>
+  );
+}
diff --git a/apps/web/src/cloud/ConnectionDiagnostics.tsx b/apps/web/src/cloud/ConnectionDiagnostics.tsx
new file mode 100644
index 00000000..dccb91f2
--- /dev/null
+++ b/apps/web/src/cloud/ConnectionDiagnostics.tsx
@@ -0,0 +1,44 @@
+import type { HomeServer } from "../live/config.ts";
+import type { FederationSource } from "./ConversationHeader.tsx";
+
+interface ConnectionDiagnosticsProps {
+  home: HomeServer;
+  sources: readonly FederationSource[];
+}
+
+export function ConnectionDiagnostics({
+  home,
+  sources,
+}: ConnectionDiagnosticsProps) {
+  return (
+    <details className="diagnostics">
+      <summary>Debug</summary>
+      <div className="diagnostics-panel">
+        <strong>Connections</strong>
+        <div className="diagnostic-sources">
+          {sources.map((source) => (
+            <div key={source.target.url}>
+              <span data-status={source.status} />
+              <code>{new URL(source.target.url).hostname}</code>
+              <small>{source.status}</small>
+            </div>
+          ))}
+        </div>
+        <dl>
+          <div>
+            <dt>Write target</dt>
+            <dd>{home.domain}</dd>
+          </div>
+          <div>
+            <dt>Local auth</dt>
+            <dd>Better Auth</dd>
+          </div>
+          <div>
+            <dt>Remote reads</dt>
+            <dd>Public during federation development</dd>
+          </div>
+        </dl>
+      </div>
+    </details>
+  );
+}
diff --git a/apps/web/src/cloud/ConversationHeader.tsx b/apps/web/src/cloud/ConversationHeader.tsx
new file mode 100644
index 00000000..ee24ad95
--- /dev/null
+++ b/apps/web/src/cloud/ConversationHeader.tsx
@@ -0,0 +1,38 @@
+import type { HomeServer } from "../live/config.ts";
+import { ConnectionDiagnostics } from "./ConnectionDiagnostics.tsx";
+
+export interface FederationSource {
+  status: string;
+  target: { ids: readonly string[]; url: string };
+}
+
+interface ConversationHeaderProps {
+  home: HomeServer;
+  messages: {
+    federation: { sources: readonly FederationSource[]; status: string };
+  };
+}
+
+export function ConversationHeader({
+  home,
+  messages,
+}: ConversationHeaderProps) {
+  const { sources, status } = messages.federation;
+  const live = sources.filter((source) => source.status === "live").length;
+
+  return (
+    <header className="channel-header">
+      <div>
+        <h1># general</h1>
+        <p>Messages from every participant's home server</p>
+      </div>
+      <div className="channel-actions">
+        <span className="connection-summary" data-status={status}>
+          <span />
+          {live}/{sources.length} connected
+        </span>
+        <ConnectionDiagnostics home={home} sources={sources} />
+      </div>
+    </header>
+  );
+}
diff --git a/apps/web/src/cloud/HomeServerSession.tsx b/apps/web/src/cloud/HomeServerSession.tsx
new file mode 100644
index 00000000..a3f4e2ce
--- /dev/null
+++ b/apps/web/src/cloud/HomeServerSession.tsx
@@ -0,0 +1,36 @@
+import type { AuthClient } from "@convex-dev/better-auth/react";
+import { useState } from "react";
+import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
+import { ConvexReactClient } from "convex/react";
+
+import type { HomeServer } from "../live/config.ts";
+import { createHomeAuthClient } from "../auth-client.ts";
+import { SessionGate } from "./SessionGate.tsx";
+
+interface HomeServerSessionProps {
+  home: HomeServer;
+  onChooseServer: () => void;
+}
+
+export function HomeServerSession({
+  home,
+  onChooseServer,
+}: HomeServerSessionProps) {
+  const [authClient] = useState(() => createHomeAuthClient(home.siteUrl));
+  const [convex] = useState(
+    () => new ConvexReactClient(home.convexUrl, { expectAuth: true }),
+  );
+  // The provider's exported union loses the concrete plugin inference from createAuthClient.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const providerAuthClient = authClient as unknown as AuthClient;
+
+  return (
+    <ConvexBetterAuthProvider authClient={providerAuthClient} client={convex}>
+      <SessionGate
+        authClient={authClient}
+        home={home}
+        onChooseServer={onChooseServer}
+      />
+    </ConvexBetterAuthProvider>
+  );
+}
diff --git a/apps/web/src/cloud/Message.tsx b/apps/web/src/cloud/Message.tsx
new file mode 100644
index 00000000..da5f4b38
--- /dev/null
+++ b/apps/web/src/cloud/Message.tsx
@@ -0,0 +1,27 @@
+import type { ChatMessage } from "../live/queries.ts";
+import { ActorAvatar, actorUsername } from "./actor.tsx";
+
+export function Message({ message }: { message: ChatMessage }) {
+  return (
+    <article className="message">
+      <ActorAvatar actor={message.author} />
+      <div>
+        <header>
+          <strong>{actorUsername(message.author)}</strong>
+          <span>@{message.origin}</span>
+          <time dateTime={new Date(message.sentAt).toISOString()}>
+            {formatTime(message.sentAt)}
+          </time>
+        </header>
+        <p>{message.body}</p>
+      </div>
+    </article>
+  );
+}
+
+function formatTime(timestamp: number) {
+  return new Intl.DateTimeFormat("en", {
+    hour: "numeric",
+    minute: "2-digit",
+  }).format(timestamp);
+}
diff --git a/apps/web/src/cloud/MessageComposer.tsx b/apps/web/src/cloud/MessageComposer.tsx
new file mode 100644
index 00000000..c6eb0ac1
--- /dev/null
+++ b/apps/web/src/cloud/MessageComposer.tsx
@@ -0,0 +1,46 @@
+import type { FormEvent } from "react";
+
+interface MessageComposerProps {
+  draft: string;
+  error?: string;
+  sending: boolean;
+  setDraft: (draft: string) => void;
+  submit: (event: FormEvent<HTMLFormElement>) => Promise<void>;
+}
+
+export function MessageComposer({
+  draft,
+  error,
+  sending,
+  setDraft,
+  submit,
+}: MessageComposerProps) {
+  return (
+    <form className="composer" onSubmit={(event) => void submit(event)}>
+      <label>
+        <span className="sr-only">Message #general</span>
+        <textarea
+          maxLength={4_000}
+          onChange={(event) => setDraft(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === "Enter" && !event.shiftKey) {
+              event.preventDefault();
+              event.currentTarget.form?.requestSubmit();
+            }
+          }}
+          placeholder="Message #general"
+          rows={1}
+          value={draft}
+        />
+      </label>
+      <button
+        aria-label="Send message"
+        disabled={draft.trim().length === 0 || sending}
+        type="submit"
+      >
+        Send
+      </button>
+      {error === undefined ? null : <p className="composer-error">{error}</p>}
+    </form>
+  );
+}
diff --git a/apps/web/src/cloud/MessageList.tsx b/apps/web/src/cloud/MessageList.tsx
new file mode 100644
index 00000000..77bda0c5
--- /dev/null
+++ b/apps/web/src/cloud/MessageList.tsx
@@ -0,0 +1,28 @@
+import type { HomeServer } from "../live/config.ts";
+import type { ChatMessage } from "../live/queries.ts";
+import { Message } from "./Message.tsx";
+
+interface MessageListProps {
+  home: HomeServer;
+  messages: { data?: readonly ChatMessage[]; isPending: boolean };
+}
+
+export function MessageList({ home, messages }: MessageListProps) {
+  return (
+    <div className="message-list" aria-live="polite">
+      {messages.isPending ? (
+        <p className="empty-state">Connecting to participant servers…</p>
+      ) : null}
+      {messages.data?.length === 0 ? (
+        <div className="empty-state">
+          <span>#</span>
+          <strong>No messages yet</strong>
+          <p>Start the conversation from {home.domain}.</p>
+        </div>
+      ) : null}
+      {messages.data?.map((message) => (
+        <Message key={message.eventId} message={message} />
+      ))}
+    </div>
+  );
+}
diff --git a/apps/web/src/cloud/ServerLoading.tsx b/apps/web/src/cloud/ServerLoading.tsx
new file mode 100644
index 00000000..0716aa64
--- /dev/null
+++ b/apps/web/src/cloud/ServerLoading.tsx
@@ -0,0 +1,12 @@
+import type { HomeServer } from "../live/config.ts";
+
+export function ServerLoading({ home }: { home: HomeServer }) {
+  return (
+    <main className="account-shell">
+      <section className="account-panel loading-panel">
+        <span className="loading-dot" />
+        <p>Connecting to {home.domain}</p>
+      </section>
+    </main>
+  );
+}
diff --git a/apps/web/src/cloud/SessionGate.tsx b/apps/web/src/cloud/SessionGate.tsx
new file mode 100644
index 00000000..1db5464c
--- /dev/null
+++ b/apps/web/src/cloud/SessionGate.tsx
@@ -0,0 +1,21 @@
+import { useConvexAuth } from "convex/react";
+
+import type { HomeAuthClient } from "../auth-client.ts";
+import type { HomeServer } from "../live/config.ts";
+import { AuthenticatedSession } from "./AuthenticatedSession.tsx";
+import { AuthForm } from "./AuthForm.tsx";
+import { ServerLoading } from "./ServerLoading.tsx";
+
+interface SessionGateProps {
+  authClient: HomeAuthClient;
+  home: HomeServer;
+  onChooseServer: () => void;
+}
+
+export function SessionGate(props: SessionGateProps) {
+  const { isAuthenticated, isLoading } = useConvexAuth();
+
+  if (isLoading) return <ServerLoading home={props.home} />;
+  if (!isAuthenticated) return <AuthForm {...props} />;
+  return <AuthenticatedSession {...props} />;
+}
diff --git a/apps/web/src/cloud/actor.tsx b/apps/web/src/cloud/actor.tsx
new file mode 100644
index 00000000..0410c160
--- /dev/null
+++ b/apps/web/src/cloud/actor.tsx
@@ -0,0 +1,11 @@
+export function ActorAvatar({ actor }: { actor: string }) {
+  return (
+    <span className="avatar" aria-hidden="true">
+      {actorUsername(actor).slice(0, 2).toUpperCase()}
+    </span>
+  );
+}
+
+export function actorUsername(actor: string) {
+  return actor.split("@")[0] ?? actor;
+}
diff --git a/apps/web/src/cloud/use-chat-room.ts b/apps/web/src/cloud/use-chat-room.ts
new file mode 100644
index 00000000..16ebeb51
--- /dev/null
+++ b/apps/web/src/cloud/use-chat-room.ts
@@ -0,0 +1,53 @@
+import type { FormEvent } from "react";
+import { useState } from "react";
+import { useDecentralizedConvex } from "@decentralized-convex/react";
+import { useFederatedQuery } from "@decentralized-convex/tanstack-query";
+import { api } from "@vera/backend/api";
+
+import type { HomeServer } from "../live/config.ts";
+import { conversation } from "../live/config.ts";
+import { messagesQueryOptions } from "../live/queries.ts";
+
+interface UseChatRoomOptions {
+  home: HomeServer;
+  user: { actor: string };
+}
+
+export function useChatRoom({ home, user }: UseChatRoomOptions) {
+  const client = useDecentralizedConvex();
+  const messages = useFederatedQuery(messagesQueryOptions());
+  const [draft, setDraft] = useState("");
+  const [error, setError] = useState<string>();
+  const [sending, setSending] = useState(false);
+
+  async function send(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    const body = draft.trim();
+    if (body.length === 0 || sending) return;
+
+    setError(undefined);
+    setSending(true);
+    try {
+      await client.mutation(
+        { id: user.actor, url: home.convexUrl },
+        api.messages.send,
+        {
+          body,
+          eventId: crypto.randomUUID(),
+          roomId: conversation.id,
+          sentAt: Date.now(),
+        },
+      );
+      setDraft("");
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "Message failed");
+    } finally {
+      setSending(false);
+    }
+  }
+
+  return {
+    composer: { draft, error, sending, setDraft, submit: send },
+    messages,
+  };
+}
diff --git a/apps/web/src/env.d.ts b/apps/web/src/env.d.ts
new file mode 100644
index 00000000..7b588745
--- /dev/null
+++ b/apps/web/src/env.d.ts
@@ -0,0 +1,10 @@
+interface ImportMetaEnv {
+  readonly VITE_HOME_A_CONVEX_URL: string;
+  readonly VITE_HOME_A_SITE_URL: string;
+  readonly VITE_HOME_B_CONVEX_URL: string;
+  readonly VITE_HOME_B_SITE_URL: string;
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
diff --git a/apps/web/src/integrations/tanstack-query/root-provider.tsx b/apps/web/src/integrations/tanstack-query/root-provider.tsx
new file mode 100644
index 00000000..c438c10d
--- /dev/null
+++ b/apps/web/src/integrations/tanstack-query/root-provider.tsx
@@ -0,0 +1,18 @@
+import type { PropsWithChildren } from "react";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+
+export function getContext() {
+  return { queryClient: new QueryClient() };
+}
+
+export interface RootProviderProps extends PropsWithChildren {
+  context: ReturnType<typeof getContext>;
+}
+
+export function RootProvider({ children, context }: RootProviderProps) {
+  return (
+    <QueryClientProvider client={context.queryClient}>
+      {children}
+    </QueryClientProvider>
+  );
+}
diff --git a/apps/web/src/live/config.ts b/apps/web/src/live/config.ts
new file mode 100644
index 00000000..70d98ac7
--- /dev/null
+++ b/apps/web/src/live/config.ts
@@ -0,0 +1,40 @@
+export interface HomeServer {
+  convexUrl: string;
+  domain: string;
+  id: "a" | "b";
+  siteUrl: string;
+}
+
+export const homes: readonly HomeServer[] = [
+  createHome(
+    "a",
+    import.meta.env.VITE_HOME_A_CONVEX_URL,
+    import.meta.env.VITE_HOME_A_SITE_URL,
+  ),
+  createHome(
+    "b",
+    import.meta.env.VITE_HOME_B_CONVEX_URL,
+    import.meta.env.VITE_HOME_B_SITE_URL,
+  ),
+];
+
+export const conversation = {
+  id: "room:general",
+  targets: homes.map((home) => ({
+    id: `member@${home.domain}`,
+    url: home.convexUrl,
+  })),
+};
+
+function createHome(
+  id: HomeServer["id"],
+  convexUrl: string,
+  siteUrl: string,
+): HomeServer {
+  return {
+    convexUrl,
+    domain: new URL(convexUrl).hostname,
+    id,
+    siteUrl,
+  };
+}
diff --git a/apps/web/src/live/queries.ts b/apps/web/src/live/queries.ts
new file mode 100644
index 00000000..19214d61
--- /dev/null
+++ b/apps/web/src/live/queries.ts
@@ -0,0 +1,25 @@
+import type { FunctionReturnType } from "convex/server";
+import { federatedQueryOptions } from "@decentralized-convex/tanstack-query";
+import { api } from "@vera/backend/api";
+
+import { conversation } from "./config.ts";
+
+export type ChatMessage = FunctionReturnType<typeof api.messages.list>[number];
+
+export function messagesQueryOptions() {
+  return federatedQueryOptions({
+    args: { roomId: conversation.id },
+    combine: (sources) =>
+      combineMessages(sources.flatMap((source) => source.data)),
+    query: api.messages.list,
+    queryKey: ["messages", conversation.id],
+    targets: conversation.targets,
+  });
+}
+
+function combineMessages(messages: readonly ChatMessage[]) {
+  const byId = new Map(messages.map((message) => [message.eventId, message]));
+  return [...byId.values()].sort(
+    (a, b) => a.sentAt - b.sentAt || a.eventId.localeCompare(b.eventId),
+  );
+}
diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts
new file mode 100644
index 00000000..dceedffd
--- /dev/null
+++ b/apps/web/src/routeTree.gen.ts
@@ -0,0 +1,68 @@
+/* eslint-disable */
+
+// @ts-nocheck
+
+// noinspection JSUnusedGlobalSymbols
+
+// This file was automatically generated by TanStack Router.
+// You should NOT make any changes in this file as it will be overwritten.
+// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
+
+import { Route as rootRouteImport } from './routes/__root'
+import { Route as IndexRouteImport } from './routes/index'
+
+const IndexRoute = IndexRouteImport.update({
+  id: '/',
+  path: '/',
+  getParentRoute: () => rootRouteImport,
+} as any)
+
+export interface FileRoutesByFullPath {
+  '/': typeof IndexRoute
+}
+export interface FileRoutesByTo {
+  '/': typeof IndexRoute
+}
+export interface FileRoutesById {
+  __root__: typeof rootRouteImport
+  '/': typeof IndexRoute
+}
+export interface FileRouteTypes {
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths: '/'
+  fileRoutesByTo: FileRoutesByTo
+  to: '/'
+  id: '__root__' | '/'
+  fileRoutesById: FileRoutesById
+}
+export interface RootRouteChildren {
+  IndexRoute: typeof IndexRoute
+}
+
+declare module '@tanstack/react-router' {
+  interface FileRoutesByPath {
+    '/': {
+      id: '/'
+      path: '/'
+      fullPath: '/'
+      preLoaderRoute: typeof IndexRouteImport
+      parentRoute: typeof rootRouteImport
+    }
+  }
+}
+
+const rootRouteChildren: RootRouteChildren = {
+  IndexRoute: IndexRoute,
+}
+export const routeTree = rootRouteImport
+  ._addFileChildren(rootRouteChildren)
+  ._addFileTypes<FileRouteTypes>()
+
+import type { getRouter } from './router.tsx'
+import type { createStart } from '@tanstack/react-start'
+declare module '@tanstack/react-start' {
+  interface Register {
+    ssr: true
+    router: Awaited<ReturnType<typeof getRouter>>
+  }
+}
diff --git a/apps/web/src/router.tsx b/apps/web/src/router.tsx
new file mode 100644
index 00000000..83526bfd
--- /dev/null
+++ b/apps/web/src/router.tsx
@@ -0,0 +1,35 @@
+import type { PropsWithChildren } from "react";
+import { createRouter as createTanStackRouter } from "@tanstack/react-router";
+import { setupRouterSsrQueryIntegration } from "@tanstack/react-router-ssr-query";
+
+import {
+  getContext,
+  RootProvider,
+} from "./integrations/tanstack-query/root-provider.tsx";
+import { routeTree } from "./routeTree.gen";
+
+export function getRouter() {
+  const context = getContext();
+
+  function Providers({ children }: PropsWithChildren) {
+    return <RootProvider context={context}>{children}</RootProvider>;
+  }
+
+  const router = createTanStackRouter({
+    Wrap: Providers,
+    context,
+    defaultPreload: "intent",
+    defaultPreloadStaleTime: 0,
+    routeTree,
+    scrollRestoration: true,
+  });
+
+  setupRouterSsrQueryIntegration({ router, queryClient: context.queryClient });
+  return router;
+}
+
+declare module "@tanstack/react-router" {
+  interface Register {
+    router: ReturnType<typeof getRouter>;
+  }
+}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
new file mode 100644
index 00000000..9e6e377a
--- /dev/null
+++ b/apps/web/src/routes/__root.tsx
@@ -0,0 +1,24 @@
+import { createRootRouteWithContext } from "@tanstack/react-router";
+
+import type { getContext } from "../integrations/tanstack-query/root-provider.tsx";
+import { NotFound } from "../shell/NotFound.tsx";
+import { RootDocument } from "../shell/RootDocument.tsx";
+import appCss from "../styles.css?url";
+
+export const Route = createRootRouteWithContext<
+  ReturnType<typeof getContext>
+>()({
+  head: () => ({
+    links: [{ href: appCss, rel: "stylesheet" }],
+    meta: [
+      { charSet: "utf-8" },
+      {
+        content: "width=device-width, initial-scale=1",
+        name: "viewport",
+      },
+      { title: "Vera" },
+    ],
+  }),
+  notFoundComponent: NotFound,
+  shellComponent: RootDocument,
+});
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
new file mode 100644
index 00000000..2e273d48
--- /dev/null
+++ b/apps/web/src/routes/index.tsx
@@ -0,0 +1,23 @@
+import { useState } from "react";
+import { createFileRoute } from "@tanstack/react-router";
+
+import type { HomeServer } from "../live/config.ts";
+import { HomeServerSession } from "../cloud/HomeServerSession.tsx";
+import { homes } from "../live/config.ts";
+import { ServerPicker } from "../server-picker/ServerPicker.tsx";
+
+export const Route = createFileRoute("/")({ component: Home });
+
+function Home() {
+  const [home, setHome] = useState<HomeServer>();
+  if (home !== undefined) {
+    return (
+      <HomeServerSession
+        home={home}
+        onChooseServer={() => setHome(undefined)}
+      />
+    );
+  }
+
+  return <ServerPicker homes={homes} onChoose={setHome} />;
+}
diff --git a/apps/web/src/server-picker/ServerPicker.tsx b/apps/web/src/server-picker/ServerPicker.tsx
new file mode 100644
index 00000000..3a065306
--- /dev/null
+++ b/apps/web/src/server-picker/ServerPicker.tsx
@@ -0,0 +1,46 @@
+import type { HomeServer } from "../live/config.ts";
+
+interface ServerPickerProps {
+  homes: readonly HomeServer[];
+  onChoose: (home: HomeServer) => void;
+}
+
+export function ServerPicker({ homes, onChoose }: ServerPickerProps) {
+  return (
+    <main className="account-shell">
+      <section className="account-panel server-picker">
+        <header className="account-header">
+          <span className="app-icon" aria-hidden="true">
+            V
+          </span>
+          <div>
+            <h1>Vera</h1>
+            <p>Choose the server where your account will live.</p>
+          </div>
+        </header>
+        <div className="server-list">
+          {homes.map((server, index) => (
+            <button
+              className="server-row"
+              key={server.id}
+              onClick={() => onChoose(server)}
+              type="button"
+            >
+              <span className="server-index">{index + 1}</span>
+              <span className="server-address">
+                <strong>{server.domain}</strong>
+                <small>Convex deployment</small>
+              </span>
+              <span className="row-arrow" aria-hidden="true">
+                →
+              </span>
+            </button>
+          ))}
+        </div>
+        <p className="account-hint">
+          To test federation, open another tab and choose the other server.
+        </p>
+      </section>
+    </main>
+  );
+}
diff --git a/apps/web/src/shell/NotFound.tsx b/apps/web/src/shell/NotFound.tsx
new file mode 100644
index 00000000..000a7220
--- /dev/null
+++ b/apps/web/src/shell/NotFound.tsx
@@ -0,0 +1,9 @@
+export function NotFound() {
+  return (
+    <main className="not-found">
+      <span>404</span>
+      <h1>This page does not exist.</h1>
+      <a href="/">Return to Vera</a>
+    </main>
+  );
+}
diff --git a/apps/web/src/shell/RootDocument.tsx b/apps/web/src/shell/RootDocument.tsx
new file mode 100644
index 00000000..9e0ff227
--- /dev/null
+++ b/apps/web/src/shell/RootDocument.tsx
@@ -0,0 +1,16 @@
+import type { ReactNode } from "react";
+import { HeadContent, Scripts } from "@tanstack/react-router";
+
+export function RootDocument({ children }: { children: ReactNode }) {
+  return (
+    <html lang="en">
+      <head>
+        <HeadContent />
+      </head>
+      <body>
+        {children}
+        <Scripts />
+      </body>
+    </html>
+  );
+}
diff --git a/apps/web/src/styles.css b/apps/web/src/styles.css
new file mode 100644
index 00000000..42f418e1
--- /dev/null
+++ b/apps/web/src/styles.css
@@ -0,0 +1,871 @@
+@import url("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500&family=IBM+Plex+Sans:wght@400;500;600&display=swap");
+
+:root {
+  color: #20211f;
+  background: #f2f2ef;
+  font-family: "IBM Plex Sans", sans-serif;
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+}
+
+* {
+  box-sizing: border-box;
+}
+
+body {
+  min-width: 320px;
+  min-height: 100vh;
+  margin: 0;
+  background: #f2f2ef;
+}
+
+button,
+input,
+textarea {
+  font: inherit;
+}
+
+button,
+summary {
+  cursor: pointer;
+}
+
+button:focus-visible,
+input:focus-visible,
+textarea:focus-visible,
+summary:focus-visible {
+  outline: 2px solid #2367d1;
+  outline-offset: 2px;
+}
+
+.account-shell {
+  display: grid;
+  min-height: 100vh;
+  place-items: center;
+  padding: 24px;
+}
+
+.account-panel {
+  width: min(520px, 100%);
+  padding: 28px;
+  border: 1px solid #d0d0cb;
+  border-radius: 14px;
+  background: #fff;
+}
+
+.account-header,
+.sidebar-title {
+  display: flex;
+  align-items: center;
+  gap: 13px;
+}
+
+.account-header {
+  margin-bottom: 28px;
+}
+
+.account-header h1 {
+  margin: 0;
+  font-size: 22px;
+  font-weight: 600;
+  letter-spacing: -0.025em;
+}
+
+.account-header p {
+  margin: 3px 0 0;
+  color: #73746e;
+  font-size: 13px;
+}
+
+.app-icon {
+  display: grid;
+  width: 38px;
+  height: 38px;
+  flex: 0 0 auto;
+  place-items: center;
+  border-radius: 9px;
+  color: #fff;
+  background: #20211f;
+  font:
+    500 12px/1 "IBM Plex Mono",
+    monospace;
+  letter-spacing: -0.08em;
+}
+
+.server-list {
+  overflow: hidden;
+  border: 1px solid #d9d9d4;
+  border-radius: 10px;
+}
+
+.server-row {
+  display: grid;
+  width: 100%;
+  align-items: center;
+  gap: 12px;
+  padding: 15px;
+  border: 0;
+  color: inherit;
+  background: #fff;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+  text-align: left;
+}
+
+.server-row + .server-row {
+  border-top: 1px solid #e3e3df;
+}
+
+.server-row:hover {
+  background: #f7f7f4;
+}
+
+.server-index {
+  display: grid;
+  width: 28px;
+  height: 28px;
+  place-items: center;
+  border-radius: 7px;
+  color: #666761;
+  background: #ecece8;
+  font:
+    500 11px/1 "IBM Plex Mono",
+    monospace;
+}
+
+.server-address {
+  display: grid;
+  min-width: 0;
+  gap: 2px;
+}
+
+.server-address strong {
+  overflow: hidden;
+  font:
+    500 13px/1.35 "IBM Plex Mono",
+    monospace;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.server-address small,
+.account-hint {
+  color: #777872;
+  font-size: 12px;
+}
+
+.row-arrow {
+  color: #888983;
+}
+
+.account-hint {
+  margin: 18px 2px 0;
+  line-height: 1.5;
+}
+
+.auth-panel {
+  width: min(440px, 100%);
+}
+
+.auth-panel form {
+  display: grid;
+  gap: 17px;
+}
+
+.auth-panel label {
+  display: grid;
+  gap: 7px;
+  color: #555650;
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.auth-panel input {
+  min-width: 0;
+  padding: 11px 12px;
+  border: 1px solid #cacac5;
+  border-radius: 8px;
+  outline: 0;
+  color: #20211f;
+  background: #fff;
+  font-size: 14px;
+}
+
+.auth-panel input:focus {
+  border-color: #777873;
+}
+
+.address-input {
+  display: flex;
+  min-width: 0;
+  align-items: center;
+  overflow: hidden;
+  border: 1px solid #cacac5;
+  border-radius: 8px;
+  background: #fff;
+}
+
+.address-input:focus-within {
+  border-color: #777873;
+  outline: 2px solid #2367d1;
+  outline-offset: 2px;
+}
+
+.address-input input {
+  width: 36%;
+  border: 0;
+  border-radius: 0;
+}
+
+.address-input input:focus-visible {
+  outline: 0;
+}
+
+.address-input > span {
+  min-width: 0;
+  overflow: hidden;
+  color: #777872;
+  font:
+    400 12px/1.3 "IBM Plex Mono",
+    monospace;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.primary-button {
+  width: 100%;
+  padding: 11px 14px;
+  border: 1px solid #20211f;
+  border-radius: 8px;
+  color: #fff;
+  background: #20211f;
+  font-size: 13px;
+  font-weight: 500;
+}
+
+.primary-button:hover {
+  background: #343531;
+}
+
+.primary-button:disabled {
+  cursor: wait;
+  opacity: 0.55;
+}
+
+.text-button {
+  padding: 0;
+  border: 0;
+  color: #656660;
+  background: transparent;
+  font-size: 12px;
+}
+
+.text-button:hover {
+  color: #20211f;
+}
+
+.back-button {
+  margin-bottom: 24px;
+}
+
+.auth-mode {
+  width: 100%;
+  margin-top: 18px;
+  text-align: center;
+}
+
+.auth-error,
+.composer-error {
+  margin: 0;
+  color: #b42318;
+  font-size: 12px;
+}
+
+.loading-panel {
+  display: flex;
+  width: auto;
+  align-items: center;
+  gap: 10px;
+  padding: 15px 18px;
+}
+
+.loading-panel p {
+  margin: 0;
+  color: #666761;
+  font:
+    400 12px/1 "IBM Plex Mono",
+    monospace;
+}
+
+.loading-dot {
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: #d99614;
+  animation: pulse 900ms ease-in-out infinite alternate;
+}
+
+@keyframes pulse {
+  to {
+    opacity: 0.3;
+  }
+}
+
+.chat-app {
+  display: grid;
+  height: 100vh;
+  min-height: 560px;
+  background: #fff;
+  grid-template-columns: 250px minmax(0, 1fr);
+}
+
+.sidebar {
+  display: flex;
+  min-width: 0;
+  flex-direction: column;
+  border-right: 1px solid #deded9;
+  background: #f4f4f1;
+}
+
+.sidebar-title {
+  min-height: 70px;
+  padding: 14px 16px;
+  border-bottom: 1px solid #deded9;
+}
+
+.sidebar-title > div,
+.account-address {
+  display: grid;
+  min-width: 0;
+  gap: 2px;
+}
+
+.sidebar-title strong {
+  font-size: 14px;
+}
+
+.sidebar-title small,
+.account-address small {
+  overflow: hidden;
+  color: #777872;
+  font-size: 11px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.room-list {
+  display: grid;
+  gap: 6px;
+  padding: 22px 12px;
+}
+
+.room-list > span {
+  padding: 0 8px;
+  color: #84857f;
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.08em;
+  text-transform: uppercase;
+}
+
+.room-list button {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  padding: 9px 10px;
+  border: 0;
+  border-radius: 7px;
+  color: #20211f;
+  background: #e5e5e0;
+  font-size: 13px;
+  font-weight: 500;
+  text-align: left;
+}
+
+.room-list button span {
+  color: #787972;
+  font:
+    500 15px/1 "IBM Plex Mono",
+    monospace;
+}
+
+.sidebar-account {
+  display: grid;
+  align-items: center;
+  gap: 10px;
+  margin-top: auto;
+  padding: 12px;
+  border-top: 1px solid #deded9;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+}
+
+.account-address strong {
+  overflow: hidden;
+  font-size: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.avatar {
+  display: grid;
+  width: 34px;
+  height: 34px;
+  flex: 0 0 auto;
+  place-items: center;
+  border-radius: 9px;
+  color: #24403a;
+  background: #b9ded4;
+  font:
+    500 10px/1 "IBM Plex Mono",
+    monospace;
+}
+
+.message:nth-of-type(even) .avatar {
+  color: #4b3623;
+  background: #ead3ae;
+}
+
+.account-menu,
+.diagnostics {
+  position: relative;
+}
+
+.account-menu summary,
+.diagnostics summary {
+  list-style: none;
+}
+
+.account-menu summary::-webkit-details-marker,
+.diagnostics summary::-webkit-details-marker {
+  display: none;
+}
+
+.account-menu summary {
+  padding: 6px;
+  color: #70716b;
+  font:
+    500 12px/1 "IBM Plex Mono",
+    monospace;
+}
+
+.account-menu > div {
+  position: absolute;
+  right: 0;
+  bottom: calc(100% + 8px);
+  z-index: 5;
+  display: grid;
+  width: 150px;
+  overflow: hidden;
+  border: 1px solid #d3d3ce;
+  border-radius: 8px;
+  background: #fff;
+  box-shadow: 0 8px 24px rgb(0 0 0 / 10%);
+}
+
+.account-menu button {
+  padding: 10px 12px;
+  border: 0;
+  color: #30312e;
+  background: transparent;
+  font-size: 12px;
+  text-align: left;
+}
+
+.account-menu button:hover {
+  background: #f2f2ef;
+}
+
+.conversation-panel {
+  display: grid;
+  min-width: 0;
+  min-height: 0;
+  background: #fff;
+  grid-template-rows: auto minmax(0, 1fr) auto;
+}
+
+.channel-header {
+  display: flex;
+  min-height: 70px;
+  align-items: center;
+  justify-content: space-between;
+  gap: 24px;
+  padding: 12px 20px;
+  border-bottom: 1px solid #deded9;
+}
+
+.channel-header h1 {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 600;
+}
+
+.channel-header p {
+  margin: 3px 0 0;
+  color: #777872;
+  font-size: 12px;
+}
+
+.channel-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.connection-summary {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  color: #696a64;
+  font:
+    400 11px/1 "IBM Plex Mono",
+    monospace;
+  white-space: nowrap;
+}
+
+.connection-summary > span,
+.diagnostic-sources [data-status] {
+  width: 7px;
+  height: 7px;
+  border-radius: 50%;
+  background: #d99614;
+}
+
+.connection-summary[data-status="success"] > span,
+.diagnostic-sources [data-status="live"] {
+  background: #26845b;
+}
+
+.connection-summary[data-status="error"] > span,
+.diagnostic-sources [data-status="error"] {
+  background: #c23d32;
+}
+
+.diagnostics > summary {
+  padding: 7px 9px;
+  border: 1px solid #d3d3ce;
+  border-radius: 7px;
+  color: #555650;
+  background: #fff;
+  font-size: 11px;
+}
+
+.diagnostics-panel {
+  position: absolute;
+  z-index: 10;
+  top: calc(100% + 9px);
+  right: 0;
+  width: min(360px, calc(100vw - 32px));
+  padding: 16px;
+  border: 1px solid #d3d3ce;
+  border-radius: 10px;
+  background: #fff;
+  box-shadow: 0 12px 36px rgb(0 0 0 / 12%);
+}
+
+.diagnostics-panel > strong {
+  font-size: 12px;
+}
+
+.diagnostic-sources {
+  display: grid;
+  gap: 8px;
+  margin: 12px 0 16px;
+}
+
+.diagnostic-sources > div {
+  display: grid;
+  align-items: center;
+  gap: 8px;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+}
+
+.diagnostic-sources code,
+.diagnostics-panel dd {
+  overflow: hidden;
+  font:
+    400 10px/1.4 "IBM Plex Mono",
+    monospace;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.diagnostic-sources small {
+  color: #777872;
+  font-size: 10px;
+  text-transform: capitalize;
+}
+
+.diagnostics-panel dl {
+  display: grid;
+  gap: 9px;
+  margin: 0;
+  padding-top: 14px;
+  border-top: 1px solid #e2e2de;
+}
+
+.diagnostics-panel dl > div {
+  display: grid;
+  gap: 12px;
+  grid-template-columns: 88px minmax(0, 1fr);
+}
+
+.diagnostics-panel dt {
+  color: #777872;
+  font-size: 10px;
+}
+
+.diagnostics-panel dd {
+  margin: 0;
+  text-align: right;
+}
+
+.message-list {
+  display: flex;
+  min-height: 0;
+  overflow-y: auto;
+  flex-direction: column;
+  gap: 2px;
+  padding: 22px 24px;
+}
+
+.message {
+  display: grid;
+  gap: 11px;
+  padding: 8px 6px;
+  border-radius: 8px;
+  grid-template-columns: 34px minmax(0, 1fr);
+}
+
+.message:hover {
+  background: #f8f8f6;
+}
+
+.message header {
+  display: flex;
+  align-items: baseline;
+  gap: 6px;
+}
+
+.message header strong {
+  font-size: 13px;
+  font-weight: 600;
+}
+
+.message header span,
+.message time {
+  color: #888983;
+  font-size: 10px;
+}
+
+.message time {
+  margin-left: 4px;
+}
+
+.message p {
+  max-width: 760px;
+  margin: 4px 0 0;
+  color: #30312e;
+  font-size: 14px;
+  line-height: 1.5;
+  overflow-wrap: anywhere;
+}
+
+.empty-state {
+  display: grid;
+  margin: auto;
+  justify-items: center;
+  color: #777872;
+  text-align: center;
+}
+
+.empty-state > span {
+  display: grid;
+  width: 44px;
+  height: 44px;
+  margin-bottom: 12px;
+  place-items: center;
+  border: 1px solid #d5d5d0;
+  border-radius: 12px;
+  color: #777872;
+  background: #f5f5f2;
+  font:
+    500 18px/1 "IBM Plex Mono",
+    monospace;
+}
+
+.empty-state strong {
+  color: #30312e;
+  font-size: 14px;
+}
+
+.empty-state p {
+  margin: 4px 0 0;
+  font-size: 12px;
+}
+
+.composer {
+  display: grid;
+  align-items: end;
+  gap: 10px;
+  margin: 0 20px 20px;
+  padding: 8px;
+  border: 1px solid #c9c9c4;
+  border-radius: 10px;
+  background: #fff;
+  grid-template-columns: minmax(0, 1fr) auto;
+}
+
+.composer:focus-within {
+  border-color: #777873;
+  box-shadow: 0 0 0 2px rgb(35 103 209 / 14%);
+}
+
+.composer label {
+  display: block;
+}
+
+.composer textarea {
+  display: block;
+  width: 100%;
+  min-height: 36px;
+  max-height: 140px;
+  resize: vertical;
+  padding: 9px 8px;
+  border: 0;
+  outline: 0;
+  color: #20211f;
+  background: transparent;
+  font-size: 14px;
+  line-height: 1.35;
+}
+
+.composer textarea:focus-visible {
+  outline: 0;
+}
+
+.composer textarea::placeholder {
+  color: #969791;
+}
+
+.composer button {
+  padding: 9px 14px;
+  border: 0;
+  border-radius: 7px;
+  color: #fff;
+  background: #2367d1;
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.composer button:hover {
+  background: #1e5bb9;
+}
+
+.composer button:disabled {
+  cursor: not-allowed;
+  opacity: 0.4;
+}
+
+.composer-error {
+  padding: 0 8px 3px;
+  grid-column: 1 / -1;
+}
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  clip-path: inset(50%);
+}
+
+.not-found {
+  display: grid;
+  min-height: 100vh;
+  place-content: center;
+  text-align: center;
+}
+
+.not-found h1 {
+  margin: 8px 0 18px;
+}
+
+.not-found a {
+  color: #2367d1;
+}
+
+@media (max-width: 720px) {
+  .account-shell {
+    align-items: stretch;
+    padding: 0;
+  }
+
+  .account-panel {
+    width: 100%;
+    min-height: 100vh;
+    padding: 24px;
+    border: 0;
+    border-radius: 0;
+  }
+
+  .chat-app {
+    min-height: 100vh;
+    grid-template-rows: 60px minmax(0, 1fr);
+    grid-template-columns: 1fr;
+  }
+
+  .sidebar {
+    display: grid;
+    border-right: 0;
+    border-bottom: 1px solid #deded9;
+    grid-row: 1;
+    grid-template-columns: 1fr auto;
+  }
+
+  .sidebar-title {
+    min-height: 60px;
+    padding: 10px 12px;
+    border: 0;
+  }
+
+  .sidebar-title small,
+  .room-list,
+  .account-address,
+  .sidebar-account > .avatar {
+    display: none;
+  }
+
+  .sidebar-account {
+    margin: 0;
+    padding: 10px 12px;
+    border: 0;
+    grid-template-columns: auto;
+  }
+
+  .conversation-panel {
+    grid-row: 2;
+  }
+
+  .channel-header {
+    min-height: 64px;
+    padding: 10px 14px;
+  }
+
+  .channel-header p,
+  .connection-summary {
+    display: none;
+  }
+
+  .message-list {
+    padding: 16px 10px;
+  }
+
+  .message header span {
+    display: none;
+  }
+
+  .composer {
+    margin: 0 10px 10px;
+  }
+}
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
new file mode 100644
index 00000000..1bcb9bc8
--- /dev/null
+++ b/apps/web/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "jsx": "react-jsx",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "types": ["vite/client"],
+    "paths": { "#/*": ["./src/*"] }
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.ts"]
+}
diff --git a/apps/web/tsr.config.json b/apps/web/tsr.config.json
new file mode 100644
index 00000000..8b6b6edd
--- /dev/null
+++ b/apps/web/tsr.config.json
@@ -0,0 +1,3 @@
+{
+  "target": "react"
+}
diff --git a/apps/web/vercel.json b/apps/web/vercel.json
deleted file mode 100644
index f7b233dd..00000000
--- a/apps/web/vercel.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "$schema": "https://openapi.vercel.sh/vercel.json",
-  "framework": "vite",
-  "outputDirectory": "dist",
-  "headers": [
-    {
-      "source": "/(.*)",
-      "headers": [
-        {
-          "key": "Cache-Control",
-          "value": "public, max-age=0, must-revalidate"
-        },
-        {
-          "key": "X-Content-Type-Options",
-          "value": "nosniff"
-        },
-        {
-          "key": "Referrer-Policy",
-          "value": "strict-origin-when-cross-origin"
-        }
-      ]
-    }
-  ],
-  "rewrites": [{ "source": "/(.*)", "destination": "/index.html" }]
-}
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
new file mode 100644
index 00000000..d37915e1
--- /dev/null
+++ b/apps/web/vite.config.ts
@@ -0,0 +1,7 @@
+import { tanstackStart } from "@tanstack/react-start/plugin/vite";
+import viteReact from "@vitejs/plugin-react";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [tanstackStart(), viteReact()],
+});
diff --git a/deps/.gitkeep b/deps/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/deps/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/package.json b/package.json
index a78b4689..3a4873b2 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "check": "pnpm run lint && pnpm run typecheck",
     "ui-add": "turbo run ui-add",
     "create-package": "turbo gen init",
-    "loc": "cloc --exclude-dir=_generated --not-match-f=routeTree.gen.ts apps/*/src packages/*/src"
+    "loc": "cloc --exclude-dir=_generated --not-match-f=routeTree.gen.ts apps/*/src packages/*/src services/*/convex shared/*/src"
   },
   "devDependencies": {
     "@acme/prettier-config": "workspace:*",
diff --git a/packages/app-config/eslint.config.ts b/packages/decentralized-convex-address/eslint.config.ts
similarity index 100%
rename from packages/app-config/eslint.config.ts
rename to packages/decentralized-convex-address/eslint.config.ts
diff --git a/packages/decentralized-convex-address/package.json b/packages/decentralized-convex-address/package.json
new file mode 100644
index 00000000..a1a82a0b
--- /dev/null
+++ b/packages/decentralized-convex-address/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@decentralized-convex/address",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@decentralized-convex/client": "workspace:*"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-address/src/address.test.ts b/packages/decentralized-convex-address/src/address.test.ts
new file mode 100644
index 00000000..c90337bb
--- /dev/null
+++ b/packages/decentralized-convex-address/src/address.test.ts
@@ -0,0 +1,15 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { addressToTarget, parseAddress } from "./address.ts";
+
+void test("parses an address into an optional federation target", () => {
+  assert.deepEqual(parseAddress(" Alice@Chat.Example "), {
+    domain: "chat.example",
+    username: "alice",
+  });
+  assert.deepEqual(addressToTarget("alice@chat.example"), {
+    id: "alice@chat.example",
+    url: "https://chat.example",
+  });
+});
diff --git a/packages/decentralized-convex-address/src/address.ts b/packages/decentralized-convex-address/src/address.ts
new file mode 100644
index 00000000..e1744915
--- /dev/null
+++ b/packages/decentralized-convex-address/src/address.ts
@@ -0,0 +1,40 @@
+import type { FederationTarget } from "@decentralized-convex/client";
+
+export interface DecentralizedAddress {
+  domain: string;
+  username: string;
+}
+
+export function parseAddress(value: string): DecentralizedAddress {
+  const normalized = value.trim().toLowerCase();
+  const separator = normalized.lastIndexOf("@");
+  const username = normalized.slice(0, separator);
+  const domain = normalized.slice(separator + 1);
+
+  if (separator < 1 || username.length === 0 || !isDomain(domain)) {
+    throw new Error(`Invalid decentralized address: ${value}`);
+  }
+
+  return { domain, username };
+}
+
+export function formatAddress(address: DecentralizedAddress) {
+  return `${address.username.trim().toLowerCase()}@${address.domain
+    .trim()
+    .toLowerCase()}`;
+}
+
+export function addressToTarget(value: string): FederationTarget {
+  const address = parseAddress(value);
+  return {
+    id: formatAddress(address),
+    url: `https://${address.domain}`,
+  };
+}
+
+function isDomain(value: string) {
+  if (value.length === 0 || value.includes("/") || value.includes(":")) {
+    return false;
+  }
+  return value === "localhost" || value.includes(".");
+}
diff --git a/packages/decentralized-convex-address/src/index.ts b/packages/decentralized-convex-address/src/index.ts
new file mode 100644
index 00000000..397c5465
--- /dev/null
+++ b/packages/decentralized-convex-address/src/index.ts
@@ -0,0 +1,2 @@
+export { addressToTarget, formatAddress, parseAddress } from "./address.ts";
+export type { DecentralizedAddress } from "./address.ts";
diff --git a/packages/decentralized-convex-address/tsconfig.json b/packages/decentralized-convex-address/tsconfig.json
new file mode 100644
index 00000000..e4011a4e
--- /dev/null
+++ b/packages/decentralized-convex-address/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022", "DOM"],
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-client/eslint.config.ts b/packages/decentralized-convex-client/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-client/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-client/package.json b/packages/decentralized-convex-client/package.json
new file mode 100644
index 00000000..9d1fcae5
--- /dev/null
+++ b/packages/decentralized-convex-client/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@decentralized-convex/client",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "convex": "catalog:"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
new file mode 100644
index 00000000..d8af341a
--- /dev/null
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -0,0 +1,97 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import { makeFunctionReference } from "convex/server";
+
+import type {
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+} from "./types.ts";
+import { DecentralizedConvexClient } from "./client.ts";
+
+const listItems = makeFunctionReference<
+  "query",
+  { scope: string },
+  readonly { id: string; value: string }[]
+>("items:list");
+
+void test("groups identities by deployment and combines native query results", async () => {
+  const connections = new Map<string, MemoryConnection>();
+  const client = new DecentralizedConvexClient({
+    connectionFactory: (url) => {
+      const connection = new MemoryConnection(url);
+      connections.set(url, connection);
+      return connection;
+    },
+  });
+
+  const snapshot = await client.query({
+    args: ({ ids }) => ({ scope: ids.join(",") }),
+    combine: (sources) => sources.flatMap((source) => source.data),
+    query: listItems,
+    targets: [
+      { id: "alice@shared.test", url: "https://shared.test" },
+      { id: "bob@shared.test", url: "https://shared.test/" },
+      { id: "carol@solo.test", url: "https://solo.test" },
+    ],
+  });
+
+  assert.equal(connections.size, 2);
+  assert.equal(snapshot.status, "success");
+  assert.deepEqual(
+    snapshot.data.map((item) => item.value),
+    ["alice@shared.test,bob@shared.test", "carol@solo.test"],
+  );
+  await client.close();
+});
+
+class MemoryConnection implements FederationConnection {
+  readonly #url;
+
+  constructor(url: string) {
+    this.#url = url;
+  }
+
+  close() {
+    return Promise.resolve();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(): Promise<
+    FunctionReturnType<Mutation>
+  > {
+    return Promise.reject(new Error("Not implemented"));
+  }
+
+  query<Query extends FederationQueryReference>(
+    _query: Query,
+    args: FunctionArgs<Query>,
+  ): Promise<FunctionReturnType<Query>> {
+    // The fake connection cannot derive a concrete return type from an arbitrary test reference.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return Promise.resolve([
+      { id: this.#url, value: getScope(args) },
+    ]) as Promise<FunctionReturnType<Query>>;
+  }
+
+  subscribe<Query extends FederationQueryReference>(
+    query: Query,
+    args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+  ) {
+    void this.query(query, args).then(onResult);
+    return () => undefined;
+  }
+}
+
+function getScope(args: unknown) {
+  if (
+    typeof args === "object" &&
+    args !== null &&
+    "scope" in args &&
+    typeof args.scope === "string"
+  ) {
+    return args.scope;
+  }
+  throw new Error("Expected a scope argument");
+}
diff --git a/packages/decentralized-convex-client/src/client.ts b/packages/decentralized-convex-client/src/client.ts
new file mode 100644
index 00000000..9e2802d8
--- /dev/null
+++ b/packages/decentralized-convex-client/src/client.ts
@@ -0,0 +1,93 @@
+import type { FunctionArgs, FunctionReturnType } from "convex/server";
+
+import type {
+  FederatedQueryOptions,
+  FederationClientOptions,
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+  FederationTarget,
+} from "./types.ts";
+import { createConvexFederationConnection } from "./connection.ts";
+import { FederatedQueryObserver } from "./observer.ts";
+import { createFederatedSnapshot } from "./snapshot.ts";
+import { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
+
+export class DecentralizedConvexClient {
+  readonly #connectionFactory;
+  readonly #connections = new Map<string, FederationConnection>();
+  readonly #getAuthToken;
+
+  constructor(options: FederationClientOptions = {}) {
+    this.#connectionFactory =
+      options.connectionFactory ?? createConvexFederationConnection;
+    this.#getAuthToken = options.getAuthToken;
+  }
+
+  watchQuery<Query extends FederationQueryReference, Combined>(
+    options: FederatedQueryOptions<Query, Combined>,
+  ) {
+    return new FederatedQueryObserver(options, (url) =>
+      this.#getConnection(url),
+    );
+  }
+
+  async query<Query extends FederationQueryReference, Combined>(
+    options: FederatedQueryOptions<Query, Combined>,
+  ) {
+    const groups = groupFederationTargets(options.targets);
+    const settled = await Promise.all(
+      groups.map(async (target) => {
+        const args =
+          typeof options.args === "function"
+            ? options.args(target)
+            : options.args;
+        try {
+          const data = await this.#getConnection(target.url).query(
+            options.query,
+            args,
+          );
+          return { data, status: "live" as const, target };
+        } catch (error) {
+          return {
+            error: toError(error),
+            status: "error" as const,
+            target,
+          };
+        }
+      }),
+    );
+    return createFederatedSnapshot<FunctionReturnType<Query>, Combined>(
+      settled,
+      options.combine,
+    );
+  }
+
+  mutation<Mutation extends FederationMutationReference>(
+    target: FederationTarget,
+    mutation: Mutation,
+    args: FunctionArgs<Mutation>,
+  ): Promise<FunctionReturnType<Mutation>> {
+    return this.#getConnection(target.url).mutation(mutation, args);
+  }
+
+  async close() {
+    await Promise.all(
+      [...this.#connections.values()].map((connection) => connection.close()),
+    );
+    this.#connections.clear();
+  }
+
+  #getConnection(inputUrl: string) {
+    const url = normalizeFederationUrl(inputUrl);
+    const existing = this.#connections.get(url);
+    if (existing !== undefined) return existing;
+    const connection = this.#connectionFactory(url, this.#getAuthToken);
+    this.#connections.set(url, connection);
+    return connection;
+  }
+}
+
+function toError(error: unknown) {
+  return error instanceof Error ? error : new Error("Federation query failed");
+}
diff --git a/packages/decentralized-convex-client/src/connection.ts b/packages/decentralized-convex-client/src/connection.ts
new file mode 100644
index 00000000..657a9063
--- /dev/null
+++ b/packages/decentralized-convex-client/src/connection.ts
@@ -0,0 +1,56 @@
+import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import { ConvexClient } from "convex/browser";
+
+import type {
+  FederationAuthTokenFetcher,
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+} from "./types.ts";
+
+class ConvexFederationConnection implements FederationConnection {
+  readonly #client;
+
+  constructor(url: string, getAuthToken?: FederationAuthTokenFetcher) {
+    this.#client = new ConvexClient(url);
+    if (getAuthToken !== undefined) {
+      this.#client.setAuth(({ forceRefreshToken }) =>
+        getAuthToken({ forceRefreshToken, url }),
+      );
+    }
+  }
+
+  close() {
+    return this.#client.close();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(
+    mutation: Mutation,
+    args: FunctionArgs<Mutation>,
+  ): Promise<FunctionReturnType<Mutation>> {
+    return this.#client.mutation(mutation, args);
+  }
+
+  query<Query extends FederationQueryReference>(
+    query: Query,
+    args: FunctionArgs<Query>,
+  ): Promise<FunctionReturnType<Query>> {
+    return this.#client.query(query, args);
+  }
+
+  subscribe<Query extends FederationQueryReference>(
+    query: Query,
+    args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+    onError: (error: Error) => void,
+  ) {
+    return this.#client.onUpdate(query, args, onResult, onError);
+  }
+}
+
+export function createConvexFederationConnection(
+  url: string,
+  getAuthToken?: FederationAuthTokenFetcher,
+): FederationConnection {
+  return new ConvexFederationConnection(url, getAuthToken);
+}
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
new file mode 100644
index 00000000..0709edd7
--- /dev/null
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -0,0 +1,23 @@
+export { DecentralizedConvexClient } from "./client.ts";
+export { FederatedQueryObserver } from "./observer.ts";
+export { defaultCombine } from "./snapshot.ts";
+export { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
+export type {
+  DefaultCombinedResult,
+  FederatedQueryArgs,
+  FederatedQueryOptions,
+  FederatedQuerySnapshot,
+  FederatedQueryStatus,
+  FederationAuthRequest,
+  FederationAuthTokenFetcher,
+  FederationClientOptions,
+  FederationConnection,
+  FederationConnectionFactory,
+  FederationMutationReference,
+  FederationQueryReference,
+  FederationSourceSnapshot,
+  FederationSourceStatus,
+  FederationTarget,
+  FederationTargetGroup,
+  SuccessfulFederationSource,
+} from "./types.ts";
diff --git a/packages/decentralized-convex-client/src/observer.ts b/packages/decentralized-convex-client/src/observer.ts
new file mode 100644
index 00000000..73815e2a
--- /dev/null
+++ b/packages/decentralized-convex-client/src/observer.ts
@@ -0,0 +1,86 @@
+import type { FunctionReturnType } from "convex/server";
+
+import type {
+  FederatedQueryOptions,
+  FederatedQuerySnapshot,
+  FederationConnection,
+  FederationQueryReference,
+  FederationSourceSnapshot,
+} from "./types.ts";
+import { createFederatedSnapshot } from "./snapshot.ts";
+import { groupFederationTargets } from "./targets.ts";
+
+export class FederatedQueryObserver<
+  Query extends FederationQueryReference,
+  Combined,
+> {
+  readonly #listeners = new Set<() => void>();
+  readonly #options;
+  readonly #sources = new Map<
+    string,
+    FederationSourceSnapshot<FunctionReturnType<Query>>
+  >();
+  readonly #unsubscribes: (() => void)[] = [];
+  #closed = false;
+  #snapshot: FederatedQuerySnapshot<Combined, FunctionReturnType<Query>>;
+
+  constructor(
+    options: FederatedQueryOptions<Query, Combined>,
+    getConnection: (url: string) => FederationConnection,
+  ) {
+    this.#options = options;
+    const targets = groupFederationTargets(options.targets);
+    for (const target of targets) {
+      this.#sources.set(target.url, { status: "pending", target });
+    }
+    this.#snapshot = createFederatedSnapshot(
+      [...this.#sources.values()],
+      options.combine,
+    );
+
+    for (const target of targets) {
+      const connection = getConnection(target.url);
+      const args =
+        typeof options.args === "function"
+          ? options.args(target)
+          : options.args;
+      const unsubscribe = connection.subscribe(
+        options.query,
+        args,
+        (data) => this.#update(target.url, { data, status: "live" }),
+        (error) => this.#update(target.url, { error, status: "error" }),
+      );
+      this.#unsubscribes.push(unsubscribe);
+    }
+  }
+
+  getSnapshot = () => this.#snapshot;
+
+  subscribe = (listener: () => void) => {
+    this.#listeners.add(listener);
+    return () => this.#listeners.delete(listener);
+  };
+
+  close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    for (const unsubscribe of this.#unsubscribes) unsubscribe();
+    this.#unsubscribes.length = 0;
+    this.#listeners.clear();
+  }
+
+  #update(
+    url: string,
+    patch: Partial<FederationSourceSnapshot<FunctionReturnType<Query>>>,
+  ) {
+    if (this.#closed) return;
+    const source = this.#sources.get(url);
+    if (source === undefined) return;
+    this.#sources.set(url, { ...source, ...patch });
+    this.#snapshot = createFederatedSnapshot(
+      [...this.#sources.values()],
+      this.#options.combine,
+    );
+    for (const listener of this.#listeners) listener();
+  }
+}
diff --git a/packages/decentralized-convex-client/src/snapshot.ts b/packages/decentralized-convex-client/src/snapshot.ts
new file mode 100644
index 00000000..632b6175
--- /dev/null
+++ b/packages/decentralized-convex-client/src/snapshot.ts
@@ -0,0 +1,57 @@
+import type {
+  DefaultCombinedResult,
+  FederatedQuerySnapshot,
+  FederationSourceSnapshot,
+  SuccessfulFederationSource,
+} from "./types.ts";
+
+export function createFederatedSnapshot<Result, Combined>(
+  sources: readonly FederationSourceSnapshot<Result>[],
+  combine?: (
+    sources: readonly SuccessfulFederationSource<Result>[],
+  ) => Combined,
+): FederatedQuerySnapshot<Combined, Result> {
+  const successful = sources.flatMap((source) =>
+    source.status === "live" && source.data !== undefined
+      ? [{ data: source.data, target: source.target }]
+      : [],
+  );
+  const data =
+    combine === undefined
+      ? // The default combiner's conditional return type cannot be proven for an open generic.
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        (defaultCombine(successful) as Combined)
+      : combine(successful);
+
+  return {
+    data,
+    sources,
+    status: getStatus(sources),
+  };
+}
+
+export function defaultCombine<Result>(
+  sources: readonly SuccessfulFederationSource<Result>[],
+) {
+  const values = sources.map((source) => source.data);
+  if (values.every((value) => Array.isArray(value))) {
+    // Runtime array narrowing does not resolve a conditional generic return type.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return values.flat() as DefaultCombinedResult<Result>;
+  }
+  // The non-array branch is the other side of the same conditional generic.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return values as DefaultCombinedResult<Result>;
+}
+
+function getStatus<Result>(
+  sources: readonly FederationSourceSnapshot<Result>[],
+) {
+  if (sources.length === 0) return "success";
+  const live = sources.filter((source) => source.status === "live").length;
+  const errors = sources.filter((source) => source.status === "error").length;
+  if (live === sources.length) return "success";
+  if (errors === sources.length) return "error";
+  if (live > 0) return "partial";
+  return "pending";
+}
diff --git a/packages/decentralized-convex-client/src/targets.ts b/packages/decentralized-convex-client/src/targets.ts
new file mode 100644
index 00000000..ee6c18e9
--- /dev/null
+++ b/packages/decentralized-convex-client/src/targets.ts
@@ -0,0 +1,39 @@
+import type { FederationTarget, FederationTargetGroup } from "./types.ts";
+
+export function normalizeFederationUrl(value: string) {
+  const url = new URL(value);
+  if (url.protocol !== "https:" && !isLocalHttp(url)) {
+    throw new Error("Federation targets must use HTTPS except on localhost");
+  }
+
+  url.hash = "";
+  url.pathname = "";
+  url.search = "";
+  return url.origin;
+}
+
+export function groupFederationTargets(
+  targets: readonly FederationTarget[],
+): readonly FederationTargetGroup[] {
+  const idsByUrl = new Map<string, Set<string>>();
+  for (const target of targets) {
+    const id = target.id.trim();
+    if (id.length === 0)
+      throw new Error("Federation target IDs cannot be empty");
+    const url = normalizeFederationUrl(target.url);
+    const ids = idsByUrl.get(url) ?? new Set<string>();
+    ids.add(id);
+    idsByUrl.set(url, ids);
+  }
+
+  return [...idsByUrl]
+    .map(([url, ids]) => ({ ids: [...ids].sort(), url }))
+    .sort((a, b) => a.url.localeCompare(b.url));
+}
+
+function isLocalHttp(url: URL) {
+  return (
+    url.protocol === "http:" &&
+    (url.hostname === "localhost" || url.hostname === "127.0.0.1")
+  );
+}
diff --git a/packages/decentralized-convex-client/src/types.ts b/packages/decentralized-convex-client/src/types.ts
new file mode 100644
index 00000000..8d97e4c7
--- /dev/null
+++ b/packages/decentralized-convex-client/src/types.ts
@@ -0,0 +1,107 @@
+import type {
+  DefaultFunctionArgs,
+  FunctionArgs,
+  FunctionReference,
+  FunctionReturnType,
+} from "convex/server";
+
+export type FederationQueryReference = FunctionReference<
+  "query",
+  "public",
+  DefaultFunctionArgs,
+  unknown
+>;
+
+export type FederationMutationReference = FunctionReference<
+  "mutation",
+  "public",
+  DefaultFunctionArgs,
+  unknown
+>;
+
+export interface FederationTarget {
+  id: string;
+  url: string;
+}
+
+export interface FederationTargetGroup {
+  ids: readonly string[];
+  url: string;
+}
+
+export type FederationSourceStatus = "pending" | "live" | "error";
+export type FederatedQueryStatus = "pending" | "success" | "partial" | "error";
+
+export interface FederationSourceSnapshot<Result> {
+  data?: Result;
+  error?: Error;
+  status: FederationSourceStatus;
+  target: FederationTargetGroup;
+}
+
+export interface FederatedQuerySnapshot<Combined, Result> {
+  data: Combined;
+  sources: readonly FederationSourceSnapshot<Result>[];
+  status: FederatedQueryStatus;
+}
+
+export interface SuccessfulFederationSource<Result> {
+  data: Result;
+  target: FederationTargetGroup;
+}
+
+export type DefaultCombinedResult<Result> =
+  Result extends readonly (infer Item)[] ? Item[] : Result[];
+
+export type FederatedQueryArgs<Query extends FederationQueryReference> =
+  | FunctionArgs<Query>
+  | ((target: FederationTargetGroup) => FunctionArgs<Query>);
+
+export interface FederatedQueryOptions<
+  Query extends FederationQueryReference,
+  Combined = DefaultCombinedResult<FunctionReturnType<Query>>,
+> {
+  args: FederatedQueryArgs<Query>;
+  combine?: (
+    sources: readonly SuccessfulFederationSource<FunctionReturnType<Query>>[],
+  ) => Combined;
+  query: Query;
+  targets: readonly FederationTarget[];
+}
+
+export interface FederationAuthRequest {
+  forceRefreshToken: boolean;
+  url: string;
+}
+
+export type FederationAuthTokenFetcher = (
+  request: FederationAuthRequest,
+) => Promise<null | string | undefined>;
+
+export interface FederationConnection {
+  close: () => Promise<void>;
+  mutation: <Mutation extends FederationMutationReference>(
+    mutation: Mutation,
+    args: FunctionArgs<Mutation>,
+  ) => Promise<FunctionReturnType<Mutation>>;
+  query: <Query extends FederationQueryReference>(
+    query: Query,
+    args: FunctionArgs<Query>,
+  ) => Promise<FunctionReturnType<Query>>;
+  subscribe: <Query extends FederationQueryReference>(
+    query: Query,
+    args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+    onError: (error: Error) => void,
+  ) => () => void;
+}
+
+export type FederationConnectionFactory = (
+  url: string,
+  getAuthToken?: FederationAuthTokenFetcher,
+) => FederationConnection;
+
+export interface FederationClientOptions {
+  connectionFactory?: FederationConnectionFactory;
+  getAuthToken?: FederationAuthTokenFetcher;
+}
diff --git a/packages/decentralized-convex-client/tsconfig.json b/packages/decentralized-convex-client/tsconfig.json
new file mode 100644
index 00000000..e4011a4e
--- /dev/null
+++ b/packages/decentralized-convex-client/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022", "DOM"],
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-react/eslint.config.ts b/packages/decentralized-convex-react/eslint.config.ts
new file mode 100644
index 00000000..4c962301
--- /dev/null
+++ b/packages/decentralized-convex-react/eslint.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+import { reactConfig } from "@acme/eslint-config/react";
+
+export default defineConfig(baseConfig, strictConfig, reactConfig);
diff --git a/packages/decentralized-convex-react/package.json b/packages/decentralized-convex-react/package.json
new file mode 100644
index 00000000..f3d75d8a
--- /dev/null
+++ b/packages/decentralized-convex-react/package.json
@@ -0,0 +1,36 @@
+{
+  "name": "@decentralized-convex/react",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@decentralized-convex/client": "workspace:*",
+    "convex": "catalog:"
+  },
+  "peerDependencies": {
+    "react": "catalog:react19"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "@types/react": "catalog:react19",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "react": "catalog:react19",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-react/src/index.ts b/packages/decentralized-convex-react/src/index.ts
new file mode 100644
index 00000000..034ea75a
--- /dev/null
+++ b/packages/decentralized-convex-react/src/index.ts
@@ -0,0 +1,6 @@
+export * from "convex/react";
+export {
+  DecentralizedConvexProvider,
+  useDecentralizedConvex,
+} from "./provider.tsx";
+export type { DecentralizedConvexProviderProps } from "./provider.tsx";
diff --git a/packages/decentralized-convex-react/src/provider.tsx b/packages/decentralized-convex-react/src/provider.tsx
new file mode 100644
index 00000000..f446a3e1
--- /dev/null
+++ b/packages/decentralized-convex-react/src/provider.tsx
@@ -0,0 +1,40 @@
+import type { FederationClientOptions } from "@decentralized-convex/client";
+import type { PropsWithChildren } from "react";
+import { createContext, useContext, useEffect, useState } from "react";
+import { DecentralizedConvexClient } from "@decentralized-convex/client";
+
+const ClientContext = createContext<DecentralizedConvexClient | undefined>(
+  undefined,
+);
+
+export interface DecentralizedConvexProviderProps extends PropsWithChildren {
+  client?: DecentralizedConvexClient;
+  options?: FederationClientOptions;
+}
+
+export function DecentralizedConvexProvider({
+  children,
+  client,
+  options,
+}: DecentralizedConvexProviderProps) {
+  const [value] = useState(
+    () => client ?? new DecentralizedConvexClient(options),
+  );
+
+  useEffect(() => {
+    if (client !== undefined) return;
+    return () => void value.close();
+  }, [client, value]);
+
+  return <ClientContext value={value}>{children}</ClientContext>;
+}
+
+export function useDecentralizedConvex() {
+  const client = useContext(ClientContext);
+  if (client === undefined) {
+    throw new Error(
+      "useDecentralizedConvex must be used inside DecentralizedConvexProvider",
+    );
+  }
+  return client;
+}
diff --git a/packages/decentralized-convex-react/tsconfig.json b/packages/decentralized-convex-react/tsconfig.json
new file mode 100644
index 00000000..ea4432e2
--- /dev/null
+++ b/packages/decentralized-convex-react/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "jsx": "react-jsx",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
+}
diff --git a/packages/decentralized-convex-server/eslint.config.ts b/packages/decentralized-convex-server/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-server/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-server/package.json b/packages/decentralized-convex-server/package.json
new file mode 100644
index 00000000..2107b8ca
--- /dev/null
+++ b/packages/decentralized-convex-server/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@decentralized-convex/server",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "convex": "catalog:"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-server/src/descriptor.test.ts b/packages/decentralized-convex-server/src/descriptor.test.ts
new file mode 100644
index 00000000..3c3e6c73
--- /dev/null
+++ b/packages/decentralized-convex-server/src/descriptor.test.ts
@@ -0,0 +1,19 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { federationDescriptorResponse } from "./descriptor.ts";
+
+void test("serves a capability-oriented descriptor", async () => {
+  const response = federationDescriptorResponse({
+    capabilities: [{ id: "example.notes", versions: ["1"] }],
+    deploymentUrl: "https://notes.example",
+    protocolVersion: "0.1",
+  });
+
+  assert.equal(response.status, 200);
+  assert.deepEqual(await response.json(), {
+    capabilities: [{ id: "example.notes", versions: ["1"] }],
+    deploymentUrl: "https://notes.example",
+    protocolVersion: "0.1",
+  });
+});
diff --git a/packages/decentralized-convex-server/src/descriptor.ts b/packages/decentralized-convex-server/src/descriptor.ts
new file mode 100644
index 00000000..7cbaec50
--- /dev/null
+++ b/packages/decentralized-convex-server/src/descriptor.ts
@@ -0,0 +1,76 @@
+import type { HttpActionBuilder, HttpRouter } from "convex/server";
+
+export const FEDERATION_DESCRIPTOR_PATH = "/.well-known/decentralized-convex";
+
+export interface FederationCapability {
+  id: string;
+  versions: readonly string[];
+}
+
+export interface FederationAuthDescriptor {
+  issuer: string;
+  jwksUrl: string;
+}
+
+export interface FederationDescriptor {
+  auth?: FederationAuthDescriptor;
+  capabilities?: readonly FederationCapability[];
+  deploymentUrl: string;
+  protocolVersion: "0.1";
+}
+
+export interface RegisterFederationRoutesOptions {
+  descriptor: FederationDescriptor | (() => FederationDescriptor);
+  path?: string;
+}
+
+export function registerFederationRoutes(
+  router: HttpRouter,
+  httpAction: HttpActionBuilder,
+  options: RegisterFederationRoutesOptions,
+) {
+  const path = options.path ?? FEDERATION_DESCRIPTOR_PATH;
+  router.route({
+    handler: httpAction(() =>
+      Promise.resolve(
+        federationDescriptorResponse(resolveDescriptor(options.descriptor)),
+      ),
+    ),
+    method: "GET",
+    path,
+  });
+  router.route({
+    handler: httpAction(() => Promise.resolve(corsResponse())),
+    method: "OPTIONS",
+    path,
+  });
+  return router;
+}
+
+export function federationDescriptorResponse(descriptor: FederationDescriptor) {
+  return new Response(JSON.stringify(descriptor), {
+    headers: {
+      ...corsHeaders(),
+      "content-type": "application/json; charset=utf-8",
+    },
+  });
+}
+
+function resolveDescriptor(
+  descriptor: FederationDescriptor | (() => FederationDescriptor),
+) {
+  return typeof descriptor === "function" ? descriptor() : descriptor;
+}
+
+function corsResponse() {
+  return new Response(null, { headers: corsHeaders(), status: 204 });
+}
+
+function corsHeaders() {
+  return {
+    "access-control-allow-headers": "authorization, content-type",
+    "access-control-allow-methods": "GET, OPTIONS",
+    "access-control-allow-origin": "*",
+    "cache-control": "public, max-age=300",
+  };
+}
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
new file mode 100644
index 00000000..f1635aa6
--- /dev/null
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -0,0 +1,11 @@
+export {
+  FEDERATION_DESCRIPTOR_PATH,
+  federationDescriptorResponse,
+  registerFederationRoutes,
+} from "./descriptor.ts";
+export type {
+  FederationAuthDescriptor,
+  FederationCapability,
+  FederationDescriptor,
+  RegisterFederationRoutesOptions,
+} from "./descriptor.ts";
diff --git a/packages/decentralized-convex-server/tsconfig.json b/packages/decentralized-convex-server/tsconfig.json
new file mode 100644
index 00000000..e4011a4e
--- /dev/null
+++ b/packages/decentralized-convex-server/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022", "DOM"],
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-tanstack-query/eslint.config.ts b/packages/decentralized-convex-tanstack-query/eslint.config.ts
new file mode 100644
index 00000000..4c962301
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/eslint.config.ts
@@ -0,0 +1,6 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+import { reactConfig } from "@acme/eslint-config/react";
+
+export default defineConfig(baseConfig, strictConfig, reactConfig);
diff --git a/packages/decentralized-convex-tanstack-query/package.json b/packages/decentralized-convex-tanstack-query/package.json
new file mode 100644
index 00000000..80159739
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "@decentralized-convex/tanstack-query",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@decentralized-convex/client": "workspace:*",
+    "@decentralized-convex/react": "workspace:*",
+    "@tanstack/react-query": "catalog:",
+    "convex": "catalog:"
+  },
+  "peerDependencies": {
+    "react": "catalog:react19"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "@types/react": "catalog:react19",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "react": "catalog:react19",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
new file mode 100644
index 00000000..93740b52
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -0,0 +1,4 @@
+export { federatedQueryOptions } from "./options.ts";
+export type { FederatedTanStackQueryOptions } from "./options.ts";
+export { useFederatedQuery } from "./useFederatedQuery.ts";
+export type { FederatedTanStackQueryResult } from "./useFederatedQuery.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/options.ts b/packages/decentralized-convex-tanstack-query/src/options.ts
new file mode 100644
index 00000000..ceeddd8e
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/options.ts
@@ -0,0 +1,24 @@
+import type {
+  DefaultCombinedResult,
+  FederatedQueryOptions,
+  FederationQueryReference,
+} from "@decentralized-convex/client";
+import type { QueryKey } from "@tanstack/react-query";
+import type { FunctionReturnType } from "convex/server";
+
+export interface FederatedTanStackQueryOptions<
+  Query extends FederationQueryReference,
+  Combined = DefaultCombinedResult<FunctionReturnType<Query>>,
+> extends FederatedQueryOptions<Query, Combined> {
+  enabled?: boolean;
+  queryKey: QueryKey;
+}
+
+export function federatedQueryOptions<
+  Query extends FederationQueryReference,
+  Combined = DefaultCombinedResult<FunctionReturnType<Query>>,
+>(
+  options: FederatedTanStackQueryOptions<Query, Combined>,
+): FederatedTanStackQueryOptions<Query, Combined> {
+  return options;
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts b/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts
new file mode 100644
index 00000000..b9ff0e62
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts
@@ -0,0 +1,102 @@
+import type {
+  FederatedQueryStatus,
+  FederationQueryReference,
+  FederationSourceSnapshot,
+} from "@decentralized-convex/client";
+import type { DefaultError, UseQueryResult } from "@tanstack/react-query";
+import type { FunctionReturnType } from "convex/server";
+import { useEffect, useEffectEvent, useState } from "react";
+import { hashKey, useQuery, useQueryClient } from "@tanstack/react-query";
+import { groupFederationTargets } from "@decentralized-convex/client";
+import { useDecentralizedConvex } from "@decentralized-convex/react";
+
+import type { FederatedTanStackQueryOptions } from "./options.ts";
+
+export type FederatedTanStackQueryResult<Data, SourceResult> = UseQueryResult<
+  Data,
+  DefaultError
+> & {
+  federation: {
+    sources: readonly FederationSourceSnapshot<SourceResult>[];
+    status: FederatedQueryStatus;
+  };
+};
+
+interface FederationState<SourceResult> {
+  sources: readonly FederationSourceSnapshot<SourceResult>[];
+  status: FederatedQueryStatus;
+}
+
+export function useFederatedQuery<
+  Query extends FederationQueryReference,
+  Combined,
+>(
+  options: FederatedTanStackQueryOptions<Query, Combined>,
+): FederatedTanStackQueryResult<Combined, FunctionReturnType<Query>> {
+  const client = useDecentralizedConvex();
+  const queryClient = useQueryClient();
+  const queryHash = hashKey(options.queryKey);
+  const [federation, setFederation] = useState<
+    FederationState<FunctionReturnType<Query>>
+  >(() => emptyFederation(options));
+  const startObserver = useEffectEvent(() => client.watchQuery(options));
+  const publish = useEffectEvent(
+    (snapshot: ReturnType<ReturnType<typeof startObserver>["getSnapshot"]>) => {
+      setFederation({ sources: snapshot.sources, status: snapshot.status });
+      if (snapshot.status === "success" || snapshot.status === "partial") {
+        queryClient.setQueryData(options.queryKey, snapshot.data);
+      }
+    },
+  );
+
+  const query = useQuery({
+    enabled: options.enabled,
+    queryFn: async () => {
+      const snapshot = await client.query(options);
+      if (snapshot.status === "error") {
+        throw new AggregateError(
+          snapshot.sources.flatMap((source) => source.error ?? []),
+          "Every federation target failed",
+        );
+      }
+      return snapshot.data;
+    },
+    queryKey: options.queryKey,
+    staleTime: Infinity,
+  });
+
+  useEffect(() => {
+    if (options.enabled === false) return;
+    const observer = startObserver();
+    function publishCurrent() {
+      publish(observer.getSnapshot());
+    }
+    publishCurrent();
+    const unsubscribe = observer.subscribe(publishCurrent);
+    return () => {
+      unsubscribe();
+      observer.close();
+    };
+  }, [options.enabled, queryHash]);
+
+  return {
+    ...query,
+    federation: {
+      sources: federation.sources,
+      status: federation.status,
+    },
+  };
+}
+
+function emptyFederation<Query extends FederationQueryReference, Combined>(
+  options: FederatedTanStackQueryOptions<Query, Combined>,
+): FederationState<FunctionReturnType<Query>> {
+  const sources = groupFederationTargets(options.targets).map((target) => ({
+    status: "pending" as const,
+    target,
+  }));
+  return {
+    sources,
+    status: sources.length === 0 ? "success" : "pending",
+  };
+}
diff --git a/packages/decentralized-convex-tanstack-query/tsconfig.json b/packages/decentralized-convex-tanstack-query/tsconfig.json
new file mode 100644
index 00000000..ea4432e2
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "jsx": "react-jsx",
+    "lib": ["ES2022", "DOM", "DOM.Iterable"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 67bc2a4b..9ad30a40 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,15 +12,36 @@ catalogs:
     '@tailwindcss/postcss':
       specifier: ^4.1.16
       version: 4.2.2
+    '@tanstack/react-query':
+      specifier: ^5.90.8
+      version: 5.101.4
+    '@tanstack/react-router':
+      specifier: ~1.159.6
+      version: 1.159.14
+    '@tanstack/react-router-ssr-query':
+      specifier: ~1.159.6
+      version: 1.159.14
+    '@tanstack/react-start':
+      specifier: ~1.159.6
+      version: 1.159.14
+    '@tanstack/router-cli':
+      specifier: ~1.159.6
+      version: 1.159.9
     '@types/node':
       specifier: ^24
       version: 24.12.2
     '@typescript/native-preview':
       specifier: 7.0.0-dev.20260512.1
       version: 7.0.0-dev.20260512.1
+    '@vitejs/plugin-react':
+      specifier: 5.1.0
+      version: 5.1.0
     class-variance-authority:
       specifier: ^0.7.1
       version: 0.7.1
+    convex:
+      specifier: 1.38.0
+      version: 1.38.0
     eslint:
       specifier: ^9.38.0
       version: 9.39.4
@@ -43,9 +64,15 @@ catalogs:
     '@types/react':
       specifier: ~19.2.0
       version: 19.2.14
+    '@types/react-dom':
+      specifier: ~19.2.0
+      version: 19.2.3
     react:
       specifier: ~19.2.4
       version: 19.2.5
+    react-dom:
+      specifier: ~19.2.4
+      version: 19.2.5
 
 overrides:
   '@types/minimatch': 5.1.2
@@ -85,15 +112,117 @@ importers:
         version: 5.9.3
 
   apps/web:
+    dependencies:
+      '@convex-dev/better-auth':
+        specifier: 0.12.5
+        version: 0.12.5(@standard-schema/spec@1.1.0)(better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)
+      '@decentralized-convex/client':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-client
+      '@decentralized-convex/react':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-react
+      '@decentralized-convex/tanstack-query':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-tanstack-query
+      '@tanstack/react-query':
+        specifier: 'catalog:'
+        version: 5.101.4(react@19.2.5)
+      '@tanstack/react-router':
+        specifier: 'catalog:'
+        version: 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/react-router-ssr-query':
+        specifier: 'catalog:'
+        version: 1.159.14(@tanstack/query-core@5.101.4)(@tanstack/react-query@5.101.4(react@19.2.5))(@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.159.9)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/react-start':
+        specifier: 'catalog:'
+        version: 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))
+      '@vera/backend':
+        specifier: workspace:*
+        version: link:../../services/backend
+      better-auth:
+        specifier: ~1.6.15
+        version: 1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+      react:
+        specifier: catalog:react19
+        version: 19.2.5
+      react-dom:
+        specifier: catalog:react19
+        version: 19.2.5(react@19.2.5)
     devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@tanstack/router-cli':
+        specifier: 'catalog:'
+        version: 1.159.9
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      '@types/react':
+        specifier: catalog:react19
+        version: 19.2.14
+      '@types/react-dom':
+        specifier: catalog:react19
+        version: 19.2.3(@types/react@19.2.14)
+      '@vitejs/plugin-react':
+        specifier: 'catalog:'
+        version: 5.1.0(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
       prettier:
         specifier: 'catalog:'
         version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
       vite:
         specifier: ^7.3.1
         version: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
 
-  packages/app-config:
+  packages/decentralized-convex-address:
+    dependencies:
+      '@decentralized-convex/client':
+        specifier: workspace:*
+        version: link:../decentralized-convex-client
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  packages/decentralized-convex-client:
+    dependencies:
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
     devDependencies:
       '@acme/eslint-config':
         specifier: workspace:*
@@ -117,7 +246,176 @@ importers:
         specifier: 'catalog:'
         version: 5.9.3
 
-  packages/ui:
+  packages/decentralized-convex-react:
+    dependencies:
+      '@decentralized-convex/client':
+        specifier: workspace:*
+        version: link:../decentralized-convex-client
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      '@types/react':
+        specifier: catalog:react19
+        version: 19.2.14
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      react:
+        specifier: catalog:react19
+        version: 19.2.5
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  packages/decentralized-convex-server:
+    dependencies:
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  packages/decentralized-convex-tanstack-query:
+    dependencies:
+      '@decentralized-convex/client':
+        specifier: workspace:*
+        version: link:../decentralized-convex-client
+      '@decentralized-convex/react':
+        specifier: workspace:*
+        version: link:../decentralized-convex-react
+      '@tanstack/react-query':
+        specifier: 'catalog:'
+        version: 5.101.4(react@19.2.5)
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      '@types/react':
+        specifier: catalog:react19
+        version: 19.2.14
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      react:
+        specifier: catalog:react19
+        version: 19.2.5
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  services/backend:
+    dependencies:
+      '@convex-dev/better-auth':
+        specifier: 0.12.5
+        version: 0.12.5(@standard-schema/spec@1.1.0)(better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)
+      '@decentralized-convex/server':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-server
+      better-auth:
+        specifier: ~1.6.15
+        version: 1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  shared/app-config:
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  shared/ui:
     dependencies:
       '@radix-ui/react-alert-dialog':
         specifier: ^1.1.14
@@ -356,6 +654,10 @@ packages:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
     engines: {node: '>=10'}
 
+  '@babel/code-frame@7.27.1':
+    resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/code-frame@7.29.0':
     resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
     engines: {node: '>=6.9.0'}
@@ -412,6 +714,10 @@ packages:
     resolution: {integrity: sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-plugin-utils@7.29.7':
+    resolution: {integrity: sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-replace-supers@7.28.6':
     resolution: {integrity: sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==}
     engines: {node: '>=6.9.0'}
@@ -450,6 +756,30 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-syntax-jsx@7.29.7':
+    resolution: {integrity: sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-typescript@7.29.7':
+    resolution: {integrity: sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-self@7.29.7':
+    resolution: {integrity: sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-source@7.29.7':
+    resolution: {integrity: sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/template@7.28.6':
     resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
     engines: {node: '>=6.9.0'}
@@ -462,6 +792,92 @@ packages:
     resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
     engines: {node: '>=6.9.0'}
 
+  '@better-auth/core@1.6.25':
+    resolution: {integrity: sha512-lMTlhtwyK4NpY9kPF+2rQCRKYpg136d3gM2xl8esxT1PjJx5Nh5YwZvxcYCIjDuO759sx6TCloJTuwcZGG6ZBw==}
+    peerDependencies:
+      '@better-auth/utils': 0.4.2
+      '@better-fetch/fetch': 1.3.1
+      '@cloudflare/workers-types': '>=4'
+      '@opentelemetry/api': ^1.9.0
+      better-call: 1.3.7
+      jose: ^6.1.0
+      kysely: ^0.28.5 || ^0.29.0
+      nanostores: ^1.0.1
+    peerDependenciesMeta:
+      '@cloudflare/workers-types':
+        optional: true
+      '@opentelemetry/api':
+        optional: true
+
+  '@better-auth/drizzle-adapter@1.6.25':
+    resolution: {integrity: sha512-ru/DeKjFPQUVeKkxF/ScazmPqIY7lwfkAV5Yt4j24wmn1Y8vFwoiPRnHgXUeZqBs10+nubaRwEqLF39CP6EhRw==}
+    peerDependencies:
+      '@better-auth/core': ^1.6.25
+      '@better-auth/utils': 0.4.2
+      drizzle-orm: ^0.45.2
+    peerDependenciesMeta:
+      drizzle-orm:
+        optional: true
+
+  '@better-auth/kysely-adapter@1.6.25':
+    resolution: {integrity: sha512-zxiePhtN1YClS1irKYPVwWfN6kYp+QoYlz1hdQUOj8hXyo2aE/ny4RNAb6v332b0+U6Vu88EhYITRPdmvCo6uA==}
+    peerDependencies:
+      '@better-auth/core': ^1.6.25
+      '@better-auth/utils': 0.4.2
+      kysely: ^0.28.17 || ^0.29.0
+    peerDependenciesMeta:
+      kysely:
+        optional: true
+
+  '@better-auth/memory-adapter@1.6.25':
+    resolution: {integrity: sha512-GhEzTumc8yfTz+OZ6pMg06BA49xob49x1bX+1mEl/FStDJoSF+6mTfI5M2ytFxaiN89336/aUjkW8u+qRyLexw==}
+    peerDependencies:
+      '@better-auth/core': ^1.6.25
+      '@better-auth/utils': 0.4.2
+
+  '@better-auth/mongo-adapter@1.6.25':
+    resolution: {integrity: sha512-ZtMmjcOdXR2Ziqx5y8ptTOaNpe0snNfALbBUPXJsgeyeRkDJDYzyLZ8MpuvNBTNllNeIFDbiXWAK5k+pEBZrUQ==}
+    peerDependencies:
+      '@better-auth/core': ^1.6.25
+      '@better-auth/utils': 0.4.2
+      mongodb: ^6.0.0 || ^7.0.0
+    peerDependenciesMeta:
+      mongodb:
+        optional: true
+
+  '@better-auth/prisma-adapter@1.6.25':
+    resolution: {integrity: sha512-ym7B6Iqcry+/4aQnYpFwqP/GBIiXvjrm/5B6+0qmx8mkTY/apHFTpHuGzUYYNf4vPTtzF3eYY2+s2GOsomKaRg==}
+    peerDependencies:
+      '@better-auth/core': ^1.6.25
+      '@better-auth/utils': 0.4.2
+      '@prisma/client': ^5.0.0 || ^6.0.0 || ^7.0.0
+      prisma: ^5.0.0 || ^6.0.0 || ^7.0.0
+    peerDependenciesMeta:
+      '@prisma/client':
+        optional: true
+      prisma:
+        optional: true
+
+  '@better-auth/telemetry@1.6.25':
+    resolution: {integrity: sha512-2ZfC9lp7tU6Jw/q2Lz/bKfQqGMdMwc/IQDTYdBhvtGi24qInYVnhp2ZCW57hHM9j+fq1ULOtxgg6M3T1LEaihw==}
+    peerDependencies:
+      '@better-auth/core': ^1.6.25
+      '@better-auth/utils': 0.4.2
+      '@better-fetch/fetch': 1.3.1
+
+  '@better-auth/utils@0.4.2':
+    resolution: {integrity: sha512-AUxrvu+HaaODsUyzDxFgwd/8RZ1yZaYo42LXKSrU2oGgR38pS1ij8nqQKNgtTWoYGpNevNXtCfgTy6loHveW9A==}
+
+  '@better-fetch/fetch@1.3.1':
+    resolution: {integrity: sha512-ABkD1WhyfPZprKRQI3bhATjeiFuNWC9PXhfGWqL+sg/gKrM977oFrYkdb4msM3hgUGonr7KlOsOFT5TU2rht9g==}
+
+  '@convex-dev/better-auth@0.12.5':
+    resolution: {integrity: sha512-YFUbGk04OlINno9FpOTNZN67AP+kSQsblfep5zs1f/WTgMWjD5FymU6rSSh3mu52gukmDNnBJTjC/lj4QRpjlQ==}
+    peerDependencies:
+      better-auth: '>=1.6.11 <1.7.0'
+      convex: ^1.25.0
+      react: ^18.3.1 || ^19.0.0
+
   '@effect/language-service@0.85.1':
     resolution: {integrity: sha512-EXnJjIy6zQ3nUO/MZ+ynWUb8B895KZPotd1++oTs9JjDkplwM7cb6zo8Zq2zU6piwq+KflO7amXbEfj1UMpHkw==}
     hasBin: true
@@ -472,6 +888,12 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
+  '@esbuild/aix-ppc64@0.27.0':
+    resolution: {integrity: sha512-KuZrd2hRjz01y5JK9mEBSD3Vj3mbCvemhT466rSuJYeE/hjuBrHfjjcjMdTm/sz7au+++sdbJZJmuBwQLuw68A==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
   '@esbuild/aix-ppc64@0.27.7':
     resolution: {integrity: sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==}
     engines: {node: '>=18'}
@@ -484,6 +906,12 @@ packages:
     cpu: [arm64]
     os: [android]
 
+  '@esbuild/android-arm64@0.27.0':
+    resolution: {integrity: sha512-CC3vt4+1xZrs97/PKDkl0yN7w8edvU2vZvAFGD16n9F0Cvniy5qvzRXjfO1l94efczkkQE6g1x0i73Qf5uthOQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
   '@esbuild/android-arm64@0.27.7':
     resolution: {integrity: sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==}
     engines: {node: '>=18'}
@@ -496,6 +924,12 @@ packages:
     cpu: [arm]
     os: [android]
 
+  '@esbuild/android-arm@0.27.0':
+    resolution: {integrity: sha512-j67aezrPNYWJEOHUNLPj9maeJte7uSMM6gMoxfPC9hOg8N02JuQi/T7ewumf4tNvJadFkvLZMlAq73b9uwdMyQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
   '@esbuild/android-arm@0.27.7':
     resolution: {integrity: sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==}
     engines: {node: '>=18'}
@@ -508,6 +942,12 @@ packages:
     cpu: [x64]
     os: [android]
 
+  '@esbuild/android-x64@0.27.0':
+    resolution: {integrity: sha512-wurMkF1nmQajBO1+0CJmcN17U4BP6GqNSROP8t0X/Jiw2ltYGLHpEksp9MpoBqkrFR3kv2/te6Sha26k3+yZ9Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
   '@esbuild/android-x64@0.27.7':
     resolution: {integrity: sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==}
     engines: {node: '>=18'}
@@ -520,6 +960,12 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
+  '@esbuild/darwin-arm64@0.27.0':
+    resolution: {integrity: sha512-uJOQKYCcHhg07DL7i8MzjvS2LaP7W7Pn/7uA0B5S1EnqAirJtbyw4yC5jQ5qcFjHK9l6o/MX9QisBg12kNkdHg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
   '@esbuild/darwin-arm64@0.27.7':
     resolution: {integrity: sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==}
     engines: {node: '>=18'}
@@ -532,14 +978,26 @@ packages:
     cpu: [x64]
     os: [darwin]
 
+  '@esbuild/darwin-x64@0.27.0':
+    resolution: {integrity: sha512-8mG6arH3yB/4ZXiEnXof5MK72dE6zM9cDvUcPtxhUZsDjESl9JipZYW60C3JGreKCEP+p8P/72r69m4AZGJd5g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
   '@esbuild/darwin-x64@0.27.7':
     resolution: {integrity: sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/freebsd-arm64@0.25.12':
-    resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
+  '@esbuild/freebsd-arm64@0.25.12':
+    resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.27.0':
+    resolution: {integrity: sha512-9FHtyO988CwNMMOE3YIeci+UV+x5Zy8fI2qHNpsEtSF83YPBmE8UWmfYAQg6Ux7Gsmd4FejZqnEUZCMGaNQHQw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
@@ -556,6 +1014,12 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
+  '@esbuild/freebsd-x64@0.27.0':
+    resolution: {integrity: sha512-zCMeMXI4HS/tXvJz8vWGexpZj2YVtRAihHLk1imZj4efx1BQzN76YFeKqlDr3bUWI26wHwLWPd3rwh6pe4EV7g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
   '@esbuild/freebsd-x64@0.27.7':
     resolution: {integrity: sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==}
     engines: {node: '>=18'}
@@ -568,6 +1032,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm64@0.27.0':
+    resolution: {integrity: sha512-AS18v0V+vZiLJyi/4LphvBE+OIX682Pu7ZYNsdUHyUKSoRwdnOsMf6FDekwoAFKej14WAkOef3zAORJgAtXnlQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
   '@esbuild/linux-arm64@0.27.7':
     resolution: {integrity: sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==}
     engines: {node: '>=18'}
@@ -580,6 +1050,12 @@ packages:
     cpu: [arm]
     os: [linux]
 
+  '@esbuild/linux-arm@0.27.0':
+    resolution: {integrity: sha512-t76XLQDpxgmq2cNXKTVEB7O7YMb42atj2Re2Haf45HkaUpjM2J0UuJZDuaGbPbamzZ7bawyGFUkodL+zcE+jvQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-arm@0.27.7':
     resolution: {integrity: sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==}
     engines: {node: '>=18'}
@@ -592,6 +1068,12 @@ packages:
     cpu: [ia32]
     os: [linux]
 
+  '@esbuild/linux-ia32@0.27.0':
+    resolution: {integrity: sha512-Mz1jxqm/kfgKkc/KLHC5qIujMvnnarD9ra1cEcrs7qshTUSksPihGrWHVG5+osAIQ68577Zpww7SGapmzSt4Nw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.27.7':
     resolution: {integrity: sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==}
     engines: {node: '>=18'}
@@ -604,6 +1086,12 @@ packages:
     cpu: [loong64]
     os: [linux]
 
+  '@esbuild/linux-loong64@0.27.0':
+    resolution: {integrity: sha512-QbEREjdJeIreIAbdG2hLU1yXm1uu+LTdzoq1KCo4G4pFOLlvIspBm36QrQOar9LFduavoWX2msNFAAAY9j4BDg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
   '@esbuild/linux-loong64@0.27.7':
     resolution: {integrity: sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==}
     engines: {node: '>=18'}
@@ -616,6 +1104,12 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
+  '@esbuild/linux-mips64el@0.27.0':
+    resolution: {integrity: sha512-sJz3zRNe4tO2wxvDpH/HYJilb6+2YJxo/ZNbVdtFiKDufzWq4JmKAiHy9iGoLjAV7r/W32VgaHGkk35cUXlNOg==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
   '@esbuild/linux-mips64el@0.27.7':
     resolution: {integrity: sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==}
     engines: {node: '>=18'}
@@ -628,6 +1122,12 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
+  '@esbuild/linux-ppc64@0.27.0':
+    resolution: {integrity: sha512-z9N10FBD0DCS2dmSABDBb5TLAyF1/ydVb+N4pi88T45efQ/w4ohr/F/QYCkxDPnkhkp6AIpIcQKQ8F0ANoA2JA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
   '@esbuild/linux-ppc64@0.27.7':
     resolution: {integrity: sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==}
     engines: {node: '>=18'}
@@ -640,6 +1140,12 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
+  '@esbuild/linux-riscv64@0.27.0':
+    resolution: {integrity: sha512-pQdyAIZ0BWIC5GyvVFn5awDiO14TkT/19FTmFcPdDec94KJ1uZcmFs21Fo8auMXzD4Tt+diXu1LW1gHus9fhFQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
   '@esbuild/linux-riscv64@0.27.7':
     resolution: {integrity: sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==}
     engines: {node: '>=18'}
@@ -652,6 +1158,12 @@ packages:
     cpu: [s390x]
     os: [linux]
 
+  '@esbuild/linux-s390x@0.27.0':
+    resolution: {integrity: sha512-hPlRWR4eIDDEci953RI1BLZitgi5uqcsjKMxwYfmi4LcwyWo2IcRP+lThVnKjNtk90pLS8nKdroXYOqW+QQH+w==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
   '@esbuild/linux-s390x@0.27.7':
     resolution: {integrity: sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==}
     engines: {node: '>=18'}
@@ -664,6 +1176,12 @@ packages:
     cpu: [x64]
     os: [linux]
 
+  '@esbuild/linux-x64@0.27.0':
+    resolution: {integrity: sha512-1hBWx4OUJE2cab++aVZ7pObD6s+DK4mPGpemtnAORBvb5l/g5xFGk0vc0PjSkrDs0XaXj9yyob3d14XqvnQ4gw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
   '@esbuild/linux-x64@0.27.7':
     resolution: {integrity: sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==}
     engines: {node: '>=18'}
@@ -676,6 +1194,12 @@ packages:
     cpu: [arm64]
     os: [netbsd]
 
+  '@esbuild/netbsd-arm64@0.27.0':
+    resolution: {integrity: sha512-6m0sfQfxfQfy1qRuecMkJlf1cIzTOgyaeXaiVaaki8/v+WB+U4hc6ik15ZW6TAllRlg/WuQXxWj1jx6C+dfy3w==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
   '@esbuild/netbsd-arm64@0.27.7':
     resolution: {integrity: sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==}
     engines: {node: '>=18'}
@@ -688,6 +1212,12 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
+  '@esbuild/netbsd-x64@0.27.0':
+    resolution: {integrity: sha512-xbbOdfn06FtcJ9d0ShxxvSn2iUsGd/lgPIO2V3VZIPDbEaIj1/3nBBe1AwuEZKXVXkMmpr6LUAgMkLD/4D2PPA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
   '@esbuild/netbsd-x64@0.27.7':
     resolution: {integrity: sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==}
     engines: {node: '>=18'}
@@ -700,6 +1230,12 @@ packages:
     cpu: [arm64]
     os: [openbsd]
 
+  '@esbuild/openbsd-arm64@0.27.0':
+    resolution: {integrity: sha512-fWgqR8uNbCQ/GGv0yhzttj6sU/9Z5/Sv/VGU3F5OuXK6J6SlriONKrQ7tNlwBrJZXRYk5jUhuWvF7GYzGguBZQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
   '@esbuild/openbsd-arm64@0.27.7':
     resolution: {integrity: sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==}
     engines: {node: '>=18'}
@@ -712,6 +1248,12 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
+  '@esbuild/openbsd-x64@0.27.0':
+    resolution: {integrity: sha512-aCwlRdSNMNxkGGqQajMUza6uXzR/U0dIl1QmLjPtRbLOx3Gy3otfFu/VjATy4yQzo9yFDGTxYDo1FfAD9oRD2A==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
   '@esbuild/openbsd-x64@0.27.7':
     resolution: {integrity: sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==}
     engines: {node: '>=18'}
@@ -724,6 +1266,12 @@ packages:
     cpu: [arm64]
     os: [openharmony]
 
+  '@esbuild/openharmony-arm64@0.27.0':
+    resolution: {integrity: sha512-nyvsBccxNAsNYz2jVFYwEGuRRomqZ149A39SHWk4hV0jWxKM0hjBPm3AmdxcbHiFLbBSwG6SbpIcUbXjgyECfA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openharmony]
+
   '@esbuild/openharmony-arm64@0.27.7':
     resolution: {integrity: sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==}
     engines: {node: '>=18'}
@@ -736,6 +1284,12 @@ packages:
     cpu: [x64]
     os: [sunos]
 
+  '@esbuild/sunos-x64@0.27.0':
+    resolution: {integrity: sha512-Q1KY1iJafM+UX6CFEL+F4HRTgygmEW568YMqDA5UV97AuZSm21b7SXIrRJDwXWPzr8MGr75fUZPV67FdtMHlHA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
   '@esbuild/sunos-x64@0.27.7':
     resolution: {integrity: sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==}
     engines: {node: '>=18'}
@@ -748,6 +1302,12 @@ packages:
     cpu: [arm64]
     os: [win32]
 
+  '@esbuild/win32-arm64@0.27.0':
+    resolution: {integrity: sha512-W1eyGNi6d+8kOmZIwi/EDjrL9nxQIQ0MiGqe/AWc6+IaHloxHSGoeRgDRKHFISThLmsewZ5nHFvGFWdBYlgKPg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
   '@esbuild/win32-arm64@0.27.7':
     resolution: {integrity: sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==}
     engines: {node: '>=18'}
@@ -760,6 +1320,12 @@ packages:
     cpu: [ia32]
     os: [win32]
 
+  '@esbuild/win32-ia32@0.27.0':
+    resolution: {integrity: sha512-30z1aKL9h22kQhilnYkORFYt+3wp7yZsHWus+wSKAJR8JtdfI76LJ4SBdMsCopTR3z/ORqVu5L1vtnHZWVj4cQ==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
   '@esbuild/win32-ia32@0.27.7':
     resolution: {integrity: sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==}
     engines: {node: '>=18'}
@@ -772,6 +1338,12 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@esbuild/win32-x64@0.27.0':
+    resolution: {integrity: sha512-aIitBcjQeyOhMTImhLZmtxfdOcuNRpwlPNmlFKPcHQYPhEssw75Cl1TSXJXpMkzaua9FUetx/4OQKq7eJul5Cg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
   '@esbuild/win32-x64@0.27.7':
     resolution: {integrity: sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==}
     engines: {node: '>=18'}
@@ -1024,6 +1596,34 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
+  '@noble/ciphers@2.2.0':
+    resolution: {integrity: sha512-Z6pjIZ/8IJcCGzb2S/0Px5J81yij85xASuk1teLNeg75bfT07MV3a/O2Mtn1I2se43k3lkVEcFaR10N4cgQcZA==}
+    engines: {node: '>= 20.19.0'}
+
+  '@noble/hashes@2.2.0':
+    resolution: {integrity: sha512-IYqDGiTXab6FniAgnSdZwgWbomxpy9FtYvLKs7wCUs2a8RkITG+DFGO1DM9cr+E3/RgADRpFjrKVaJ1z6sjtEg==}
+    engines: {node: '>= 20.19.0'}
+
+  '@oozcitak/dom@2.0.2':
+    resolution: {integrity: sha512-GjpKhkSYC3Mj4+lfwEyI1dqnsKTgwGy48ytZEhm4A/xnH/8z9M3ZVXKr/YGQi3uCLs1AEBS+x5T2JPiueEDW8w==}
+    engines: {node: '>=20.0'}
+
+  '@oozcitak/infra@2.0.2':
+    resolution: {integrity: sha512-2g+E7hoE2dgCz/APPOEK5s3rMhJvNxSMBrP+U+j1OWsIbtSpWxxlUjq1lU8RIsFJNYv7NMlnVsCuHcUzJW+8vA==}
+    engines: {node: '>=20.0'}
+
+  '@oozcitak/url@3.0.0':
+    resolution: {integrity: sha512-ZKfET8Ak1wsLAiLWNfFkZc/BraDccuTJKR6svTYc7sVjbR+Iu0vtXdiDMY4o6jaFl5TW2TlS7jbLl4VovtAJWQ==}
+    engines: {node: '>=20.0'}
+
+  '@oozcitak/util@10.0.0':
+    resolution: {integrity: sha512-hAX0pT/73190NLqBPPWSdBVGtbY6VOhWYK3qqHqtXQ1gK7kS2yz4+ivsN07hpJ6I3aeMtKP6J6npsEKOAzuTLA==}
+    engines: {node: '>=20.0'}
+
+  '@opentelemetry/semantic-conventions@1.43.0':
+    resolution: {integrity: sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg==}
+    engines: {node: '>=14'}
+
   '@radix-ui/number@1.1.1':
     resolution: {integrity: sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==}
 
@@ -1502,6 +2102,12 @@ packages:
   '@radix-ui/rect@1.1.1':
     resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==}
 
+  '@rolldown/pluginutils@1.0.0-beta.40':
+    resolution: {integrity: sha512-s3GeJKSQOwBlzdUrj4ISjJj5SfSh+aqn0wjOar4Bx95iV1ETI7F6S/5hLcfAxZ9kXDcyrAkxPlqmd1ZITttf+w==}
+
+  '@rolldown/pluginutils@1.0.0-beta.43':
+    resolution: {integrity: sha512-5Uxg7fQUCmfhax7FJke2+8B6cqgeUJUD9o2uXIKXhD+mG0mL6NObmVoi9wXEU1tY89mZKgAYA6fTbftx3q2ZPQ==}
+
   '@rollup/rollup-android-arm-eabi@4.60.1':
     resolution: {integrity: sha512-d6FinEBLdIiK+1uACUttJKfgZREXrF0Qc2SmLII7W2AD8FfiZ9Wjd+rD/iRuf5s5dWrr1GgwXCvPqOuDquOowA==}
     cpu: [arm]
@@ -1664,6 +2270,9 @@ packages:
   '@shikijs/vscode-textmate@10.0.2':
     resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
 
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
   '@tailwindcss/node@4.2.2':
     resolution: {integrity: sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==}
 
@@ -1756,10 +2365,157 @@ packages:
   '@tailwindcss/postcss@4.2.2':
     resolution: {integrity: sha512-n4goKQbW8RVXIbNKRB/45LzyUqN451deQK0nzIeauVEqjlI49slUlgKYJM2QyUzap/PcpnS7kzSUmPb1sCRvYQ==}
 
+  '@tanstack/history@1.154.14':
+    resolution: {integrity: sha512-xyIfof8eHBuub1CkBnbKNKQXeRZC4dClhmzePHVOEel4G7lk/dW+TQ16da7CFdeNLv6u6Owf5VoBQxoo6DFTSA==}
+    engines: {node: '>=12'}
+
+  '@tanstack/query-core@5.101.4':
+    resolution: {integrity: sha512-gNwcvOJcRbLWPOLG/2OBm+zM+Yv+MKsXKEOWC57USuZDEsI71hEErQsiEGx5wX9rzWWkfwM0fVSPoiIFSsxfiw==}
+
+  '@tanstack/react-query@5.101.4':
+    resolution: {integrity: sha512-yRg2pfOCxIs4ZJW3XYYHU/WgtD04FHSnfHlpRT7h7pR77hwkdRG4wxbKe4aq6P0RvXUTBSQpQeadS1SUYUe+KA==}
+    peerDependencies:
+      react: ^18 || ^19
+
+  '@tanstack/react-router-ssr-query@1.159.14':
+    resolution: {integrity: sha512-3aqzL6LL0V2UPQGxclCGnI5V8Z87ug+1U+ZcE5OqOXDYLIu8NlIpr11+QnqNorV4nUacdqNzVmfCTCrRB/NaqQ==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      '@tanstack/query-core': '>=5.90.0'
+      '@tanstack/react-query': '>=5.90.0'
+      '@tanstack/react-router': '>=1.127.0'
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
+
+  '@tanstack/react-router@1.159.14':
+    resolution: {integrity: sha512-Q3N9J0mwYzIOcEe3FVYmISHMFvWfieeV2sTbHZL/z833NBwnrmgLTf2LoUenuYlQc9lzuVTmvav0lnBa/j3krw==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
+
+  '@tanstack/react-start-client@1.159.14':
+    resolution: {integrity: sha512-DSaqevKeXiOsiXp5FGpGmeYKGXWDi1VDAPxxcaM0MHYDig3aJxKV5qKo4oKoEmqEGtACLDrtXP5a/x9nmNU2Ew==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
+
+  '@tanstack/react-start-server@1.159.14':
+    resolution: {integrity: sha512-R2+JPvlAoS7fIRkxQALLhd6sfYxY2RuvY+CZgaq1J24rT9ajJc7oIhbBsYSN8x9y4OvgU/oo/vnRVqunmnVTwg==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
+
+  '@tanstack/react-start@1.159.14':
+    resolution: {integrity: sha512-Lnum8RwiAaO8smrmRklmxDH0enU7fGHCgj4FQoMramLVtXGiB6rPTYtuoKmgcItHLE6mnpbnQL+ULV6u9fSX7A==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      react: '>=18.0.0 || >=19.0.0'
+      react-dom: '>=18.0.0 || >=19.0.0'
+      vite: ^7.3.1
+
+  '@tanstack/react-store@0.8.1':
+    resolution: {integrity: sha512-XItJt+rG8c5Wn/2L/bnxys85rBpm0BfMbhb4zmPVLXAKY9POrp1xd6IbU4PKoOI+jSEGc3vntPRfLGSgXfE2Ig==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  '@tanstack/router-cli@1.159.9':
+    resolution: {integrity: sha512-I/mRhRPfpK8E0YvABA0O3eF7P14lOy2ApVkaaX+7b8yY1lniulPklyCTJfh6MWtg1qbtyA1fhvlCi6hhPvAmWw==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  '@tanstack/router-core@1.159.9':
+    resolution: {integrity: sha512-A9B8gvklvMCjSAFG8nDAhfmROI8kjcij8wzznQaw4RfGIOrYXyNe5fCAcbHXGpgNeTE2JnK75b6AjidDPQfrmw==}
+    engines: {node: '>=12'}
+
+  '@tanstack/router-generator@1.159.9':
+    resolution: {integrity: sha512-WDn17uYP/Mk//7OP5ZnlYK228ezQ/N+pVA8BrwoF69g3Scq5CkfZUD633UI1+oXIl8Fb1pCt4CU0LkN7niMTmQ==}
+    engines: {node: '>=12'}
+
+  '@tanstack/router-plugin@1.159.14':
+    resolution: {integrity: sha512-XLImUWyBHsTB2W5tjlS7AW52YWOPCTYOl8ocxNOOGq4vdtB26tjjd91Q2bFf0GOjTj903vbrFRoBoQ8qX7pfQg==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      '@rsbuild/core': '>=1.0.2'
+      '@tanstack/react-router': ^1.159.14
+      vite: ^7.3.1
+      vite-plugin-solid: ^2.11.10
+      webpack: '>=5.92.0'
+    peerDependenciesMeta:
+      '@rsbuild/core':
+        optional: true
+      '@tanstack/react-router':
+        optional: true
+      vite:
+        optional: true
+      vite-plugin-solid:
+        optional: true
+      webpack:
+        optional: true
+
+  '@tanstack/router-ssr-query-core@1.159.9':
+    resolution: {integrity: sha512-IGmoh+wLhdcB0lU3wNJUBR1u9Y//OwxtjgsP/6KIr6jSbcnN1rPxs8FryPutaH82GksMQbmlzvxkLJwQCVhd5g==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      '@tanstack/query-core': '>=5.90.0'
+      '@tanstack/router-core': '>=1.127.0'
+
+  '@tanstack/router-utils@1.158.0':
+    resolution: {integrity: sha512-qZ76eaLKU6Ae9iI/mc5zizBX149DXXZkBVVO3/QRIll79uKLJZHQlMKR++2ba7JsciBWz1pgpIBcCJPE9S0LVg==}
+    engines: {node: '>=12'}
+
+  '@tanstack/router-utils@1.162.2':
+    resolution: {integrity: sha512-hTWqJtqIFFdvuCl8WXNyrodp2L9zo2G37xKRrcVmVRWpAB2h+U1LuRAfS4tsFTiWOIoE/B+WDVFB8JpoEdw6jQ==}
+    engines: {node: '>=20.19'}
+
+  '@tanstack/start-client-core@1.159.9':
+    resolution: {integrity: sha512-87gI1JcMIJygSrDY+6TFGOG7jRCFxjkg0YIqdngBA1o/IMUDwQJdJuI4IgKV55RypMLjSbHpCeSdgtv3Fb1eFg==}
+    engines: {node: '>=22.12.0'}
+
+  '@tanstack/start-fn-stubs@1.154.7':
+    resolution: {integrity: sha512-D69B78L6pcFN5X5PHaydv7CScQcKLzJeEYqs7jpuyyqGQHSUIZUjS955j+Sir8cHhuDIovCe2LmsYHeZfWf3dQ==}
+    engines: {node: '>=22.12.0'}
+
+  '@tanstack/start-plugin-core@1.159.14':
+    resolution: {integrity: sha512-IheznI6TmPesILmd3d9yc2po/FA+Bx5ezN05yQDhvqMWv2V10o0BJLXMCGwNY6pNtkDCbt0RxAJXVn2v4OiKEA==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      vite: ^7.3.1
+
+  '@tanstack/start-server-core@1.159.13':
+    resolution: {integrity: sha512-zd2+7fUnw21XpDAoGMXNF5g8taizX/2aKc7xmo52CXdCEvPNwGc96J66aeaeokDLMmU2xpouCM7J9zIFOUopBA==}
+    engines: {node: '>=22.12.0'}
+
+  '@tanstack/start-storage-context@1.159.9':
+    resolution: {integrity: sha512-tBWBQnj6lt6EJ6UuheycVMG9so9lyi/mqKLHylxlZwnCdGdkI5+dRAuQWqnlhNrJaP0teddgQjRcXPLK583GlQ==}
+    engines: {node: '>=22.12.0'}
+
+  '@tanstack/store@0.8.1':
+    resolution: {integrity: sha512-PtOisLjUZPz5VyPRSCGjNOlwTvabdTBQ2K80DpVL1chGVr35WRxfeavAPdNq6pm/t7F8GhoR2qtmkkqtCEtHYw==}
+
+  '@tanstack/virtual-file-routes@1.154.7':
+    resolution: {integrity: sha512-cHHDnewHozgjpI+MIVp9tcib6lYEQK5MyUr0ChHpHFGBl8Xei55rohFK0I0ve/GKoHeioaK42Smd8OixPp6CTg==}
+    engines: {node: '>=12'}
+
   '@turbo/gen@2.8.17':
     resolution: {integrity: sha512-VMVaPhhc8vDTXZ1Ndkca0vRFjvoQvS8lqRXbFkuTVUkDbwX6UwqzTyySJErReWnS/VbHxAPnbJSqtsxGDurzMQ==}
     hasBin: true
 
+  '@types/babel__core@7.20.5':
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+
+  '@types/babel__generator@7.27.0':
+    resolution: {integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==}
+
+  '@types/babel__template@7.4.4':
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+
+  '@types/babel__traverse@7.28.0':
+    resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
+
   '@types/debug@4.1.13':
     resolution: {integrity: sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==}
 
@@ -1912,6 +2668,13 @@ packages:
 
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+    deprecated: Potential CWE-502 - Update to 1.3.1 or higher
+
+  '@vitejs/plugin-react@5.1.0':
+    resolution: {integrity: sha512-4LuWrg7EKWgQaMJfnN+wcmbAW+VSsCmqGohftWjuct47bv8uE4n/nPpq4XjJPsxgq00GGG5J8dvBczp8uxScew==}
+    engines: {node: ^20.19.0 || >=22.12.0}
+    peerDependencies:
+      vite: ^7.3.1
 
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
@@ -1934,6 +2697,14 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansis@4.3.1:
+    resolution: {integrity: sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA==}
+    engines: {node: '>=14'}
+
+  anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
@@ -1980,6 +2751,10 @@ packages:
   ast-types-flow@0.0.8:
     resolution: {integrity: sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==}
 
+  ast-types@0.16.1:
+    resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
+    engines: {node: '>=4'}
+
   async-function@1.0.0:
     resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
     engines: {node: '>= 0.4'}
@@ -1996,6 +2771,9 @@ packages:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
     engines: {node: '>= 0.4'}
 
+  babel-dead-code-elimination@1.0.12:
+    resolution: {integrity: sha512-GERT7L2TiYcYDtYk1IpD+ASAYXjKbLTDPhBtYj7X1NuRMDTMtAx9kyBenub1Ev41lo91OHCKdmP+egTDmfQ7Ig==}
+
   bail@2.0.2:
     resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
 
@@ -2011,6 +2789,83 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  better-auth@1.6.25:
+    resolution: {integrity: sha512-fvoq+oCO+FF5fpP3XfU7znRyGFpHB77UG2EyxsKNy+Cak7Q5pELu+auvvDveQbWQxcoKugZ7jYQQPFQLpUTGOw==}
+    peerDependencies:
+      '@lynx-js/react': '*'
+      '@prisma/client': ^5.0.0 || ^6.0.0 || ^7.0.0
+      '@sveltejs/kit': ^2.0.0
+      '@tanstack/react-start': ^1.0.0
+      '@tanstack/solid-start': ^1.0.0
+      better-sqlite3: ^12.0.0
+      drizzle-kit: '>=0.31.4'
+      drizzle-orm: ^0.45.2
+      mongodb: ^6.0.0 || ^7.0.0
+      mysql2: ^3.0.0
+      next: ^14.0.0 || ^15.0.0 || ^16.0.0
+      pg: ^8.0.0
+      prisma: ^5.0.0 || ^6.0.0 || ^7.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+      solid-js: ^1.0.0
+      svelte: ^4.0.0 || ^5.0.0
+      vitest: ^2.0.0 || ^3.0.0 || ^4.0.0
+      vue: ^3.0.0
+    peerDependenciesMeta:
+      '@lynx-js/react':
+        optional: true
+      '@prisma/client':
+        optional: true
+      '@sveltejs/kit':
+        optional: true
+      '@tanstack/react-start':
+        optional: true
+      '@tanstack/solid-start':
+        optional: true
+      better-sqlite3:
+        optional: true
+      drizzle-kit:
+        optional: true
+      drizzle-orm:
+        optional: true
+      mongodb:
+        optional: true
+      mysql2:
+        optional: true
+      next:
+        optional: true
+      pg:
+        optional: true
+      prisma:
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+      solid-js:
+        optional: true
+      svelte:
+        optional: true
+      vitest:
+        optional: true
+      vue:
+        optional: true
+
+  better-call@1.3.7:
+    resolution: {integrity: sha512-Al51/hjp2SSp6CRTa3F2ptcx4yQVS1xWKoY6jcVXqNYOap6mHFP2jUBn5EwIL4iIed1/Sq4hlQ+Umm6EflZG+w==}
+    peerDependencies:
+      zod: ^4.0.0
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  binary-extensions@2.3.0:
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
+    engines: {node: '>=8'}
+
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
   brace-expansion@1.1.14:
     resolution: {integrity: sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==}
 
@@ -2018,6 +2873,10 @@ packages:
     resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
     engines: {node: 18 || 20 || >=22}
 
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
   browserslist@4.28.2:
     resolution: {integrity: sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -2064,6 +2923,17 @@ packages:
   chardet@2.1.1:
     resolution: {integrity: sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==}
 
+  cheerio-select@2.1.0:
+    resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
+
+  cheerio@1.2.0:
+    resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==}
+    engines: {node: '>=20.18.1'}
+
+  chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
+
   class-variance-authority@0.7.1:
     resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
 
@@ -2071,6 +2941,10 @@ packages:
     resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
     engines: {node: '>= 12'}
 
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
   clsx@2.1.1:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
@@ -2089,16 +2963,71 @@ packages:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
 
+  common-tags@1.8.2:
+    resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
+    engines: {node: '>=4.0.0'}
+
   concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
   convert-source-map@2.0.0:
     resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
+  convex-helpers@0.1.120:
+    resolution: {integrity: sha512-FPqtmN/10uoxmmhVq0ViNi08AnmHKT/eU1R8+ohmPZoHfg8noZEZCltApY/ASDdhq92o0kLZETggzBvMfHJDLQ==}
+    hasBin: true
+    peerDependencies:
+      '@standard-schema/spec': ^1.0.0
+      convex: ^1.32.0
+      hono: ^4.0.5
+      react: ^17.0.2 || ^18.0.0 || ^19.0.0
+      typescript: ^5.5 || ^6.0.0
+      zod: ^3.25.0 || ^4.0.0
+    peerDependenciesMeta:
+      '@standard-schema/spec':
+        optional: true
+      hono:
+        optional: true
+      react:
+        optional: true
+      typescript:
+        optional: true
+      zod:
+        optional: true
+
+  convex@1.38.0:
+    resolution: {integrity: sha512-122AC6y5lUS7mr39cluLw9+TOtRX5d/XxeivHhHObs/NTXoVvOnIgDzexVcxaz6Rk0oLFSoydSR1rDCltEz/0A==}
+    engines: {node: '>=18.0.0', npm: '>=7.0.0'}
+    hasBin: true
+    peerDependencies:
+      '@auth0/auth0-react': ^2.0.1
+      '@clerk/clerk-react': ^4.12.8 || ^5.0.0
+      '@clerk/react': ^6.4.3
+      react: ^18.0.0 || ^19.0.0-0 || ^19.0.0
+    peerDependenciesMeta:
+      '@auth0/auth0-react':
+        optional: true
+      '@clerk/clerk-react':
+        optional: true
+      '@clerk/react':
+        optional: true
+      react:
+        optional: true
+
+  cookie-es@2.0.1:
+    resolution: {integrity: sha512-aVf4A4hI2w70LnF7GG+7xDQUkliwiXWXFvTjkip4+b64ygDQ2sJPRSKFDHbxn8o0xu9QzPkMuuiWIXyFSE2slA==}
+
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
+  css-select@5.2.2:
+    resolution: {integrity: sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==}
+
+  css-what@6.2.2:
+    resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==}
+    engines: {node: '>= 6'}
+
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
@@ -2148,6 +3077,9 @@ packages:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
 
+  defu@6.1.7:
+    resolution: {integrity: sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==}
+
   dequal@2.0.3:
     resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
     engines: {node: '>=6'}
@@ -2162,10 +3094,27 @@ packages:
   devlop@1.1.0:
     resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
 
+  diff@8.0.4:
+    resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==}
+    engines: {node: '>=0.3.1'}
+
   doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
 
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  domutils@3.2.2:
+    resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
+
   dotenv-cli@10.0.0:
     resolution: {integrity: sha512-lnOnttzfrzkRx2echxJHQRB6vOAMSCzzZg79IxpC00tU42wZPuZkQxNNrrwVAxaQZIIh001l4PxVlCrBxngBzA==}
     hasBin: true
@@ -2199,14 +3148,25 @@ packages:
   emoji-regex@9.2.2:
     resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
+  encoding-sniffer@0.2.1:
+    resolution: {integrity: sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==}
+
   enhanced-resolve@5.20.1:
     resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
     engines: {node: '>=10.13.0'}
 
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
   entities@6.0.1:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
     engines: {node: '>=0.12'}
 
+  entities@7.0.1:
+    resolution: {integrity: sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==}
+    engines: {node: '>=0.12'}
+
   es-abstract@1.24.2:
     resolution: {integrity: sha512-2FpH9Q5i2RRwyEP1AylXe6nYLR5OhaJTZwmlcP0dL/+JCbgg7yyEo/sEK6HeGZRf3dFpWwThaRHVApXSkW3xeg==}
     engines: {node: '>= 0.4'}
@@ -2244,6 +3204,11 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
+  esbuild@0.27.0:
+    resolution: {integrity: sha512-jd0f4NHbD6cALCyGElNpGAOtWxSq46l9X/sWB0Nzd5er4Kz2YTm+Vl0qKFT9KUJvD8+fiO8AvoHhFvEatfVixA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   esbuild@0.27.7:
     resolution: {integrity: sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==}
     engines: {node: '>=18'}
@@ -2355,6 +3320,11 @@ packages:
     resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
   esquery@1.7.0:
     resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
     engines: {node: '>=0.10'}
@@ -2374,6 +3344,9 @@ packages:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
     engines: {node: '>=0.10.0'}
 
+  exsolve@1.1.1:
+    resolution: {integrity: sha512-9U/jZUgjnSGyntRr6y5Muu1MJcwFl6kPu7k8qLF0IMNfLqvw0NZ4nnVDq0RVoZ0RvCyumib4Ez3KYrVfilrw+g==}
+
   extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
@@ -2399,6 +3372,10 @@ packages:
     resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
     engines: {node: '>=16.0.0'}
 
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
   find-up@5.0.0:
     resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
     engines: {node: '>=10'}
@@ -2437,6 +3414,10 @@ packages:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
 
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
   get-intrinsic@1.3.0:
     resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
     engines: {node: '>= 0.4'}
@@ -2456,6 +3437,10 @@ packages:
   get-tsconfig@4.13.7:
     resolution: {integrity: sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==}
 
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
   glob-parent@6.0.2:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
@@ -2475,6 +3460,16 @@ packages:
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
+  h3@2.0.1-rc.14:
+    resolution: {integrity: sha512-163qbGmTr/9rqQRNuqMqtgXnOUAkE4KTdauiC9y0E5iG1I65kte9NyfWvZw5RTDMt6eY+DtyoNzrQ9wA2BfvGQ==}
+    engines: {node: '>=20.11.1'}
+    hasBin: true
+    peerDependencies:
+      crossws: ^0.4.1
+    peerDependenciesMeta:
+      crossws:
+        optional: true
+
   has-bigints@1.1.0:
     resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
     engines: {node: '>= 0.4'}
@@ -2554,6 +3549,13 @@ packages:
   html-void-elements@3.0.0:
     resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
 
+  htmlparser2@10.1.0:
+    resolution: {integrity: sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==}
+
+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
   iconv-lite@0.7.2:
     resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
     engines: {node: '>=0.10.0'}
@@ -2599,6 +3601,10 @@ packages:
     resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
     engines: {node: '>= 0.4'}
 
+  is-binary-path@2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+
   is-boolean-object@1.2.2:
     resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
     engines: {node: '>= 0.4'}
@@ -2657,6 +3663,10 @@ packages:
     resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
     engines: {node: '>= 0.4'}
 
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
   is-plain-obj@4.1.0:
     resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
     engines: {node: '>=12'}
@@ -2700,6 +3710,10 @@ packages:
   isarray@2.0.5:
     resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
 
+  isbot@5.2.1:
+    resolution: {integrity: sha512-dJ+LpKyClQZ7NG+j3OensC/mAZkGpukE9YUrgPYvAZj2doVL0edfDgywTUh5CXa0o+nW9a1V9e5+CJTX8+SxRw==}
+    engines: {node: '>=18'}
+
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
@@ -2711,6 +3725,9 @@ packages:
     resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
     hasBin: true
 
+  jose@6.2.7:
+    resolution: {integrity: sha512-hq1OB1bALKfydZNoViyg6hPVGV4i93ny9Op+n4zP5RSf7SCZEXa/TsG2O3IEr7+WlHRTPnpqDmHfMH6qXAD60w==}
+
   js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
@@ -2752,6 +3769,10 @@ packages:
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
+  kysely@0.29.4:
+    resolution: {integrity: sha512-y5mVgQNkMbs1eK9Xyc0pmNdabN2wHhRYY/5r4W5HrUT1rYCEPeVNSj1RUJeSDKT3U0p+mXCvLgkrFuIafYI6BA==}
+    engines: {node: '>=22.0.0'}
+
   language-subtag-registry@0.3.23:
     resolution: {integrity: sha512-0K65Lea881pHotoGEa5gDlMxt3pctLi2RplBb7Ezh4rRdLEOtgi7n4EwK9lamnUCkKBqaeKRVebTq6BAxSkpXQ==}
 
@@ -3031,6 +4052,10 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
+  nanostores@1.4.2:
+    resolution: {integrity: sha512-Wxv8Roefr2nqtiRG0bnaFlpYqpIVtOEeJZHaH+4nGgOK1/7n6OHOuHCb/bhqrNQgZM8fyd0s1PqhdrJc9Ib44g==}
+    engines: {node: ^20.0.0 || >=22.0.0}
+
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
@@ -3041,6 +4066,13 @@ packages:
   node-releases@2.0.37:
     resolution: {integrity: sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==}
 
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+
   object-assign@4.1.1:
     resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
     engines: {node: '>=0.10.0'}
@@ -3102,6 +4134,12 @@ packages:
   parse-entities@4.0.2:
     resolution: {integrity: sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==}
 
+  parse5-htmlparser2-tree-adapter@7.1.0:
+    resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==}
+
+  parse5-parser-stream@7.1.2:
+    resolution: {integrity: sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==}
+
   parse5@7.3.0:
     resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
 
@@ -3116,9 +4154,16 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
+  picomatch@2.3.2:
+    resolution: {integrity: sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==}
+    engines: {node: '>=8.6'}
+
   picomatch@4.0.4:
     resolution: {integrity: sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==}
     engines: {node: '>=12'}
@@ -3225,6 +4270,10 @@ packages:
       '@types/react': '>=18'
       react: '>=18'
 
+  react-refresh@0.18.0:
+    resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
+    engines: {node: '>=0.10.0'}
+
   react-remove-scroll-bar@2.3.8:
     resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
     engines: {node: '>=10'}
@@ -3259,6 +4308,14 @@ packages:
     resolution: {integrity: sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==}
     engines: {node: '>=0.10.0'}
 
+  readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+
+  recast@0.23.19:
+    resolution: {integrity: sha512-T98lym7kH+pnZmRaD8yDRdaNqyUbwnbEBx0MuchrzMFOEMray4AO3ZJoTUZ5r78Ao78X/OhzW0DL8GB85w/I2w==}
+    engines: {node: '>= 4'}
+
   reflect.getprototypeof@1.0.10:
     resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
     engines: {node: '>= 0.4'}
@@ -3303,6 +4360,14 @@ packages:
   remark-stringify@11.0.0:
     resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
 
+  remeda@2.39.0:
+    resolution: {integrity: sha512-3Ki8dU1o3OVu4dwIQ2Pj+yiuP7OnEbmWAGmJ3yDRqopily5jsj8NWzPvbS89H85d6UdONKEcUnrfuHY6jN9vyw==}
+    engines: {node: '>=18.0.0'}
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
   resolve-from@4.0.0:
     resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
     engines: {node: '>=4'}
@@ -3320,6 +4385,9 @@ packages:
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
+  rou3@0.7.12:
+    resolution: {integrity: sha512-iFE4hLDuloSWcD7mjdCDhx2bKcIsYbtOTpfH5MHHLSKMOUyjqQXTeZVa289uuwEGEKFoE/BAPbhaU4B774nceg==}
+
   safe-array-concat@1.1.3:
     resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
     engines: {node: '>=0.4'}
@@ -3347,6 +4415,19 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  seroval-plugins@1.6.0:
+    resolution: {integrity: sha512-CbR5DP5DPicpd9RwRUzka7hi4x1577eGFXJVBW409LXqqJNst99JSUTZ8CXcnskQX7laPOWpmzliq0gBZEGlrQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      seroval: ^1.0
+
+  seroval@1.6.0:
+    resolution: {integrity: sha512-TBwwKfscTEgnBEWmYKKeCcmCGmrJi0LV6qNUY//WBA3MDesh/zfn+KOMq/ckpxM4gZ0ouAE706A1eenekM2sug==}
+    engines: {node: '>=10'}
+
+  set-cookie-parser@3.1.2:
+    resolution: {integrity: sha512-5/r/lTwbJ3zQ+qwdUFZYeRNqda7P5HD8zQKqlSjdGt1/S0cjLAphHusj4Y58ahDtWn/g32xrIS58/ikOvwl0Lw==}
+
   set-function-length@1.2.2:
     resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
     engines: {node: '>= 0.4'}
@@ -3400,9 +4481,22 @@ packages:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
 
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.7.6:
+    resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==}
+    engines: {node: '>= 12'}
+
   space-separated-tokens@2.0.2:
     resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
 
+  srvx@0.11.22:
+    resolution: {integrity: sha512-LqZxxBDMKuMAZzFzJnDCkFOrs9MZQZr0LvHiO/SuSZVdQaXD7xQ5UWTUxheJrQPve1qk9MG2B/yttUvJxw8egQ==}
+    engines: {node: '>=20.16.0'}
+    hasBin: true
+
   stop-iteration-iterator@1.1.0:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
     engines: {node: '>= 0.4'}
@@ -3463,6 +4557,10 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  tagged-tag@1.0.0:
+    resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
+    engines: {node: '>=20'}
+
   tailwind-merge@3.5.0:
     resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
 
@@ -3473,10 +4571,20 @@ packages:
     resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==}
     engines: {node: '>=6'}
 
+  tiny-invariant@1.3.3:
+    resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
+
+  tiny-warning@1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+
   tinyglobby@0.2.16:
     resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
     engines: {node: '>=12.0.0'}
 
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
   trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
 
@@ -3538,6 +4646,10 @@ packages:
     resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
     engines: {node: '>= 0.8.0'}
 
+  type-fest@5.8.0:
+    resolution: {integrity: sha512-YGYEVz3Fm5iy/AybuA0oyNFq7H4CgQNfRp/qfe8nurE1kuCeNm3/vfm9X4Mtl+qLyaKJUh5xrFZwogr41SMjYA==}
+    engines: {node: '>=20'}
+
   typed-array-buffer@1.0.3:
     resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
     engines: {node: '>= 0.4'}
@@ -3566,6 +4678,9 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
+  ufo@1.6.4:
+    resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
+
   unbox-primitive@1.1.0:
     resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
     engines: {node: '>= 0.4'}
@@ -3573,6 +4688,10 @@ packages:
   undici-types@7.16.0:
     resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
 
+  undici@7.29.0:
+    resolution: {integrity: sha512-IDxfleLmmbSskfWSUATiN1nfn2rDuvnMOqb5CWR92iIfojA0Ud+ulOAAEQ57LPr9rWmsreUyf5lwyao+7GNNVw==}
+    engines: {node: '>=20.18.1'}
+
   unified@11.0.5:
     resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
 
@@ -3597,6 +4716,10 @@ packages:
   unist-util-visit@5.1.0:
     resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
 
+  unplugin@2.3.11:
+    resolution: {integrity: sha512-5uKD0nqiYVzlmCRs01Fhs2BdkEgBS3SAVP6ndrBsuK42iC2+JHyxM05Rm9G8+5mkmRtzMZGY8Ct5+mliZxU/Ww==}
+    engines: {node: '>=18.12.0'}
+
   update-browserslist-db@1.2.3:
     resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
     hasBin: true
@@ -3626,6 +4749,11 @@ packages:
       '@types/react':
         optional: true
 
+  use-sync-external-store@1.6.0:
+    resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
   vaul@1.1.2:
     resolution: {integrity: sha512-ZFkClGpWyI2WUQjdLJ/BaGuV6AVQiJ3uELGk3OYtP+B6yCO7Cmn9vPFXVJkRaGkOJu3m8bQMgtyzNHixULceQA==}
     peerDependencies:
@@ -3681,9 +4809,29 @@ packages:
       yaml:
         optional: true
 
+  vitefu@1.1.3:
+    resolution: {integrity: sha512-ub4okH7Z5KLjb6hDyjqrGXqWtWvoYdU3IGm/NorpgHncKoLTCfRIbvlhBm7r0YstIaQRYlp4yEbFqDcKSzXSSg==}
+    peerDependencies:
+      vite: ^7.3.1
+    peerDependenciesMeta:
+      vite:
+        optional: true
+
   web-namespaces@2.0.1:
     resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==}
 
+  webpack-virtual-modules@0.6.2:
+    resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
+
+  whatwg-encoding@3.1.1:
+    resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
+    engines: {node: '>=18'}
+    deprecated: Use @exodus/bytes instead for a more spec-conformant and faster implementation
+
+  whatwg-mimetype@4.0.0:
+    resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==}
+    engines: {node: '>=18'}
+
   which-boxed-primitive@1.1.1:
     resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
     engines: {node: '>= 0.4'}
@@ -3713,6 +4861,30 @@ packages:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
 
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  ws@8.18.0:
+    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  xmlbuilder2@4.0.3:
+    resolution: {integrity: sha512-bx8Q1STctnNaaDymWnkfQLKofs0mGNN7rLLapJlGuV3VlvegD7Ls4ggMjE3aUSWItCCzU0PEv45lI87iSigiCA==}
+    engines: {node: '>=20.0'}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
   yallist@3.1.1:
     resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
@@ -3721,6 +4893,14 @@ packages:
     engines: {node: '>= 14.6'}
     hasBin: true
 
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@17.7.3:
+    resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==}
+    engines: {node: '>=12'}
+
   yocto-queue@0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
@@ -3754,6 +4934,12 @@ snapshots:
 
   '@alloc/quick-lru@5.2.0': {}
 
+  '@babel/code-frame@7.27.1':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.28.5
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
   '@babel/code-frame@7.29.0':
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
@@ -3846,6 +5032,8 @@ snapshots:
 
   '@babel/helper-plugin-utils@7.28.6': {}
 
+  '@babel/helper-plugin-utils@7.29.7': {}
+
   '@babel/helper-replace-supers@7.28.6(@babel/core@7.29.0)':
     dependencies:
       '@babel/core': 7.29.0
@@ -3885,6 +5073,26 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/plugin-syntax-jsx@7.29.7(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-react-jsx-self@7.29.7(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.29.7
+
+  '@babel/plugin-transform-react-jsx-source@7.29.7(@babel/core@7.29.0)':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/helper-plugin-utils': 7.29.7
+
   '@babel/template@7.28.6':
     dependencies:
       '@babel/code-frame': 7.29.0
@@ -3908,161 +5116,308 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
+  '@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)':
+    dependencies:
+      '@better-auth/utils': 0.4.2
+      '@better-fetch/fetch': 1.3.1
+      '@opentelemetry/semantic-conventions': 1.43.0
+      '@standard-schema/spec': 1.1.0
+      better-call: 1.3.7(zod@4.3.6)
+      jose: 6.2.7
+      kysely: 0.29.4
+      nanostores: 1.4.2
+      zod: 4.3.6
+
+  '@better-auth/drizzle-adapter@1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)':
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/utils': 0.4.2
+
+  '@better-auth/kysely-adapter@1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)(kysely@0.29.4)':
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/utils': 0.4.2
+    optionalDependencies:
+      kysely: 0.29.4
+
+  '@better-auth/memory-adapter@1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)':
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/utils': 0.4.2
+
+  '@better-auth/mongo-adapter@1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)':
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/utils': 0.4.2
+
+  '@better-auth/prisma-adapter@1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)':
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/utils': 0.4.2
+
+  '@better-auth/telemetry@1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)':
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/utils': 0.4.2
+      '@better-fetch/fetch': 1.3.1
+
+  '@better-auth/utils@0.4.2':
+    dependencies:
+      '@noble/hashes': 2.2.0
+
+  '@better-fetch/fetch@1.3.1': {}
+
+  '@convex-dev/better-auth@0.12.5(@standard-schema/spec@1.1.0)(better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)':
+    dependencies:
+      '@better-fetch/fetch': 1.3.1
+      better-auth: 1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      common-tags: 1.8.2
+      convex: 1.38.0(react@19.2.5)
+      convex-helpers: 0.1.120(@standard-schema/spec@1.1.0)(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)(zod@4.3.6)
+      jose: 6.2.7
+      react: 19.2.5
+      remeda: 2.39.0
+      semver: 7.7.4
+      type-fest: 5.8.0
+      zod: 4.3.6
+    transitivePeerDependencies:
+      - '@standard-schema/spec'
+      - hono
+      - typescript
+
   '@effect/language-service@0.85.1': {}
 
   '@esbuild/aix-ppc64@0.25.12':
     optional: true
 
+  '@esbuild/aix-ppc64@0.27.0':
+    optional: true
+
   '@esbuild/aix-ppc64@0.27.7':
     optional: true
 
   '@esbuild/android-arm64@0.25.12':
     optional: true
 
+  '@esbuild/android-arm64@0.27.0':
+    optional: true
+
   '@esbuild/android-arm64@0.27.7':
     optional: true
 
   '@esbuild/android-arm@0.25.12':
     optional: true
 
+  '@esbuild/android-arm@0.27.0':
+    optional: true
+
   '@esbuild/android-arm@0.27.7':
     optional: true
 
   '@esbuild/android-x64@0.25.12':
     optional: true
 
+  '@esbuild/android-x64@0.27.0':
+    optional: true
+
   '@esbuild/android-x64@0.27.7':
     optional: true
 
   '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
+  '@esbuild/darwin-arm64@0.27.0':
+    optional: true
+
   '@esbuild/darwin-arm64@0.27.7':
     optional: true
 
   '@esbuild/darwin-x64@0.25.12':
     optional: true
 
+  '@esbuild/darwin-x64@0.27.0':
+    optional: true
+
   '@esbuild/darwin-x64@0.27.7':
     optional: true
 
   '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
+  '@esbuild/freebsd-arm64@0.27.0':
+    optional: true
+
   '@esbuild/freebsd-arm64@0.27.7':
     optional: true
 
   '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
+  '@esbuild/freebsd-x64@0.27.0':
+    optional: true
+
   '@esbuild/freebsd-x64@0.27.7':
     optional: true
 
   '@esbuild/linux-arm64@0.25.12':
     optional: true
 
+  '@esbuild/linux-arm64@0.27.0':
+    optional: true
+
   '@esbuild/linux-arm64@0.27.7':
     optional: true
 
   '@esbuild/linux-arm@0.25.12':
     optional: true
 
+  '@esbuild/linux-arm@0.27.0':
+    optional: true
+
   '@esbuild/linux-arm@0.27.7':
     optional: true
 
   '@esbuild/linux-ia32@0.25.12':
     optional: true
 
+  '@esbuild/linux-ia32@0.27.0':
+    optional: true
+
   '@esbuild/linux-ia32@0.27.7':
     optional: true
 
   '@esbuild/linux-loong64@0.25.12':
     optional: true
 
+  '@esbuild/linux-loong64@0.27.0':
+    optional: true
+
   '@esbuild/linux-loong64@0.27.7':
     optional: true
 
   '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
+  '@esbuild/linux-mips64el@0.27.0':
+    optional: true
+
   '@esbuild/linux-mips64el@0.27.7':
     optional: true
 
   '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
+  '@esbuild/linux-ppc64@0.27.0':
+    optional: true
+
   '@esbuild/linux-ppc64@0.27.7':
     optional: true
 
   '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
+  '@esbuild/linux-riscv64@0.27.0':
+    optional: true
+
   '@esbuild/linux-riscv64@0.27.7':
     optional: true
 
   '@esbuild/linux-s390x@0.25.12':
     optional: true
 
+  '@esbuild/linux-s390x@0.27.0':
+    optional: true
+
   '@esbuild/linux-s390x@0.27.7':
     optional: true
 
   '@esbuild/linux-x64@0.25.12':
     optional: true
 
+  '@esbuild/linux-x64@0.27.0':
+    optional: true
+
   '@esbuild/linux-x64@0.27.7':
     optional: true
 
   '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
+  '@esbuild/netbsd-arm64@0.27.0':
+    optional: true
+
   '@esbuild/netbsd-arm64@0.27.7':
     optional: true
 
   '@esbuild/netbsd-x64@0.25.12':
     optional: true
 
+  '@esbuild/netbsd-x64@0.27.0':
+    optional: true
+
   '@esbuild/netbsd-x64@0.27.7':
     optional: true
 
   '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
+  '@esbuild/openbsd-arm64@0.27.0':
+    optional: true
+
   '@esbuild/openbsd-arm64@0.27.7':
     optional: true
 
   '@esbuild/openbsd-x64@0.25.12':
     optional: true
 
+  '@esbuild/openbsd-x64@0.27.0':
+    optional: true
+
   '@esbuild/openbsd-x64@0.27.7':
     optional: true
 
   '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
+  '@esbuild/openharmony-arm64@0.27.0':
+    optional: true
+
   '@esbuild/openharmony-arm64@0.27.7':
     optional: true
 
   '@esbuild/sunos-x64@0.25.12':
     optional: true
 
+  '@esbuild/sunos-x64@0.27.0':
+    optional: true
+
   '@esbuild/sunos-x64@0.27.7':
     optional: true
 
   '@esbuild/win32-arm64@0.25.12':
     optional: true
 
+  '@esbuild/win32-arm64@0.27.0':
+    optional: true
+
   '@esbuild/win32-arm64@0.27.7':
     optional: true
 
   '@esbuild/win32-ia32@0.25.12':
     optional: true
 
+  '@esbuild/win32-ia32@0.27.0':
+    optional: true
+
   '@esbuild/win32-ia32@0.27.7':
     optional: true
 
   '@esbuild/win32-x64@0.25.12':
     optional: true
 
+  '@esbuild/win32-x64@0.27.0':
+    optional: true
+
   '@esbuild/win32-x64@0.27.7':
     optional: true
 
@@ -4301,6 +5656,29 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
+  '@noble/ciphers@2.2.0': {}
+
+  '@noble/hashes@2.2.0': {}
+
+  '@oozcitak/dom@2.0.2':
+    dependencies:
+      '@oozcitak/infra': 2.0.2
+      '@oozcitak/url': 3.0.0
+      '@oozcitak/util': 10.0.0
+
+  '@oozcitak/infra@2.0.2':
+    dependencies:
+      '@oozcitak/util': 10.0.0
+
+  '@oozcitak/url@3.0.0':
+    dependencies:
+      '@oozcitak/infra': 2.0.2
+      '@oozcitak/util': 10.0.0
+
+  '@oozcitak/util@10.0.0': {}
+
+  '@opentelemetry/semantic-conventions@1.43.0': {}
+
   '@radix-ui/number@1.1.1': {}
 
   '@radix-ui/primitive@1.1.3': {}
@@ -4779,6 +6157,10 @@ snapshots:
 
   '@radix-ui/rect@1.1.1': {}
 
+  '@rolldown/pluginutils@1.0.0-beta.40': {}
+
+  '@rolldown/pluginutils@1.0.0-beta.43': {}
+
   '@rollup/rollup-android-arm-eabi@4.60.1':
     optional: true
 
@@ -4889,6 +6271,8 @@ snapshots:
 
   '@shikijs/vscode-textmate@10.0.2': {}
 
+  '@standard-schema/spec@1.1.0': {}
+
   '@tailwindcss/node@4.2.2':
     dependencies:
       '@jridgewell/remapping': 2.3.5
@@ -4917,46 +6301,271 @@ snapshots:
   '@tailwindcss/oxide-linux-arm64-gnu@4.2.2':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.2.2':
-    optional: true
+  '@tailwindcss/oxide-linux-arm64-musl@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-linux-x64-musl@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-wasm32-wasi@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.2.2':
+    optional: true
+
+  '@tailwindcss/oxide@4.2.2':
+    optionalDependencies:
+      '@tailwindcss/oxide-android-arm64': 4.2.2
+      '@tailwindcss/oxide-darwin-arm64': 4.2.2
+      '@tailwindcss/oxide-darwin-x64': 4.2.2
+      '@tailwindcss/oxide-freebsd-x64': 4.2.2
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.2
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.2
+      '@tailwindcss/oxide-linux-arm64-musl': 4.2.2
+      '@tailwindcss/oxide-linux-x64-gnu': 4.2.2
+      '@tailwindcss/oxide-linux-x64-musl': 4.2.2
+      '@tailwindcss/oxide-wasm32-wasi': 4.2.2
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.2
+      '@tailwindcss/oxide-win32-x64-msvc': 4.2.2
+
+  '@tailwindcss/postcss@4.2.2':
+    dependencies:
+      '@alloc/quick-lru': 5.2.0
+      '@tailwindcss/node': 4.2.2
+      '@tailwindcss/oxide': 4.2.2
+      postcss: 8.5.9
+      tailwindcss: 4.2.2
+
+  '@tanstack/history@1.154.14': {}
+
+  '@tanstack/query-core@5.101.4': {}
+
+  '@tanstack/react-query@5.101.4(react@19.2.5)':
+    dependencies:
+      '@tanstack/query-core': 5.101.4
+      react: 19.2.5
+
+  '@tanstack/react-router-ssr-query@1.159.14(@tanstack/query-core@5.101.4)(@tanstack/react-query@5.101.4(react@19.2.5))(@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(@tanstack/router-core@1.159.9)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@tanstack/query-core': 5.101.4
+      '@tanstack/react-query': 5.101.4(react@19.2.5)
+      '@tanstack/react-router': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/router-ssr-query-core': 1.159.9(@tanstack/query-core@5.101.4)(@tanstack/router-core@1.159.9)
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+    transitivePeerDependencies:
+      - '@tanstack/router-core'
+
+  '@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@tanstack/history': 1.154.14
+      '@tanstack/react-store': 0.8.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/router-core': 1.159.9
+      isbot: 5.2.1
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  '@tanstack/react-start-client@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@tanstack/react-router': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/start-client-core': 1.159.9
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  '@tanstack/react-start-server@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@tanstack/history': 1.154.14
+      '@tanstack/react-router': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/start-client-core': 1.159.9
+      '@tanstack/start-server-core': 1.159.13
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+    transitivePeerDependencies:
+      - crossws
+
+  '@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))':
+    dependencies:
+      '@tanstack/react-router': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/react-start-client': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/react-start-server': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@tanstack/router-utils': 1.162.2
+      '@tanstack/start-client-core': 1.159.9
+      '@tanstack/start-plugin-core': 1.159.14(@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))
+      '@tanstack/start-server-core': 1.159.13
+      pathe: 2.0.3
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      vite: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
+    transitivePeerDependencies:
+      - '@rsbuild/core'
+      - crossws
+      - supports-color
+      - vite-plugin-solid
+      - webpack
+
+  '@tanstack/react-store@0.8.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+    dependencies:
+      '@tanstack/store': 0.8.1
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+      use-sync-external-store: 1.6.0(react@19.2.5)
+
+  '@tanstack/router-cli@1.159.9':
+    dependencies:
+      '@tanstack/router-generator': 1.159.9
+      chokidar: 3.6.0
+      yargs: 17.7.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@tanstack/router-core@1.159.9':
+    dependencies:
+      '@tanstack/history': 1.154.14
+      '@tanstack/store': 0.8.1
+      cookie-es: 2.0.1
+      seroval: 1.6.0
+      seroval-plugins: 1.6.0(seroval@1.6.0)
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
+
+  '@tanstack/router-generator@1.159.9':
+    dependencies:
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/router-utils': 1.158.0
+      '@tanstack/virtual-file-routes': 1.154.7
+      prettier: 3.8.2
+      recast: 0.23.19
+      source-map: 0.7.6
+      tsx: 4.21.0
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - supports-color
+
+  '@tanstack/router-plugin@1.159.14(@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/plugin-syntax-jsx': 7.29.7(@babel/core@7.29.0)
+      '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.0)
+      '@babel/template': 7.28.6
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/router-generator': 1.159.9
+      '@tanstack/router-utils': 1.158.0
+      '@tanstack/virtual-file-routes': 1.154.7
+      chokidar: 3.6.0
+      unplugin: 2.3.11
+      zod: 3.25.76
+    optionalDependencies:
+      '@tanstack/react-router': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      vite: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.2.2':
-    optional: true
+  '@tanstack/router-ssr-query-core@1.159.9(@tanstack/query-core@5.101.4)(@tanstack/router-core@1.159.9)':
+    dependencies:
+      '@tanstack/query-core': 5.101.4
+      '@tanstack/router-core': 1.159.9
 
-  '@tailwindcss/oxide-linux-x64-musl@4.2.2':
-    optional: true
+  '@tanstack/router-utils@1.158.0':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/generator': 7.29.1
+      '@babel/parser': 7.29.2
+      '@babel/types': 7.29.0
+      ansis: 4.3.1
+      babel-dead-code-elimination: 1.0.12
+      diff: 8.0.4
+      pathe: 2.0.3
+      tinyglobby: 0.2.16
+    transitivePeerDependencies:
+      - supports-color
 
-  '@tailwindcss/oxide-wasm32-wasi@4.2.2':
-    optional: true
+  '@tanstack/router-utils@1.162.2':
+    dependencies:
+      '@babel/generator': 7.29.1
+      '@babel/parser': 7.29.2
+      '@babel/types': 7.29.0
+      ansis: 4.3.1
+      babel-dead-code-elimination: 1.0.12
+      diff: 8.0.4
+      pathe: 2.0.3
+      tinyglobby: 0.2.16
+    transitivePeerDependencies:
+      - supports-color
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.2.2':
-    optional: true
+  '@tanstack/start-client-core@1.159.9':
+    dependencies:
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/start-fn-stubs': 1.154.7
+      '@tanstack/start-storage-context': 1.159.9
+      seroval: 1.6.0
+      tiny-invariant: 1.3.3
+      tiny-warning: 1.0.3
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.2.2':
-    optional: true
+  '@tanstack/start-fn-stubs@1.154.7': {}
 
-  '@tailwindcss/oxide@4.2.2':
-    optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.2.2
-      '@tailwindcss/oxide-darwin-arm64': 4.2.2
-      '@tailwindcss/oxide-darwin-x64': 4.2.2
-      '@tailwindcss/oxide-freebsd-x64': 4.2.2
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.2
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.2
-      '@tailwindcss/oxide-linux-arm64-musl': 4.2.2
-      '@tailwindcss/oxide-linux-x64-gnu': 4.2.2
-      '@tailwindcss/oxide-linux-x64-musl': 4.2.2
-      '@tailwindcss/oxide-wasm32-wasi': 4.2.2
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.2
-      '@tailwindcss/oxide-win32-x64-msvc': 4.2.2
+  '@tanstack/start-plugin-core@1.159.14(@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))':
+    dependencies:
+      '@babel/code-frame': 7.27.1
+      '@babel/core': 7.29.0
+      '@babel/types': 7.29.0
+      '@rolldown/pluginutils': 1.0.0-beta.40
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/router-generator': 1.159.9
+      '@tanstack/router-plugin': 1.159.14(@tanstack/react-router@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))
+      '@tanstack/router-utils': 1.158.0
+      '@tanstack/start-client-core': 1.159.9
+      '@tanstack/start-server-core': 1.159.13
+      cheerio: 1.2.0
+      exsolve: 1.1.1
+      pathe: 2.0.3
+      srvx: 0.11.22
+      tinyglobby: 0.2.16
+      ufo: 1.6.4
+      vite: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
+      vitefu: 1.1.3(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))
+      xmlbuilder2: 4.0.3
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - '@rsbuild/core'
+      - '@tanstack/react-router'
+      - crossws
+      - supports-color
+      - vite-plugin-solid
+      - webpack
+
+  '@tanstack/start-server-core@1.159.13':
+    dependencies:
+      '@tanstack/history': 1.154.14
+      '@tanstack/router-core': 1.159.9
+      '@tanstack/start-client-core': 1.159.9
+      '@tanstack/start-storage-context': 1.159.9
+      h3-v2: h3@2.0.1-rc.14
+      seroval: 1.6.0
+      tiny-invariant: 1.3.3
+    transitivePeerDependencies:
+      - crossws
 
-  '@tailwindcss/postcss@4.2.2':
+  '@tanstack/start-storage-context@1.159.9':
     dependencies:
-      '@alloc/quick-lru': 5.2.0
-      '@tailwindcss/node': 4.2.2
-      '@tailwindcss/oxide': 4.2.2
-      postcss: 8.5.9
-      tailwindcss: 4.2.2
+      '@tanstack/router-core': 1.159.9
+
+  '@tanstack/store@0.8.1': {}
+
+  '@tanstack/virtual-file-routes@1.154.7': {}
 
   '@turbo/gen@2.8.17(@types/node@24.12.2)':
     dependencies:
@@ -4965,6 +6574,27 @@ snapshots:
     transitivePeerDependencies:
       - '@types/node'
 
+  '@types/babel__core@7.20.5':
+    dependencies:
+      '@babel/parser': 7.29.2
+      '@babel/types': 7.29.0
+      '@types/babel__generator': 7.27.0
+      '@types/babel__template': 7.4.4
+      '@types/babel__traverse': 7.28.0
+
+  '@types/babel__generator@7.27.0':
+    dependencies:
+      '@babel/types': 7.29.0
+
+  '@types/babel__template@7.4.4':
+    dependencies:
+      '@babel/parser': 7.29.2
+      '@babel/types': 7.29.0
+
+  '@types/babel__traverse@7.28.0':
+    dependencies:
+      '@babel/types': 7.29.0
+
   '@types/debug@4.1.13':
     dependencies:
       '@types/ms': 2.1.0
@@ -4998,7 +6628,6 @@ snapshots:
   '@types/react-dom@19.2.3(@types/react@19.2.14)':
     dependencies:
       '@types/react': 19.2.14
-    optional: true
 
   '@types/react@19.2.14':
     dependencies:
@@ -5132,6 +6761,18 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
+  '@vitejs/plugin-react@5.1.0(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))':
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/plugin-transform-react-jsx-self': 7.29.7(@babel/core@7.29.0)
+      '@babel/plugin-transform-react-jsx-source': 7.29.7(@babel/core@7.29.0)
+      '@rolldown/pluginutils': 1.0.0-beta.43
+      '@types/babel__core': 7.20.5
+      react-refresh: 0.18.0
+      vite: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
+    transitivePeerDependencies:
+      - supports-color
+
   acorn-jsx@5.3.2(acorn@8.16.0):
     dependencies:
       acorn: 8.16.0
@@ -5151,6 +6792,13 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
+  ansis@4.3.1: {}
+
+  anymatch@3.1.3:
+    dependencies:
+      normalize-path: 3.0.0
+      picomatch: 2.3.2
+
   argparse@2.0.1: {}
 
   aria-hidden@1.2.6:
@@ -5228,6 +6876,10 @@ snapshots:
 
   ast-types-flow@0.0.8: {}
 
+  ast-types@0.16.1:
+    dependencies:
+      tslib: 2.8.1
+
   async-function@1.0.0: {}
 
   available-typed-arrays@1.0.7:
@@ -5238,6 +6890,15 @@ snapshots:
 
   axobject-query@4.1.0: {}
 
+  babel-dead-code-elimination@1.0.12:
+    dependencies:
+      '@babel/core': 7.29.0
+      '@babel/parser': 7.29.2
+      '@babel/traverse': 7.29.0
+      '@babel/types': 7.29.0
+    transitivePeerDependencies:
+      - supports-color
+
   bail@2.0.2: {}
 
   balanced-match@1.0.2: {}
@@ -5246,6 +6907,46 @@ snapshots:
 
   baseline-browser-mapping@2.10.18: {}
 
+  better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+    dependencies:
+      '@better-auth/core': 1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2)
+      '@better-auth/drizzle-adapter': 1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)
+      '@better-auth/kysely-adapter': 1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)(kysely@0.29.4)
+      '@better-auth/memory-adapter': 1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)
+      '@better-auth/mongo-adapter': 1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)
+      '@better-auth/prisma-adapter': 1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)
+      '@better-auth/telemetry': 1.6.25(@better-auth/core@1.6.25(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)(better-call@1.3.7(zod@4.3.6))(jose@6.2.7)(kysely@0.29.4)(nanostores@1.4.2))(@better-auth/utils@0.4.2)(@better-fetch/fetch@1.3.1)
+      '@better-auth/utils': 0.4.2
+      '@better-fetch/fetch': 1.3.1
+      '@noble/ciphers': 2.2.0
+      '@noble/hashes': 2.2.0
+      better-call: 1.3.7(zod@4.3.6)
+      defu: 6.1.7
+      jose: 6.2.7
+      kysely: 0.29.4
+      nanostores: 1.4.2
+      zod: 4.3.6
+    optionalDependencies:
+      '@tanstack/react-start': 1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3))
+      react: 19.2.5
+      react-dom: 19.2.5(react@19.2.5)
+    transitivePeerDependencies:
+      - '@cloudflare/workers-types'
+      - '@opentelemetry/api'
+
+  better-call@1.3.7(zod@4.3.6):
+    dependencies:
+      '@better-auth/utils': 0.4.2
+      '@better-fetch/fetch': 1.3.1
+      rou3: 0.7.12
+      set-cookie-parser: 3.1.2
+    optionalDependencies:
+      zod: 4.3.6
+
+  binary-extensions@2.3.0: {}
+
+  boolbase@1.0.0: {}
+
   brace-expansion@1.1.14:
     dependencies:
       balanced-match: 1.0.2
@@ -5255,6 +6956,10 @@ snapshots:
     dependencies:
       balanced-match: 4.0.4
 
+  braces@3.0.3:
+    dependencies:
+      fill-range: 7.1.1
+
   browserslist@4.28.2:
     dependencies:
       baseline-browser-mapping: 2.10.18
@@ -5301,12 +7006,53 @@ snapshots:
 
   chardet@2.1.1: {}
 
+  cheerio-select@2.1.0:
+    dependencies:
+      boolbase: 1.0.0
+      css-select: 5.2.2
+      css-what: 6.2.2
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+
+  cheerio@1.2.0:
+    dependencies:
+      cheerio-select: 2.1.0
+      dom-serializer: 2.0.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      encoding-sniffer: 0.2.1
+      htmlparser2: 10.1.0
+      parse5: 7.3.0
+      parse5-htmlparser2-tree-adapter: 7.1.0
+      parse5-parser-stream: 7.1.2
+      undici: 7.29.0
+      whatwg-mimetype: 4.0.0
+
+  chokidar@3.6.0:
+    dependencies:
+      anymatch: 3.1.3
+      braces: 3.0.3
+      glob-parent: 5.1.2
+      is-binary-path: 2.1.0
+      is-glob: 4.0.3
+      normalize-path: 3.0.0
+      readdirp: 3.6.0
+    optionalDependencies:
+      fsevents: 2.3.3
+
   class-variance-authority@0.7.1:
     dependencies:
       clsx: 2.1.1
 
   cli-width@4.1.0: {}
 
+  cliui@8.0.1:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 7.0.0
+
   clsx@2.1.1: {}
 
   color-convert@2.0.1:
@@ -5319,16 +7065,50 @@ snapshots:
 
   commander@8.3.0: {}
 
+  common-tags@1.8.2: {}
+
   concat-map@0.0.1: {}
 
   convert-source-map@2.0.0: {}
 
+  convex-helpers@0.1.120(@standard-schema/spec@1.1.0)(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)(zod@4.3.6):
+    dependencies:
+      convex: 1.38.0(react@19.2.5)
+    optionalDependencies:
+      '@standard-schema/spec': 1.1.0
+      react: 19.2.5
+      typescript: 5.9.3
+      zod: 4.3.6
+
+  convex@1.38.0(react@19.2.5):
+    dependencies:
+      esbuild: 0.27.0
+      prettier: 3.8.2
+      ws: 8.18.0
+    optionalDependencies:
+      react: 19.2.5
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  cookie-es@2.0.1: {}
+
   cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
       which: 2.0.2
 
+  css-select@5.2.2:
+    dependencies:
+      boolbase: 1.0.0
+      css-what: 6.2.2
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      nth-check: 2.1.1
+
+  css-what@6.2.2: {}
+
   csstype@3.2.3: {}
 
   damerau-levenshtein@1.0.8: {}
@@ -5377,6 +7157,8 @@ snapshots:
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
 
+  defu@6.1.7: {}
+
   dequal@2.0.3: {}
 
   detect-libc@2.1.2: {}
@@ -5387,10 +7169,30 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
+  diff@8.0.4: {}
+
   doctrine@2.1.0:
     dependencies:
       esutils: 2.0.3
 
+  dom-serializer@2.0.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      entities: 4.5.0
+
+  domelementtype@2.3.0: {}
+
+  domhandler@5.0.3:
+    dependencies:
+      domelementtype: 2.3.0
+
+  domutils@3.2.2:
+    dependencies:
+      dom-serializer: 2.0.0
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+
   dotenv-cli@10.0.0:
     dependencies:
       cross-spawn: 7.0.6
@@ -5420,13 +7222,22 @@ snapshots:
 
   emoji-regex@9.2.2: {}
 
+  encoding-sniffer@0.2.1:
+    dependencies:
+      iconv-lite: 0.6.3
+      whatwg-encoding: 3.1.1
+
   enhanced-resolve@5.20.1:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.3.2
 
+  entities@4.5.0: {}
+
   entities@6.0.1: {}
 
+  entities@7.0.1: {}
+
   es-abstract@1.24.2:
     dependencies:
       array-buffer-byte-length: 1.0.2
@@ -5557,6 +7368,35 @@ snapshots:
       '@esbuild/win32-ia32': 0.25.12
       '@esbuild/win32-x64': 0.25.12
 
+  esbuild@0.27.0:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.27.0
+      '@esbuild/android-arm': 0.27.0
+      '@esbuild/android-arm64': 0.27.0
+      '@esbuild/android-x64': 0.27.0
+      '@esbuild/darwin-arm64': 0.27.0
+      '@esbuild/darwin-x64': 0.27.0
+      '@esbuild/freebsd-arm64': 0.27.0
+      '@esbuild/freebsd-x64': 0.27.0
+      '@esbuild/linux-arm': 0.27.0
+      '@esbuild/linux-arm64': 0.27.0
+      '@esbuild/linux-ia32': 0.27.0
+      '@esbuild/linux-loong64': 0.27.0
+      '@esbuild/linux-mips64el': 0.27.0
+      '@esbuild/linux-ppc64': 0.27.0
+      '@esbuild/linux-riscv64': 0.27.0
+      '@esbuild/linux-s390x': 0.27.0
+      '@esbuild/linux-x64': 0.27.0
+      '@esbuild/netbsd-arm64': 0.27.0
+      '@esbuild/netbsd-x64': 0.27.0
+      '@esbuild/openbsd-arm64': 0.27.0
+      '@esbuild/openbsd-x64': 0.27.0
+      '@esbuild/openharmony-arm64': 0.27.0
+      '@esbuild/sunos-x64': 0.27.0
+      '@esbuild/win32-arm64': 0.27.0
+      '@esbuild/win32-ia32': 0.27.0
+      '@esbuild/win32-x64': 0.27.0
+
   esbuild@0.27.7:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.27.7
@@ -5767,6 +7607,8 @@ snapshots:
       acorn-jsx: 5.3.2(acorn@8.16.0)
       eslint-visitor-keys: 4.2.1
 
+  esprima@4.0.1: {}
+
   esquery@1.7.0:
     dependencies:
       estraverse: 5.3.0
@@ -5781,6 +7623,8 @@ snapshots:
 
   esutils@2.0.3: {}
 
+  exsolve@1.1.1: {}
+
   extend@3.0.2: {}
 
   fast-deep-equal@3.1.3: {}
@@ -5797,6 +7641,10 @@ snapshots:
     dependencies:
       flat-cache: 4.0.1
 
+  fill-range@7.1.1:
+    dependencies:
+      to-regex-range: 5.0.1
+
   find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
@@ -5833,6 +7681,8 @@ snapshots:
 
   gensync@1.0.0-beta.2: {}
 
+  get-caller-file@2.0.5: {}
+
   get-intrinsic@1.3.0:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -5862,7 +7712,10 @@ snapshots:
   get-tsconfig@4.13.7:
     dependencies:
       resolve-pkg-maps: 1.0.0
-    optional: true
+
+  glob-parent@5.1.2:
+    dependencies:
+      is-glob: 4.0.3
 
   glob-parent@6.0.2:
     dependencies:
@@ -5879,6 +7732,11 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
+  h3@2.0.1-rc.14:
+    dependencies:
+      rou3: 0.7.12
+      srvx: 0.11.22
+
   has-bigints@1.1.0: {}
 
   has-flag@4.0.0: {}
@@ -6013,6 +7871,17 @@ snapshots:
 
   html-void-elements@3.0.0: {}
 
+  htmlparser2@10.1.0:
+    dependencies:
+      domelementtype: 2.3.0
+      domhandler: 5.0.3
+      domutils: 3.2.2
+      entities: 7.0.1
+
+  iconv-lite@0.6.3:
+    dependencies:
+      safer-buffer: 2.1.2
+
   iconv-lite@0.7.2:
     dependencies:
       safer-buffer: 2.1.2
@@ -6061,6 +7930,10 @@ snapshots:
     dependencies:
       has-bigints: 1.1.0
 
+  is-binary-path@2.1.0:
+    dependencies:
+      binary-extensions: 2.3.0
+
   is-boolean-object@1.2.2:
     dependencies:
       call-bound: 1.0.4
@@ -6116,6 +7989,8 @@ snapshots:
       call-bound: 1.0.4
       has-tostringtag: 1.0.2
 
+  is-number@7.0.0: {}
+
   is-plain-obj@4.1.0: {}
 
   is-regex@1.2.1:
@@ -6159,6 +8034,8 @@ snapshots:
 
   isarray@2.0.5: {}
 
+  isbot@5.2.1: {}
+
   isexe@2.0.0: {}
 
   iterator.prototype@1.1.5:
@@ -6172,6 +8049,8 @@ snapshots:
 
   jiti@2.6.1: {}
 
+  jose@6.2.7: {}
+
   js-tokens@4.0.0: {}
 
   js-yaml@4.1.1:
@@ -6207,6 +8086,8 @@ snapshots:
     dependencies:
       json-buffer: 3.0.1
 
+  kysely@0.29.4: {}
+
   language-subtag-registry@0.3.23: {}
 
   language-tags@1.0.9:
@@ -6686,6 +8567,8 @@ snapshots:
 
   nanoid@3.3.11: {}
 
+  nanostores@1.4.2: {}
+
   natural-compare@1.4.0: {}
 
   node-exports-info@1.6.0:
@@ -6697,6 +8580,12 @@ snapshots:
 
   node-releases@2.0.37: {}
 
+  normalize-path@3.0.0: {}
+
+  nth-check@2.1.1:
+    dependencies:
+      boolbase: 1.0.0
+
   object-assign@4.1.1: {}
 
   object-inspect@1.13.4: {}
@@ -6784,6 +8673,15 @@ snapshots:
       is-decimal: 2.0.1
       is-hexadecimal: 2.0.1
 
+  parse5-htmlparser2-tree-adapter@7.1.0:
+    dependencies:
+      domhandler: 5.0.3
+      parse5: 7.3.0
+
+  parse5-parser-stream@7.1.2:
+    dependencies:
+      parse5: 7.3.0
+
   parse5@7.3.0:
     dependencies:
       entities: 6.0.1
@@ -6794,8 +8692,12 @@ snapshots:
 
   path-parse@1.0.7: {}
 
+  pathe@2.0.3: {}
+
   picocolors@1.1.1: {}
 
+  picomatch@2.3.2: {}
+
   picomatch@4.0.4: {}
 
   portless@0.12.0: {}
@@ -6853,6 +8755,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  react-refresh@0.18.0: {}
+
   react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.5):
     dependencies:
       react: 19.2.5
@@ -6882,6 +8786,18 @@ snapshots:
 
   react@19.2.5: {}
 
+  readdirp@3.6.0:
+    dependencies:
+      picomatch: 2.3.2
+
+  recast@0.23.19:
+    dependencies:
+      ast-types: 0.16.1
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tiny-invariant: 1.3.3
+      tslib: 2.8.1
+
   reflect.getprototypeof@1.0.10:
     dependencies:
       call-bind: 1.0.9
@@ -6984,10 +8900,13 @@ snapshots:
       mdast-util-to-markdown: 2.1.2
       unified: 11.0.5
 
+  remeda@2.39.0: {}
+
+  require-directory@2.1.1: {}
+
   resolve-from@4.0.0: {}
 
-  resolve-pkg-maps@1.0.0:
-    optional: true
+  resolve-pkg-maps@1.0.0: {}
 
   resolve@2.0.0-next.6:
     dependencies:
@@ -7029,6 +8948,8 @@ snapshots:
       '@rollup/rollup-win32-x64-msvc': 4.60.1
       fsevents: 2.3.3
 
+  rou3@0.7.12: {}
+
   safe-array-concat@1.1.3:
     dependencies:
       call-bind: 1.0.9
@@ -7056,6 +8977,14 @@ snapshots:
 
   semver@7.7.4: {}
 
+  seroval-plugins@1.6.0(seroval@1.6.0):
+    dependencies:
+      seroval: 1.6.0
+
+  seroval@1.6.0: {}
+
+  set-cookie-parser@3.1.2: {}
+
   set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
@@ -7132,8 +9061,14 @@ snapshots:
 
   source-map-js@1.2.1: {}
 
+  source-map@0.6.1: {}
+
+  source-map@0.7.6: {}
+
   space-separated-tokens@2.0.2: {}
 
+  srvx@0.11.22: {}
+
   stop-iteration-iterator@1.1.0:
     dependencies:
       es-errors: 1.3.0
@@ -7222,17 +9157,27 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  tagged-tag@1.0.0: {}
+
   tailwind-merge@3.5.0: {}
 
   tailwindcss@4.2.2: {}
 
   tapable@2.3.2: {}
 
+  tiny-invariant@1.3.3: {}
+
+  tiny-warning@1.0.3: {}
+
   tinyglobby@0.2.16:
     dependencies:
       fdir: 6.5.0(picomatch@4.0.4)
       picomatch: 4.0.4
 
+  to-regex-range@5.0.1:
+    dependencies:
+      is-number: 7.0.0
+
   trim-lines@3.0.1: {}
 
   trough@2.2.0: {}
@@ -7256,7 +9201,6 @@ snapshots:
       get-tsconfig: 4.13.7
     optionalDependencies:
       fsevents: 2.3.3
-    optional: true
 
   turbo-darwin-64@2.8.17:
     optional: true
@@ -7289,6 +9233,10 @@ snapshots:
     dependencies:
       prelude-ls: 1.2.1
 
+  type-fest@5.8.0:
+    dependencies:
+      tagged-tag: 1.0.0
+
   typed-array-buffer@1.0.3:
     dependencies:
       call-bound: 1.0.4
@@ -7335,6 +9283,8 @@ snapshots:
 
   typescript@5.9.3: {}
 
+  ufo@1.6.4: {}
+
   unbox-primitive@1.1.0:
     dependencies:
       call-bound: 1.0.4
@@ -7344,6 +9294,8 @@ snapshots:
 
   undici-types@7.16.0: {}
 
+  undici@7.29.0: {}
+
   unified@11.0.5:
     dependencies:
       '@types/unist': 3.0.3
@@ -7387,6 +9339,13 @@ snapshots:
       unist-util-is: 6.0.1
       unist-util-visit-parents: 6.0.2
 
+  unplugin@2.3.11:
+    dependencies:
+      '@jridgewell/remapping': 2.3.5
+      acorn: 8.16.0
+      picomatch: 4.0.4
+      webpack-virtual-modules: 0.6.2
+
   update-browserslist-db@1.2.3(browserslist@4.28.2):
     dependencies:
       browserslist: 4.28.2
@@ -7412,6 +9371,10 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.14
 
+  use-sync-external-store@1.6.0(react@19.2.5):
+    dependencies:
+      react: 19.2.5
+
   vaul@1.1.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
     dependencies:
       '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
@@ -7452,8 +9415,20 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.3
 
+  vitefu@1.1.3(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)):
+    optionalDependencies:
+      vite: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
+
   web-namespaces@2.0.1: {}
 
+  webpack-virtual-modules@0.6.2: {}
+
+  whatwg-encoding@3.1.1:
+    dependencies:
+      iconv-lite: 0.6.3
+
+  whatwg-mimetype@4.0.0: {}
+
   which-boxed-primitive@1.1.1:
     dependencies:
       is-bigint: 1.1.0
@@ -7507,11 +9482,40 @@ snapshots:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
+  wrap-ansi@7.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  ws@8.18.0: {}
+
+  xmlbuilder2@4.0.3:
+    dependencies:
+      '@oozcitak/dom': 2.0.2
+      '@oozcitak/infra': 2.0.2
+      '@oozcitak/util': 10.0.0
+      js-yaml: 4.1.1
+
+  y18n@5.0.8: {}
+
   yallist@3.1.1: {}
 
   yaml@2.8.3:
     optional: true
 
+  yargs-parser@21.1.1: {}
+
+  yargs@17.7.3:
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.2.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+
   yocto-queue@0.1.0: {}
 
   yoctocolors-cjs@2.1.3: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 99cd76a2..a17e0fbd 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,7 +1,10 @@
 packages:
   - apps/*
   - packages/*
+  - services/*
+  - shared/*
   - tooling/*
+  - deps/*
 
 catalog:
   "@clerk/tanstack-react-start": ^1.1.1
@@ -25,6 +28,7 @@ catalog:
   "@tanstack/react-router-devtools": ~1.159.6
   "@tanstack/react-router-ssr-query": ~1.159.6
   "@tanstack/react-start": ~1.159.6
+  "@tanstack/router-cli": ~1.159.6
   "@types/node": ^24
   "@vitejs/plugin-react": 5.1.0
   ai: ^6.0.158
diff --git a/services/backend/.env.example b/services/backend/.env.example
new file mode 100644
index 00000000..f992ed1d
--- /dev/null
+++ b/services/backend/.env.example
@@ -0,0 +1 @@
+CONVEX_DEPLOYMENT=dev:your-deployment-name
diff --git a/services/backend/.gitignore b/services/backend/.gitignore
new file mode 100644
index 00000000..8c5fbb9c
--- /dev/null
+++ b/services/backend/.gitignore
@@ -0,0 +1,2 @@
+
+.env.local
diff --git a/services/backend/README.md b/services/backend/README.md
new file mode 100644
index 00000000..2c8458bd
--- /dev/null
+++ b/services/backend/README.md
@@ -0,0 +1,16 @@
+# Vera backend
+
+This Convex service is the backend installed on each Vera home server. The same
+schema and functions can be deployed to multiple independent Convex deployments.
+
+For local federation testing, create `.env.a.local` and `.env.b.local` from
+`.env.example`, then deploy each target:
+
+```sh
+pnpm --filter @vera/backend deploy:a
+pnpm --filter @vera/backend deploy:b
+```
+
+Each deployment needs its own `FEDERATION_DOMAIN`. Better Auth is the current
+Vera authentication choice; the decentralized Convex packages remain auth
+provider agnostic.
diff --git a/services/backend/convex.json b/services/backend/convex.json
new file mode 100644
index 00000000..1f7bdd40
--- /dev/null
+++ b/services/backend/convex.json
@@ -0,0 +1,3 @@
+{
+  "functions": "convex/"
+}
diff --git a/services/backend/convex/_generated/api.d.ts b/services/backend/convex/_generated/api.d.ts
new file mode 100644
index 00000000..997d2847
--- /dev/null
+++ b/services/backend/convex/_generated/api.d.ts
@@ -0,0 +1,57 @@
+/* eslint-disable */
+/**
+ * Generated `api` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type {
+  ApiFromModules,
+  FilterApi,
+  FunctionReference,
+} from "convex/server";
+
+import type * as auth from "../auth.js";
+import type * as http from "../http.js";
+import type * as lib from "../lib.js";
+import type * as messages from "../messages.js";
+
+declare const fullApi: ApiFromModules<{
+  auth: typeof auth;
+  http: typeof http;
+  lib: typeof lib;
+  messages: typeof messages;
+}>;
+
+/**
+ * A utility for referencing Convex functions in your app's public API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = api.myModule.myFunction;
+ * ```
+ */
+export declare const api: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "public">
+>;
+
+/**
+ * A utility for referencing Convex functions in your app's internal API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = internal.myModule.myFunction;
+ * ```
+ */
+export declare const internal: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "internal">
+>;
+
+export declare const components: {
+  betterAuth: import("@convex-dev/better-auth/_generated/component.js").ComponentApi<"betterAuth">;
+};
diff --git a/services/backend/convex/_generated/api.js b/services/backend/convex/_generated/api.js
new file mode 100644
index 00000000..44bf9858
--- /dev/null
+++ b/services/backend/convex/_generated/api.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+/**
+ * Generated `api` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import { anyApi, componentsGeneric } from "convex/server";
+
+/**
+ * A utility for referencing Convex functions in your app's API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = api.myModule.myFunction;
+ * ```
+ */
+export const api = anyApi;
+export const internal = anyApi;
+export const components = componentsGeneric();
diff --git a/services/backend/convex/_generated/dataModel.d.ts b/services/backend/convex/_generated/dataModel.d.ts
new file mode 100644
index 00000000..b3ac5131
--- /dev/null
+++ b/services/backend/convex/_generated/dataModel.d.ts
@@ -0,0 +1,61 @@
+/* eslint-disable */
+/**
+ * Generated data model types.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type {
+  DataModelFromSchemaDefinition,
+  DocumentByName,
+  SystemTableNames,
+  TableNamesInDataModel,
+} from "convex/server";
+import type { GenericId } from "convex/values";
+
+import schema from "../schema.js";
+
+/**
+ * The names of all of your Convex tables.
+ */
+export type TableNames = TableNamesInDataModel<DataModel>;
+
+/**
+ * The type of a document stored in Convex.
+ *
+ * @typeParam TableName - A string literal type of the table name (like "users").
+ */
+export type Doc<TableName extends TableNames> = DocumentByName<
+  DataModel,
+  TableName
+>;
+
+/**
+ * An identifier for a document in Convex.
+ *
+ * Convex documents are uniquely identified by their `Id`, which is accessible
+ * on the `_id` field. To learn more, see [Document IDs](https://docs.convex.dev/using/document-ids).
+ *
+ * Documents can be loaded using `db.get(tableName, id)` in query and mutation functions.
+ *
+ * IDs are just strings at runtime, but this type can be used to distinguish them from other
+ * strings when type checking.
+ *
+ * @typeParam TableName - A string literal type of the table name (like "users").
+ */
+export type Id<TableName extends TableNames | SystemTableNames> =
+  GenericId<TableName>;
+
+/**
+ * A type describing your Convex data model.
+ *
+ * This type includes information about what tables you have, the type of
+ * documents stored in those tables, and the indexes defined on them.
+ *
+ * This type is used to parameterize methods like `queryGeneric` and
+ * `mutationGeneric` to make them type-safe.
+ */
+export type DataModel = DataModelFromSchemaDefinition<typeof schema>;
diff --git a/services/backend/convex/_generated/server.d.ts b/services/backend/convex/_generated/server.d.ts
new file mode 100644
index 00000000..f2c6ad31
--- /dev/null
+++ b/services/backend/convex/_generated/server.d.ts
@@ -0,0 +1,144 @@
+/* eslint-disable */
+/**
+ * Generated utilities for implementing server-side Convex query and mutation functions.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import {
+  ActionBuilder,
+  GenericActionCtx,
+  GenericDatabaseReader,
+  GenericDatabaseWriter,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  HttpActionBuilder,
+  MutationBuilder,
+  QueryBuilder,
+} from "convex/server";
+
+import type { DataModel } from "./dataModel.js";
+
+/**
+ * Define a query in this Convex app's public API.
+ *
+ * This function will be allowed to read your Convex database and will be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export declare const query: QueryBuilder<DataModel, "public">;
+
+/**
+ * Define a query that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to read from your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export declare const internalQuery: QueryBuilder<DataModel, "internal">;
+
+/**
+ * Define a mutation in this Convex app's public API.
+ *
+ * This function will be allowed to modify your Convex database and will be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export declare const mutation: MutationBuilder<DataModel, "public">;
+
+/**
+ * Define a mutation that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to modify your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export declare const internalMutation: MutationBuilder<DataModel, "internal">;
+
+/**
+ * Define an action in this Convex app's public API.
+ *
+ * An action is a function which can execute any JavaScript code, including non-deterministic
+ * code and code with side-effects, like calling third-party services.
+ * They can be run in Convex's JavaScript environment or in Node.js using the "use node" directive.
+ * They can interact with the database indirectly by calling queries and mutations using the {@link ActionCtx}.
+ *
+ * @param func - The action. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped action. Include this as an `export` to name it and make it accessible.
+ */
+export declare const action: ActionBuilder<DataModel, "public">;
+
+/**
+ * Define an action that is only accessible from other Convex functions (but not from the client).
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped function. Include this as an `export` to name it and make it accessible.
+ */
+export declare const internalAction: ActionBuilder<DataModel, "internal">;
+
+/**
+ * Define an HTTP action.
+ *
+ * The wrapped function will be used to respond to HTTP requests received
+ * by a Convex deployment if the requests matches the path and method where
+ * this action is routed. Be sure to route your httpAction in `convex/http.js`.
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument
+ * and a Fetch API `Request` object as its second.
+ * @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
+ */
+export declare const httpAction: HttpActionBuilder;
+
+/**
+ * A set of services for use within Convex query functions.
+ *
+ * The query context is passed as the first argument to any Convex query
+ * function run on the server.
+ *
+ * This differs from the {@link MutationCtx} because all of the services are
+ * read-only.
+ */
+export type QueryCtx = GenericQueryCtx<DataModel>;
+
+/**
+ * A set of services for use within Convex mutation functions.
+ *
+ * The mutation context is passed as the first argument to any Convex mutation
+ * function run on the server.
+ */
+export type MutationCtx = GenericMutationCtx<DataModel>;
+
+/**
+ * A set of services for use within Convex action functions.
+ *
+ * The action context is passed as the first argument to any Convex action
+ * function run on the server.
+ */
+export type ActionCtx = GenericActionCtx<DataModel>;
+
+/**
+ * An interface to read from the database within Convex query functions.
+ *
+ * The two entry points are {@link DatabaseReader.get}, which fetches a single
+ * document by its {@link Id}, or {@link DatabaseReader.query}, which starts
+ * building a query.
+ */
+export type DatabaseReader = GenericDatabaseReader<DataModel>;
+
+/**
+ * An interface to read from and write to the database within Convex mutation
+ * functions.
+ *
+ * Convex guarantees that all writes within a single mutation are
+ * executed atomically, so you never have to worry about partial writes leaving
+ * your data in an inconsistent state. See [the Convex Guide](https://docs.convex.dev/understanding/convex-fundamentals/functions#atomicity-and-optimistic-concurrency-control)
+ * for the guarantees Convex provides your functions.
+ */
+export type DatabaseWriter = GenericDatabaseWriter<DataModel>;
diff --git a/services/backend/convex/_generated/server.js b/services/backend/convex/_generated/server.js
new file mode 100644
index 00000000..3b69f406
--- /dev/null
+++ b/services/backend/convex/_generated/server.js
@@ -0,0 +1,93 @@
+/* eslint-disable */
+/**
+ * Generated utilities for implementing server-side Convex query and mutation functions.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import {
+  actionGeneric,
+  httpActionGeneric,
+  internalActionGeneric,
+  internalMutationGeneric,
+  internalQueryGeneric,
+  mutationGeneric,
+  queryGeneric,
+} from "convex/server";
+
+/**
+ * Define a query in this Convex app's public API.
+ *
+ * This function will be allowed to read your Convex database and will be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export const query = queryGeneric;
+
+/**
+ * Define a query that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to read from your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export const internalQuery = internalQueryGeneric;
+
+/**
+ * Define a mutation in this Convex app's public API.
+ *
+ * This function will be allowed to modify your Convex database and will be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export const mutation = mutationGeneric;
+
+/**
+ * Define a mutation that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to modify your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export const internalMutation = internalMutationGeneric;
+
+/**
+ * Define an action in this Convex app's public API.
+ *
+ * An action is a function which can execute any JavaScript code, including non-deterministic
+ * code and code with side-effects, like calling third-party services.
+ * They can be run in Convex's JavaScript environment or in Node.js using the "use node" directive.
+ * They can interact with the database indirectly by calling queries and mutations using the {@link ActionCtx}.
+ *
+ * @param func - The action. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped action. Include this as an `export` to name it and make it accessible.
+ */
+export const action = actionGeneric;
+
+/**
+ * Define an action that is only accessible from other Convex functions (but not from the client).
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped function. Include this as an `export` to name it and make it accessible.
+ */
+export const internalAction = internalActionGeneric;
+
+/**
+ * Define an HTTP action.
+ *
+ * The wrapped function will be used to respond to HTTP requests received
+ * by a Convex deployment if the requests matches the path and method where
+ * this action is routed. Be sure to route your httpAction in `convex/http.js`.
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument
+ * and a Fetch API `Request` object as its second.
+ * @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
+ */
+export const httpAction = httpActionGeneric;
diff --git a/services/backend/convex/auth.config.ts b/services/backend/convex/auth.config.ts
new file mode 100644
index 00000000..89c29520
--- /dev/null
+++ b/services/backend/convex/auth.config.ts
@@ -0,0 +1,8 @@
+export default {
+  providers: [
+    {
+      applicationID: "convex",
+      domain: process.env.CONVEX_SITE_URL ?? "missing-convex-site-url",
+    },
+  ],
+};
diff --git a/services/backend/convex/auth.ts b/services/backend/convex/auth.ts
new file mode 100644
index 00000000..6869473b
--- /dev/null
+++ b/services/backend/convex/auth.ts
@@ -0,0 +1,41 @@
+import type { GenericCtx } from "@convex-dev/better-auth";
+import { createClient } from "@convex-dev/better-auth";
+import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
+import { betterAuth } from "better-auth/minimal";
+
+import type { DataModel } from "./_generated/dataModel";
+import { components } from "./_generated/api";
+import { query } from "./_generated/server";
+import authConfig from "./auth.config";
+import { actorFromEmail, requireEnvironment } from "./lib";
+
+export const authComponent = createClient<DataModel>(components.betterAuth);
+
+export function createAuth(ctx: GenericCtx<DataModel>) {
+  const siteUrl = requireEnvironment("SITE_URL");
+  return betterAuth({
+    baseURL: requireEnvironment("CONVEX_SITE_URL"),
+    database: authComponent.adapter(ctx),
+    emailAndPassword: {
+      enabled: true,
+      requireEmailVerification: false,
+    },
+    plugins: [
+      crossDomain({ siteUrl }),
+      convex({ authConfig, jwksRotateOnTokenGenerationError: true }),
+    ],
+    trustedOrigins: [siteUrl],
+  });
+}
+
+export const currentUser = query({
+  args: {},
+  handler: async (ctx) => {
+    const identity = await ctx.auth.getUserIdentity();
+    if (identity === null) return null;
+    const user = await authComponent.getAuthUser(ctx);
+    return {
+      actor: actorFromEmail(user.email),
+    };
+  },
+});
diff --git a/services/backend/convex/convex.config.ts b/services/backend/convex/convex.config.ts
new file mode 100644
index 00000000..cd83cc50
--- /dev/null
+++ b/services/backend/convex/convex.config.ts
@@ -0,0 +1,7 @@
+import betterAuth from "@convex-dev/better-auth/convex.config";
+import { defineApp } from "convex/server";
+
+const app = defineApp();
+app.use(betterAuth);
+
+export default app;
diff --git a/services/backend/convex/http.ts b/services/backend/convex/http.ts
new file mode 100644
index 00000000..ece6eac3
--- /dev/null
+++ b/services/backend/convex/http.ts
@@ -0,0 +1,23 @@
+import { registerFederationRoutes } from "@decentralized-convex/server";
+import { httpRouter } from "convex/server";
+
+import { httpAction } from "./_generated/server";
+import { authComponent, createAuth } from "./auth";
+import { requireEnvironment } from "./lib";
+
+const http = httpRouter();
+
+authComponent.registerRoutes(http, createAuth, { cors: true });
+registerFederationRoutes(http, httpAction, {
+  descriptor: () => ({
+    auth: {
+      issuer: requireEnvironment("CONVEX_SITE_URL"),
+      jwksUrl: `${requireEnvironment("CONVEX_SITE_URL")}/api/auth/convex/jwks`,
+    },
+    capabilities: [{ id: "vera.chat", versions: ["1"] }],
+    deploymentUrl: requireEnvironment("CONVEX_CLOUD_URL"),
+    protocolVersion: "0.1",
+  }),
+});
+
+export default http;
diff --git a/services/backend/convex/lib.ts b/services/backend/convex/lib.ts
new file mode 100644
index 00000000..dbcb37f3
--- /dev/null
+++ b/services/backend/convex/lib.ts
@@ -0,0 +1,16 @@
+export function requireEnvironment(name: string) {
+  const value = process.env[name];
+  if (value === undefined || value.length === 0) {
+    throw new Error(`Missing environment variable: ${name}`);
+  }
+  return value;
+}
+
+export function actorFromEmail(email: string) {
+  const separator = email.indexOf("@");
+  const localPart = email.slice(0, separator === -1 ? undefined : separator);
+  if (localPart.length === 0) {
+    throw new Error("The authenticated account has no usable email address");
+  }
+  return `${localPart.toLowerCase()}@${requireEnvironment("FEDERATION_DOMAIN").toLowerCase()}`;
+}
diff --git a/services/backend/convex/messages.ts b/services/backend/convex/messages.ts
new file mode 100644
index 00000000..6f92f107
--- /dev/null
+++ b/services/backend/convex/messages.ts
@@ -0,0 +1,59 @@
+import { v } from "convex/values";
+
+import { mutation, query } from "./_generated/server";
+import { authComponent } from "./auth";
+import { actorFromEmail, requireEnvironment } from "./lib";
+
+export const list = query({
+  args: { roomId: v.string() },
+  handler: async (ctx, { roomId }) => {
+    const messages = await ctx.db
+      .query("messages")
+      .withIndex("by_room", (index) => index.eq("roomId", roomId))
+      .collect();
+    return messages.map(
+      ({ author, authorName, body, eventId, origin, sentAt }) => ({
+        author,
+        authorName: authorName ?? author,
+        body,
+        eventId,
+        origin,
+        sentAt,
+      }),
+    );
+  },
+});
+
+export const send = mutation({
+  args: {
+    body: v.string(),
+    eventId: v.string(),
+    roomId: v.string(),
+    sentAt: v.number(),
+  },
+  handler: async (ctx, args) => {
+    const body = args.body.trim();
+    if (body.length === 0 || body.length > 4_000) {
+      throw new Error("Messages must contain between 1 and 4,000 characters");
+    }
+
+    const user = await authComponent.getAuthUser(ctx);
+
+    const existing = await ctx.db
+      .query("messages")
+      .withIndex("by_event", (index) => index.eq("eventId", args.eventId))
+      .unique();
+    if (existing === null) {
+      await ctx.db.insert("messages", {
+        author: actorFromEmail(user.email),
+        authorName: user.name,
+        body,
+        eventId: args.eventId,
+        origin: requireEnvironment("FEDERATION_DOMAIN").toLowerCase(),
+        roomId: args.roomId,
+        sentAt: args.sentAt,
+      });
+    }
+    return { eventId: args.eventId };
+  },
+});
diff --git a/services/backend/convex/schema.ts b/services/backend/convex/schema.ts
new file mode 100644
index 00000000..8b376033
--- /dev/null
+++ b/services/backend/convex/schema.ts
@@ -0,0 +1,16 @@
+import { defineSchema, defineTable } from "convex/server";
+import { v } from "convex/values";
+
+export default defineSchema({
+  messages: defineTable({
+    author: v.string(),
+    authorName: v.optional(v.string()),
+    body: v.string(),
+    eventId: v.string(),
+    origin: v.string(),
+    roomId: v.string(),
+    sentAt: v.number(),
+  })
+    .index("by_event", ["eventId"])
+    .index("by_room", ["roomId"]),
+});
diff --git a/services/backend/convex/tsconfig.json b/services/backend/convex/tsconfig.json
new file mode 100644
index 00000000..68898491
--- /dev/null
+++ b/services/backend/convex/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "allowImportingTsExtensions": true,
+    "strict": true,
+    "moduleResolution": "Bundler",
+    "jsx": "react-jsx",
+    "skipLibCheck": true,
+    "allowSyntheticDefaultImports": true,
+    "target": "ESNext",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "forceConsistentCasingInFileNames": true,
+    "module": "ESNext",
+    "types": ["node"],
+    "isolatedModules": true,
+    "noEmit": true
+  },
+  "include": ["./**/*"],
+  "exclude": ["./_generated"]
+}
diff --git a/services/backend/eslint.config.ts b/services/backend/eslint.config.ts
new file mode 100644
index 00000000..a1717f93
--- /dev/null
+++ b/services/backend/eslint.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(
+  { ignores: ["convex/_generated/**"] },
+  baseConfig,
+  strictConfig,
+);
diff --git a/services/backend/package.json b/services/backend/package.json
new file mode 100644
index 00000000..3aab6e21
--- /dev/null
+++ b/services/backend/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "@vera/backend",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    "./api": "./convex/_generated/api.js"
+  },
+  "scripts": {
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "deploy:a": "convex dev --once --env-file .env.a.local",
+    "deploy:b": "convex dev --once --env-file .env.b.local",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "typecheck": "tsgo --noEmit -p convex/tsconfig.json"
+  },
+  "dependencies": {
+    "@convex-dev/better-auth": "0.12.5",
+    "@decentralized-convex/server": "workspace:*",
+    "better-auth": "~1.6.15",
+    "convex": "catalog:"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/shared/app-config/eslint.config.ts b/shared/app-config/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/shared/app-config/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/app-config/package.json b/shared/app-config/package.json
similarity index 100%
rename from packages/app-config/package.json
rename to shared/app-config/package.json
diff --git a/packages/app-config/src/urls.ts b/shared/app-config/src/urls.ts
similarity index 100%
rename from packages/app-config/src/urls.ts
rename to shared/app-config/src/urls.ts
diff --git a/packages/app-config/tsconfig.json b/shared/app-config/tsconfig.json
similarity index 100%
rename from packages/app-config/tsconfig.json
rename to shared/app-config/tsconfig.json
diff --git a/packages/ui/components.json b/shared/ui/components.json
similarity index 100%
rename from packages/ui/components.json
rename to shared/ui/components.json
diff --git a/packages/ui/eslint.config.ts b/shared/ui/eslint.config.ts
similarity index 100%
rename from packages/ui/eslint.config.ts
rename to shared/ui/eslint.config.ts
diff --git a/packages/ui/package.json b/shared/ui/package.json
similarity index 100%
rename from packages/ui/package.json
rename to shared/ui/package.json
diff --git a/packages/ui/src/components/alert-dialog.tsx b/shared/ui/src/components/alert-dialog.tsx
similarity index 100%
rename from packages/ui/src/components/alert-dialog.tsx
rename to shared/ui/src/components/alert-dialog.tsx
diff --git a/packages/ui/src/components/button.tsx b/shared/ui/src/components/button.tsx
similarity index 100%
rename from packages/ui/src/components/button.tsx
rename to shared/ui/src/components/button.tsx
diff --git a/packages/ui/src/components/card.tsx b/shared/ui/src/components/card.tsx
similarity index 100%
rename from packages/ui/src/components/card.tsx
rename to shared/ui/src/components/card.tsx
diff --git a/packages/ui/src/components/code-block.tsx b/shared/ui/src/components/code-block.tsx
similarity index 100%
rename from packages/ui/src/components/code-block.tsx
rename to shared/ui/src/components/code-block.tsx
diff --git a/packages/ui/src/components/context-menu.tsx b/shared/ui/src/components/context-menu.tsx
similarity index 100%
rename from packages/ui/src/components/context-menu.tsx
rename to shared/ui/src/components/context-menu.tsx
diff --git a/packages/ui/src/components/dialog.tsx b/shared/ui/src/components/dialog.tsx
similarity index 100%
rename from packages/ui/src/components/dialog.tsx
rename to shared/ui/src/components/dialog.tsx
diff --git a/packages/ui/src/components/drawer.tsx b/shared/ui/src/components/drawer.tsx
similarity index 100%
rename from packages/ui/src/components/drawer.tsx
rename to shared/ui/src/components/drawer.tsx
diff --git a/packages/ui/src/components/dropdown-menu.tsx b/shared/ui/src/components/dropdown-menu.tsx
similarity index 100%
rename from packages/ui/src/components/dropdown-menu.tsx
rename to shared/ui/src/components/dropdown-menu.tsx
diff --git a/packages/ui/src/components/hover-card.tsx b/shared/ui/src/components/hover-card.tsx
similarity index 100%
rename from packages/ui/src/components/hover-card.tsx
rename to shared/ui/src/components/hover-card.tsx
diff --git a/packages/ui/src/components/input.tsx b/shared/ui/src/components/input.tsx
similarity index 100%
rename from packages/ui/src/components/input.tsx
rename to shared/ui/src/components/input.tsx
diff --git a/packages/ui/src/components/label.tsx b/shared/ui/src/components/label.tsx
similarity index 100%
rename from packages/ui/src/components/label.tsx
rename to shared/ui/src/components/label.tsx
diff --git a/packages/ui/src/components/loader.tsx b/shared/ui/src/components/loader.tsx
similarity index 100%
rename from packages/ui/src/components/loader.tsx
rename to shared/ui/src/components/loader.tsx
diff --git a/packages/ui/src/components/markdown.tsx b/shared/ui/src/components/markdown.tsx
similarity index 100%
rename from packages/ui/src/components/markdown.tsx
rename to shared/ui/src/components/markdown.tsx
diff --git a/packages/ui/src/components/popover.tsx b/shared/ui/src/components/popover.tsx
similarity index 100%
rename from packages/ui/src/components/popover.tsx
rename to shared/ui/src/components/popover.tsx
diff --git a/packages/ui/src/components/progress.tsx b/shared/ui/src/components/progress.tsx
similarity index 100%
rename from packages/ui/src/components/progress.tsx
rename to shared/ui/src/components/progress.tsx
diff --git a/packages/ui/src/components/scroll-area.tsx b/shared/ui/src/components/scroll-area.tsx
similarity index 100%
rename from packages/ui/src/components/scroll-area.tsx
rename to shared/ui/src/components/scroll-area.tsx
diff --git a/packages/ui/src/components/select.tsx b/shared/ui/src/components/select.tsx
similarity index 100%
rename from packages/ui/src/components/select.tsx
rename to shared/ui/src/components/select.tsx
diff --git a/packages/ui/src/components/separator.tsx b/shared/ui/src/components/separator.tsx
similarity index 100%
rename from packages/ui/src/components/separator.tsx
rename to shared/ui/src/components/separator.tsx
diff --git a/packages/ui/src/components/sheet.tsx b/shared/ui/src/components/sheet.tsx
similarity index 100%
rename from packages/ui/src/components/sheet.tsx
rename to shared/ui/src/components/sheet.tsx
diff --git a/packages/ui/src/components/sidebar.tsx b/shared/ui/src/components/sidebar.tsx
similarity index 100%
rename from packages/ui/src/components/sidebar.tsx
rename to shared/ui/src/components/sidebar.tsx
diff --git a/packages/ui/src/components/skeleton.tsx b/shared/ui/src/components/skeleton.tsx
similarity index 100%
rename from packages/ui/src/components/skeleton.tsx
rename to shared/ui/src/components/skeleton.tsx
diff --git a/packages/ui/src/components/sonner.tsx b/shared/ui/src/components/sonner.tsx
similarity index 100%
rename from packages/ui/src/components/sonner.tsx
rename to shared/ui/src/components/sonner.tsx
diff --git a/packages/ui/src/components/switch.tsx b/shared/ui/src/components/switch.tsx
similarity index 100%
rename from packages/ui/src/components/switch.tsx
rename to shared/ui/src/components/switch.tsx
diff --git a/packages/ui/src/components/tooltip.tsx b/shared/ui/src/components/tooltip.tsx
similarity index 100%
rename from packages/ui/src/components/tooltip.tsx
rename to shared/ui/src/components/tooltip.tsx
diff --git a/packages/ui/src/hooks/use-mobile.ts b/shared/ui/src/hooks/use-mobile.ts
similarity index 100%
rename from packages/ui/src/hooks/use-mobile.ts
rename to shared/ui/src/hooks/use-mobile.ts
diff --git a/packages/ui/src/lib/utils.ts b/shared/ui/src/lib/utils.ts
similarity index 100%
rename from packages/ui/src/lib/utils.ts
rename to shared/ui/src/lib/utils.ts
diff --git a/packages/ui/tsconfig.json b/shared/ui/tsconfig.json
similarity index 100%
rename from packages/ui/tsconfig.json
rename to shared/ui/tsconfig.json
diff --git a/turbo.json b/turbo.json
index e85fc05c..e1cf2259 100644
--- a/turbo.json
+++ b/turbo.json
@@ -10,9 +10,9 @@
       "outputs": [".cache/tsbuildinfo.json", "dist/**"]
     },
     "dev": {
-      "dependsOn": ["^topo", "^dev"],
+      "dependsOn": ["^topo"],
       "cache": false,
-      "persistent": false
+      "persistent": true
     },
     "format": {
       "outputs": [".cache/.prettiercache"],
@@ -55,8 +55,16 @@
 
     "VITE_CONVEX_URL",
     "CONVEX_DEPLOYMENT",
+    "CONVEX_CLOUD_URL",
+    "CONVEX_SITE_URL",
     "CONVEX_INTERNAL_KEY",
     "CONVEX_DEPLOY_KEY",
+    "FEDERATION_DOMAIN",
+    "SITE_URL",
+    "VITE_HOME_A_CONVEX_URL",
+    "VITE_HOME_A_SITE_URL",
+    "VITE_HOME_B_CONVEX_URL",
+    "VITE_HOME_B_SITE_URL",
 
     "OPENROUTER_API_KEY",
     "OPENAI_API_KEY",

From 95b6efb0111bd40a6ce9e171428302ba47f860fc Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Sun, 2 Aug 2026 10:53:21 -0400
Subject: [PATCH 02/17] Remove old agent slop, update license

---
 .agents/settings.local.json                   | 102 ---
 .agents/skills/.gitkeep                       |   0
 .agents/skills/react/SKILL.md                 |  47 --
 .../skills/react/references/composition.md    | 294 --------
 .../skills/react/references/data-and-state.md | 419 -----------
 .agents/skills/refactor/SKILL.md              |  44 --
 .agents/skills/rostra/SKILL.md                | 136 ----
 .agents/skills/shopify/SKILL.md               |  20 -
 .agents/skills/typescript/SKILL.md            |  69 --
 AGENTS.md                                     |   8 +-
 LICENSE                                       | 676 +++++++++++++++++-
 LICENSE.agent                                 | 201 ------
 LICENSE.t3 => LICENSE.t3-turbo                |   0
 13 files changed, 671 insertions(+), 1345 deletions(-)
 delete mode 100644 .agents/settings.local.json
 create mode 100644 .agents/skills/.gitkeep
 delete mode 100644 .agents/skills/react/SKILL.md
 delete mode 100644 .agents/skills/react/references/composition.md
 delete mode 100644 .agents/skills/react/references/data-and-state.md
 delete mode 100644 .agents/skills/refactor/SKILL.md
 delete mode 100644 .agents/skills/rostra/SKILL.md
 delete mode 100644 .agents/skills/shopify/SKILL.md
 delete mode 100644 .agents/skills/typescript/SKILL.md
 delete mode 100644 LICENSE.agent
 rename LICENSE.t3 => LICENSE.t3-turbo (100%)

diff --git a/.agents/settings.local.json b/.agents/settings.local.json
deleted file mode 100644
index 4da993b0..00000000
--- a/.agents/settings.local.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "permissions": {
-    "defaultMode": "auto",
-    "deny": [
-      "Bash(git commit *)",
-      "Bash(git commit)",
-      "Bash(git stash *)",
-      "Bash(git stash)",
-      "Bash(git push *)",
-      "Bash(git push)",
-      "Bash(git reset --hard *)",
-      "Bash(git reset *)",
-
-      "Bash(pnpm dev)",
-      "Bash(pnpm dev *)",
-      "Bash(pnpm start)",
-      "Bash(pnpm start *)",
-      "Bash(pnpm run dev)",
-      "Bash(pnpm run dev *)",
-      "Bash(pnpm run start)",
-      "Bash(pnpm run start *)",
-
-      "Bash(npm dev)",
-      "Bash(npm dev *)",
-      "Bash(npm start)",
-      "Bash(npm start *)",
-      "Bash(npm run dev)",
-      "Bash(npm run dev *)",
-      "Bash(npm run start)",
-      "Bash(npm run start *)",
-
-      "Bash(bun dev)",
-      "Bash(bun dev *)",
-      "Bash(bun start)",
-      "Bash(bun start *)",
-      "Bash(bun run dev)",
-      "Bash(bun run dev *)",
-      "Bash(bun run start)",
-      "Bash(bun run start *)",
-
-      "Bash(rm -rf *)",
-
-      "Read(**/.env)",
-      "Read(**/.env.*)",
-      "Read(.env)",
-      "Read(.env.*)",
-      "Edit(**/.env)",
-      "Edit(**/.env.*)",
-      "Edit(.env)",
-      "Edit(.env.*)",
-      "Write(**/.env)",
-      "Write(**/.env.*)",
-      "Write(.env)",
-      "Write(.env.*)",
-
-      "Bash(cat *.env)",
-      "Bash(cat *.env.*)",
-      "Bash(cat *.env*)",
-      "Bash(less *.env)",
-      "Bash(less *.env.*)",
-      "Bash(less *.env*)",
-      "Bash(more *.env)",
-      "Bash(more *.env.*)",
-      "Bash(more *.env*)",
-      "Bash(head *.env)",
-      "Bash(head *.env.*)",
-      "Bash(head *.env*)",
-      "Bash(tail *.env)",
-      "Bash(tail *.env.*)",
-      "Bash(tail *.env*)",
-      "Bash(grep *.env)",
-      "Bash(grep *.env.*)",
-      "Bash(grep *.env*)",
-      "Bash(rg *.env)",
-      "Bash(rg *.env.*)",
-      "Bash(rg *.env*)",
-      "Bash(sed *.env)",
-      "Bash(sed *.env.*)",
-      "Bash(sed *.env*)",
-      "Bash(awk *.env)",
-      "Bash(awk *.env.*)",
-      "Bash(awk *.env*)",
-      "Bash(cp *.env*)",
-      "Bash(mv *.env*)",
-      "Bash(xxd *.env*)",
-      "Bash(od *.env*)",
-      "Bash(strings *.env*)",
-      "Bash(tee *.env*)",
-      "Bash(cp .env*)",
-      "Bash(mv .env*)",
-      "Bash(cat .env*)",
-      "Bash(less .env*)",
-      "Bash(more .env*)",
-      "Bash(head .env*)",
-      "Bash(tail .env*)",
-      "Bash(grep * .env*)",
-      "Bash(rg * .env*)",
-      "Bash(sed * .env*)",
-      "Bash(awk * .env*)"
-    ]
-  }
-}
diff --git a/.agents/skills/.gitkeep b/.agents/skills/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/.agents/skills/react/SKILL.md b/.agents/skills/react/SKILL.md
deleted file mode 100644
index c6be77cd..00000000
--- a/.agents/skills/react/SKILL.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-name: react
-description: React coding standards for this project. Use when writing or modifying React components, hooks, or route files.
----
-
-# React
-
-These are the React standards for this project. Follow them when writing or modifying any React code. For detailed rationale, examples, and edge cases on composition and data patterns, see the individual [reference files](references/).
-
-## Composition
-
-- Code should read like prose. Every file should have a clear, single purpose.
-- Separate concerns by file: business logic in hooks/utilities, UI in components, data fetching config in query builders. Exception: a component and its dedicated hook may live in the same file when the hook serves only that component.
-- Build complex behavior by composing small hooks and small components — do not let a single unit grow.
-- **Route files**: All route-level configuration (search params, loader, beforeLoad, head, meta, error/pending components, static data, etc.) defined inline — never imported from a separate config file. A route file contains at most **one hook** (showing what data the page needs) and **one route component** (containing the actual page markup). Nothing else — no sub-components, constants, types, or extra hooks. Those belong in feature directories. Do not extract the entire route body into a single feature component; if the route would just render `<SomePage />`, that component's content belongs inline in the route component. If the page is simple, the route component just contains the markup directly.
-- **Components**: Under ~80 lines or one distinct UI concern. Split if larger. Colocate tightly related sub-components in the same file when not reused elsewhere.
-- **Hooks**: Under ~50 lines. Extract sub-hooks when larger. A coordinating hook should mostly be a sequence of calls to smaller hooks plus a return statement.
-- Small inline handlers (a couple of lines) in components are fine. Anything more substantial should be extracted into a hook or utility.
-
-## State Management
-
-TanStack Query is the primary state management solution for server data. Components should pull data directly using hooks (`useSuspenseQuery`, `useSearch`, `useRouteContext`, `useStore`) at the leaf level where it's needed — **never prop drill data that a hook can provide directly**.
-
-1. **Query caches** (TanStack Query for all data sources): The default for server data. Query at the component level — no prop drilling required. Centralize all query definitions (including Convex) into `*Queries` files using `queryOptions`.
-2. **URL state** (TanStack Router `validateSearch` + `useSearch`): For state that should persist across refreshes, be shareable via link, or be bookmarkable.
-3. **Rostra stores**: Only for non-server state — form inputs before submission, global concerns (auth, theme), UI state shared across a subtree. See the `rostra` skill for implementation details.
-4. **Prop drilling**: Least preferred, and usually unnecessary. One level of props is normal for component-specific configuration. Passing data available via hooks through multiple intermediary components is always wrong. Before prop drilling though, you should always ask yourself if one of the solutions above could be used instead, typically the answer is yes.
-
-When uncertain about the right choice, ask the user.
-
-## Data Loading
-
-- **Component + hook pattern**: Components with more than ~5 lines of business logic (queries, mutations, derived state, handlers) should pair with a co-located hook that owns all that logic. The hook returns only what the component actually uses — named variables and callbacks, never raw query objects or large data structures. The component is a thin renderer. For components with minimal data access (a single query call and a line or two of derivation), inline logic in the component body is fine — extracting a hook for 3 lines of logic adds ceremony without improving readability.
-- **Route loaders**: Prefetch with `ensureQueryData` (or `ensureInfiniteQueryData`). Declare `loaderDeps` when the loader depends on search params.
-- **Centralized query definitions**: All queries — Convex and non-Convex — should be centralized into `*Queries` files using `queryOptions`. For Convex, wrap `convexQuery()` in `queryOptions()` — no explicit `queryKey` needed since `convexQuery` generates keys automatically.
-- **Centralized mutation definitions**: Use `mutationOptions` for all mutations. Convex mutations must be defined inside a hook (since `useConvexMutation` is a hook).
-- **Components**: Consume prefetched data with `useSuspenseQuery`. Since the loader already populated the cache, this resolves synchronously. Pull data at the leaf component — do not drill it from parents.
-- **Fine-grained data hooks**: Prefer many small hooks that each `select` the minimum data one consumer needs over a single shared hook that returns a large object. The query cache deduplicates fetches, so multiple hooks hitting the same query key with different `select` functions cost nothing. Name hooks after the data they provide (`useCartQuantity`, `useProductTitle`), not the query they read from.
-- **Optimistic updates**: For TanStack Query — cancel in-flight queries in `onMutate`, snapshot previous data, apply optimistic change, roll back in `onError`. For Convex — use `.withOptimisticUpdate`. Prioritize for actions where perceived latency matters (cart ops, toggles, inline edits).
-- **Loading/error states**: Do NOT manually write loading spinners or error checks. TanStack Start handles this at the route level via `defaultPendingComponent`, `defaultErrorComponent`, and `defaultNotFoundComponent`. Only check mutation status (`isPending`, `isError`) for mutation-driven UI feedback.
-
-## Performance
-
-- **Push state down**: Own state in the leaf component that needs it, not in a shared parent.
-- **Split at render boundaries**: Separate frequently-changing state from expensive-to-render UI into different components.
-- **Compose with children**: When a wrapper needs state but its children don't depend on it, pass children through as a prop to avoid re-rendering the subtree.
-- **Stable references**: Hoist static objects/arrays to module scope. Inline object/array literals create new references every render, which matters when the receiver relies on referential equality.
diff --git a/.agents/skills/react/references/composition.md b/.agents/skills/react/references/composition.md
deleted file mode 100644
index 1a461bcc..00000000
--- a/.agents/skills/react/references/composition.md
+++ /dev/null
@@ -1,294 +0,0 @@
-# Composition
-
-## Overview
-
-Code should read like prose. When you look at a component, a hook, or a route file, you should be able to understand what it does with the same ease as reading a sentence. This means keeping things small, focused, and organized so that the intent is immediately obvious at every level.
-
-The single biggest failure mode for AI-generated React code is producing monolithic files that mix business logic, state management, and UI into one enormous blob. This makes code review painful because you cannot reason about any single concern without mentally filtering out everything else. Every file should have a clear purpose, and every function within it should earn its place.
-
-## Principles
-
-1. **Small over large.** A 40-line component that does one thing well is always better than a 200-line component that does five things.
-2. **Separate concerns by file.** Business logic lives in hooks or utility functions. UI lives in components. Data fetching configuration lives in query builders. Exception: a component and its dedicated hook may live in the same file when the hook serves only that component. Shared or reusable hooks still belong in separate files.
-3. **Compose, don't accumulate.** Build complex behavior by composing small hooks and small components rather than letting a single unit grow.
-4. **Every file should answer one question at a glance.** A route file answers "what does this page look like and what data does it need?" A component file answers "what does this piece of UI render?" A hook answers "what behavior does this encapsulate?"
-
-## Route Files
-
-A route file is the entry point for a page. When someone opens it, they should immediately understand:
-
-- What data the page needs
-- What the general layout looks like
-- Where to go to dig deeper into any specific piece
-
-Route files should be concise. Search params, loaders, and the route component all live in the same file.
-
-A route file contains at most **one hook** and **one route component**. Nothing else.
-
-- The **hook** shows what data the page needs — queries, context, derived state. Not every route needs one; omit it when the route component has no data to fetch.
-- The **route component** contains the actual page markup and layout. It calls the hook (if one exists) and renders the page using imported child components. If the page is simple enough, the route component just contains the markup directly — do not create sub-components for the sake of it.
-
-Do not extract the entire route component body into a single feature component and render only that. If the route component would just be `<SomePageComponent />`, that component's content belongs inline in the route component itself.
-
-Sub-components, constants, types, hooks beyond the single route hook, and utilities do **not** belong in route files. Sub-components live in `components/` feature folders. Constants and types live in `lib/` feature folders. The route file imports them. The route file is a map — it shows you what data the page uses, how it uses it, and what the page looks like at a glance.
-
-### Example: A well-composed route file
-
-```tsx
-import { useSuspenseQuery } from "@tanstack/react-query";
-import { createFileRoute, useRouteContext } from "@tanstack/react-router";
-import { z } from "zod";
-
-import type { Viewport } from "~/features/pages/components/viewport-controls";
-import { env } from "~/env";
-import { OpenInNewTab } from "~/features/pages/components/open-in-new-tab";
-import { PreviewIframe } from "~/features/pages/components/preview-iframe";
-import {
-  defaultViewport,
-  ViewportToggle,
-  viewportValidator,
-} from "~/features/pages/components/viewport-controls";
-import { pageQueries } from "~/features/pages/lib/page-queries";
-
-export const Route = createFileRoute(
-  "/_authenticated/_authorized/pages/$pageId/",
-)({
-  component: PageHub,
-  validateSearch: z.object({
-    viewport: viewportValidator.default(defaultViewport),
-  }),
-  loader: async ({ context }) => {
-    const { pageId } = context;
-    await Promise.all([
-      context.queryClient.ensureQueryData(
-        pageQueries.listDraftsFirstPage(pageId),
-      ),
-      context.queryClient.ensureQueryData(
-        pageQueries.listRecentReleases(pageId),
-      ),
-    ]);
-  },
-  shouldReload: false,
-});
-
-function PageHub() {
-  const { title, hasRelease, url, viewport, setViewport } = usePageHub();
-
-  if (!hasRelease) {
-    return (
-      <div className="flex h-full flex-1 items-center justify-center">
-        <p className="text-muted-foreground text-lg">
-          No version has been published yet
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex h-full flex-1 flex-col">
-      <div className="flex shrink-0 items-center justify-end gap-2 px-4 py-2">
-        <OpenInNewTab url={url} />
-        <ViewportToggle value={viewport} onChange={setViewport} />
-      </div>
-      <PreviewIframe
-        url={url}
-        title={`Preview of ${title}`}
-        viewport={viewport}
-      />
-    </div>
-  );
-}
-
-function usePageHub() {
-  const pageId = useRouteContext({
-    from: "/_authenticated/_authorized/pages/$pageId",
-    select: (ctx) => ctx.pageId,
-  });
-
-  const { data } = useSuspenseQuery({
-    ...pageQueries.getById(pageId),
-    select: (data) => ({
-      title: data.title,
-      path: data.path,
-      hasRelease: data.hasRelease,
-    }),
-  });
-
-  const viewport = Route.useSearch({
-    select: (search) => search.viewport,
-  });
-
-  const navigate = Route.useNavigate();
-  async function setViewport(newViewport: Viewport) {
-    await navigate({ search: { viewport: newViewport }, replace: true });
-  }
-
-  const url = `${env.VITE_SHOP_URL}${data.path}`;
-
-  return { ...data, url, viewport, setViewport };
-}
-```
-
-Notice what this file gives you: the route configuration is self-contained at the top — search params, loader, and prefetching are all visible. The route component reads like a description of UI: if there's no release, show an empty state; otherwise show the preview toolbar and iframe. The hook reads like a description of behavior: get the page ID, select the three fields we need, read the viewport search param, wire up a navigation callback, derive the preview URL. Neither concern leaks into the other. Every query uses `select` to pull only what this specific component needs, and the hook returns only named primitives and callbacks.
-
-## Components
-
-Components with more than ~5 lines of business logic should pair with a co-located hook in the same file. The hook owns all data access — queries, mutations, derived state, navigation. The component is a thin renderer that calls the hook and renders UI based on what it returns. For components with minimal data access (a single query call and a line or two of derivation), inline logic in the component body is fine — extracting a hook for 3 lines of logic adds ceremony without improving readability.
-
-Components should be small and focused on a single piece of UI. When a component grows beyond a handful of concerns, split it into smaller components that each own one piece. The parent component then becomes a composition of those pieces, readable at a glance.
-
-Colocate tightly related sub-components in the same file when they are not reused elsewhere. The exported component is the public API of the file; internal sub-components and hooks are implementation details.
-
-### Example: A component with its co-located hook
-
-```tsx
-export function PagePreview() {
-  const { title, hasRelease, url, viewport, setViewport } = usePagePreview();
-
-  if (!hasRelease) {
-    return (
-      <div className="flex h-full flex-1 items-center justify-center">
-        <p className="text-muted-foreground text-lg">
-          No version has been published yet
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex h-full flex-1 flex-col">
-      <div className="flex shrink-0 items-center justify-end gap-2 px-4 py-2">
-        <OpenInNewTab url={url} />
-        <ViewportToggle value={viewport} onChange={setViewport} />
-      </div>
-      <PreviewIframe
-        url={url}
-        title={`Preview of ${title}`}
-        viewport={viewport}
-      />
-    </div>
-  );
-}
-
-function usePagePreview() {
-  const pageId = useRouteContext({
-    from: "/_authenticated/_authorized/pages/$pageId",
-    select: (ctx) => ctx.pageId,
-  });
-
-  const { data } = useSuspenseQuery({
-    ...pageQueries.getById(pageId),
-    select: (data) => ({
-      title: data.title,
-      path: data.path,
-      hasRelease: data.hasRelease,
-    }),
-  });
-
-  const viewport = Route.useSearch({
-    select: (search) => search.viewport,
-  });
-
-  const navigate = Route.useNavigate();
-  async function setViewport(newViewport: Viewport) {
-    await navigate({ search: { viewport: newViewport }, replace: true });
-  }
-
-  const url = `${env.VITE_SHOP_URL}${data.path}`;
-
-  return { ...data, url, viewport, setViewport };
-}
-```
-
-Reading this file, the component reads like a description of UI: if there's no release, show an empty state; otherwise show the preview toolbar and iframe. The hook reads like a description of behavior: get the page ID, select the three fields we need, read the viewport search param, derive the preview URL. Neither concern leaks into the other.
-
-Notice the hook's `select` — it pulls only `title`, `path`, and `hasRelease` from the page query, not the entire page object. The hook then returns only named primitives and callbacks that the component actually uses. This keeps the interface between hook and component tight and explicit.
-
-## Hooks
-
-Hooks should be small, single-purpose, and specific to their consumer. A hook's return value should be the minimum interface its consumer needs — named primitives and callbacks, not raw query objects or large data structures.
-
-The default pattern is a **co-located hook** — an unexported hook in the same file as the component it serves. This hook owns all business logic for that component: queries with fine-grained `select`, mutations, derived state, and navigation. The component calls the hook and renders what it returns.
-
-When a hook grows beyond ~50 lines, extract focused sub-hooks. But the goal is not to build a hierarchy of shared hooks that centralize data access — it's to keep each hook small and specific to the concern it serves.
-
-### Example: A co-located hook with fine-grained selection
-
-```tsx
-function useDraftEditor() {
-  const draftId = useRouteContext({
-    from: "/_authenticated/_authorized/pages/$pageId/draft/$draftId",
-    select: (ctx) => ctx.draftId,
-  });
-
-  const { data: draft } = useSuspenseQuery({
-    ...pageQueries.getDraft(draftId),
-    select: (data) => ({ _id: data._id, content: data.content }),
-  });
-
-  const [content, setContent] = useState(draft.content);
-
-  useAutosave({ draftId: draft._id, content });
-
-  const { mode, viewport } = Route.useSearch({
-    select: (search) => ({ mode: search.mode, viewport: search.viewport }),
-  });
-
-  const navigate = Route.useNavigate();
-  async function setMode(newMode: EditorMode) {
-    await navigate({ search: { mode: newMode, viewport }, replace: true });
-  }
-  async function setViewport(newViewport: Viewport) {
-    await navigate({ search: { mode, viewport: newViewport }, replace: true });
-  }
-
-  const pageId = useRouteContext({
-    from: "/_authenticated/_authorized/pages/$pageId",
-    select: (ctx) => ctx.pageId,
-  });
-
-  const { data: page } = useSuspenseQuery({
-    ...pageQueries.getById(pageId),
-    select: (data) => ({ path: data.path }),
-  });
-
-  const previewUrl = `${env.VITE_SHOP_URL}${page.path}?draftId=${draftId}`;
-
-  return {
-    content,
-    setContent,
-    mode,
-    viewport,
-    setMode,
-    setViewport,
-    previewUrl,
-  };
-}
-```
-
-This hook reads as a clear narrative: get the draft ID, select only the two fields we need from the draft, set up autosave, read search params, wire up navigation callbacks, compute the preview URL. Every query uses `select` to pull only what this specific component needs. The return value is a flat set of named primitives and callbacks — no raw query objects, no large data structures.
-
-### What to avoid: shared "kitchen sink" hooks
-
-Do not build shared hooks that return large objects for many consumers to pick from:
-
-```tsx
-// ❌ WRONG — centralizes too much, returns more than any one consumer needs
-function useCart() {
-  const cartQuery = useSuspenseQuery(cartQueries.detail(cartId));
-  return {
-    cart: cartQuery.data, // entire cart object
-    cartQuantity: cartQuery.data.totalQuantity,
-    cartQuery, // raw query object leaked
-  };
-}
-```
-
-Instead, each component that needs cart data should have its own hook (or inline query) that selects only what it needs. The query cache deduplicates the underlying fetch, so multiple components hitting the same query key with different `select` functions cost nothing. See the `data-and-state` reference for details.
-
-## Rules of Thumb
-
-- **Route files**: Under ~100 lines. All route-level configuration (search params, loader, beforeLoad, head, meta, error/pending components, static data, etc.) must be defined inline in the route file — never in a separate config file that gets imported. The route file should read like a self-contained table of contents: configuration at the top, then a layout component that composes feature components.
-- **Components**: If a component exceeds ~80 lines or handles more than one distinct UI concern, split it.
-- **Hooks**: If a hook exceeds ~70 lines, extract sub-hooks. Co-located hooks should be specific to their component and return only what that component uses — never raw query objects or large data structures.
-- **Business logic in components**: Small inline handlers (a couple of lines) are fine. Anything more substantial should be extracted into a hook or utility function so the component stays focused on rendering.
diff --git a/.agents/skills/react/references/data-and-state.md b/.agents/skills/react/references/data-and-state.md
deleted file mode 100644
index e0f09975..00000000
--- a/.agents/skills/react/references/data-and-state.md
+++ /dev/null
@@ -1,419 +0,0 @@
-# Data and State
-
-## Overview
-
-TanStack Query is both the data-fetching layer and the primary state management solution for server data. Most components should get their state by querying data directly via `useSuspenseQuery` rather than hoisting it into stores or drilling it through props. Rostra stores are reserved for state that lives outside the data-fetching lifecycle — form inputs, theme, auth. Each component should pair with a co-located hook that owns all business logic; the component itself is a thin renderer.
-
-## The Component + Hook Pattern
-
-The default architecture for any component that consumes data or performs actions is: one exported component and one unexported co-located hook in the same file. The hook owns all business logic — queries, mutations, derived state, navigation. The component owns rendering.
-
-```tsx
-export function CreatePageButton() {
-  const { createPage, isCreating, isError } = useCreatePage();
-
-  return (
-    <Button
-      onClick={createPage}
-      disabled={isCreating}
-      variant={isError ? "destructive" : "default"}
-    >
-      {isCreating ? (
-        <Loader className="size-4 animate-spin" />
-      ) : isError ? (
-        <>
-          <RotateCcw className="size-4" />
-          Failed to create page, try again
-        </>
-      ) : (
-        <>
-          <Plus className="size-4" />
-          Create Page
-        </>
-      )}
-    </Button>
-  );
-}
-
-function useCreatePage() {
-  const navigate = useNavigate();
-  const pageMutations = usePageMutations();
-  const { mutate, isError } = useMutation({
-    ...pageMutations.createPage,
-    onSuccess: (data) => {
-      void navigate({
-        to: "/pages/$pageId",
-        params: { pageId: data.pageId },
-        search: {},
-      });
-    },
-  });
-  const isCreating = useIsPending(pageMutations.createPage.mutationKey);
-  return { createPage: () => mutate({}), isCreating, isError };
-}
-```
-
-The component reads like a description of UI. The hook reads like a description of behavior. When an agent looks at this file, it sees both concerns clearly separated but co-located for discoverability.
-
-The co-located hook should return only what the component actually uses — named variables and callbacks, not raw query objects or large data structures. If the component needs a quantity and a delete action, the hook returns `{ quantity, deleteItem }`, not `{ cart, cartQuery }`. This keeps the interface between hook and component tight and explicit.
-
-When a hook is reused across multiple components, extract it to a shared hooks directory. See the `composition` reference for size limits — if the co-located hook exceeds ~50 lines, decompose it into sub-hooks.
-
-## Centralized Query and Mutation Definitions
-
-All queries and mutations — whether Shopify, REST, or Convex — should be centralized into `*Queries` / `*Mutations` files using `queryOptions` and `mutationOptions` from TanStack Query. This keeps query keys, fetch logic, and mutation logic organized by feature rather than scattered across components.
-
-### Non-Convex Queries (Shopify, REST, etc.)
-
-Use `queryOptions` with explicit `queryKey` and colocated `queryFn`. Build query keys hierarchically so broader invalidations work:
-
-```tsx
-import { queryOptions } from "@tanstack/react-query";
-
-export const productQueries = {
-  productByHandle: (handle: string) =>
-    queryOptions({
-      queryKey: ["product", handle],
-      queryFn: async () => {
-        const response = await shopify.request(getProduct, {
-          variables: { handle },
-        });
-        const product = response.data?.product;
-        if (!product) throw notFound();
-        return product;
-      },
-    }),
-};
-```
-
-### Convex Queries
-
-Wrap `convexQuery()` in `queryOptions()`. No explicit `queryKey` is needed — `convexQuery` generates stable query keys automatically under the hood:
-
-```tsx
-import { queryOptions } from "@tanstack/react-query";
-import { convexQuery } from "@convex-dev/react-query";
-
-import { api } from "@acme/convex/api";
-
-export const pageQueries = {
-  list: () => queryOptions({ ...convexQuery(api.pages.list, {}) }),
-  getById: (pageId: Id<"pages">) =>
-    queryOptions({ ...convexQuery(api.pages.getById, { pageId }) }),
-};
-```
-
-### Convex Mutations
-
-Wrap `useConvexMutation()` in `mutationOptions()` with an explicit `mutationKey`. Because `useConvexMutation` is a hook, these must be defined inside a hook:
-
-```tsx
-import { mutationOptions } from "@tanstack/react-query";
-import { useConvexMutation } from "@convex-dev/react-query";
-
-import { api } from "@acme/convex/api";
-
-export function usePageMutations() {
-  return {
-    createPage: mutationOptions({
-      mutationKey: ["create-page"],
-      mutationFn: useConvexMutation(api.pages.create),
-    }),
-    saveDraft: mutationOptions({
-      mutationKey: ["save-draft"],
-      mutationFn: useConvexMutation(api.pages.saveDraft),
-    }),
-  };
-}
-```
-
-### Non-Convex Mutations
-
-Follow the same `mutationOptions` pattern. Since these don't use hooks, they can be plain objects:
-
-```tsx
-export const cartMutations = {
-  lineAdd: mutationOptions({
-    mutationKey: ["cart", "mutation", "line", "add"],
-    mutationFn: async (variables: { cartId?: string; merchandiseId: string }) =>
-      addCartLineFn({ data: variables }),
-  }),
-};
-```
-
-Organize by feature: `page-queries.ts`, `cart-queries.ts`, `use-page-mutations.ts`, etc.
-
-## Route Loaders
-
-Route loaders are the entry point for data fetching. Prefetch data in the loader using `ensureQueryData` so it's already cached when the component tree mounts. Use the centralized query definitions:
-
-```tsx
-export const Route = createFileRoute("/pages")({
-  component: PagesRoute,
-  loader: async ({ context }) => {
-    await context.queryClient.ensureQueryData(pageQueries.list());
-  },
-});
-```
-
-When the loader depends on search params, declare the dependency with `loaderDeps`:
-
-```tsx
-export const Route = createFileRoute("/dashboard")({
-  component: DashboardRoute,
-  loaderDeps: ({ search }) => search,
-  loader: async ({ context, deps }) => {
-    await context.queryClient.ensureQueryData(
-      userAccessQueries.searchFirstPage(sanitizeSearch(deps.q)),
-    );
-  },
-  validateSearch: z.object({
-    q: z.string(),
-  }),
-});
-```
-
-## Consuming Data in Components
-
-After the route loader has prefetched, consume cached data with `useSuspenseQuery`. Since the loader already populated the cache, this resolves synchronously:
-
-```tsx
-const { data: pages } = useSuspenseQuery({
-  ...pageQueries.list(),
-  select: (data) =>
-    data.map((p) => ({
-      _id: p._id,
-      title: p.title,
-      path: p.path,
-    })),
-});
-```
-
-Use `select` whenever the component only needs a slice of the query result. This is covered in detail in the `performance` reference, but it bears repeating: never subscribe to an entire query result when the component only uses part of it.
-
-Pull data at the leaf component where it's needed — never drill it down from a parent.
-
-## Fine-Grained Data Hooks
-
-Prefer many small hooks that each select the minimum data one consumer needs over a single shared hook that returns a large object.
-
-The query cache already holds all the data. Any component can call `useSuspenseQuery` with the same query key and a different `select` — TanStack Query deduplicates the underlying fetch. This means there is no cost to having multiple hooks hit the same query; each one just projects a different slice.
-
-```tsx
-// ✅ CORRECT — each hook selects only what its consumer needs
-function useCartQuantity() {
-  const { data: quantity } = useSuspenseQuery({
-    ...cartQueries.detail(cartId),
-    select: (cart) => cart.totalQuantity,
-  });
-  return quantity;
-}
-
-function useCartCheckoutUrl() {
-  const { data: checkoutUrl } = useSuspenseQuery({
-    ...cartQueries.detail(cartId),
-    select: (cart) => cart.checkoutUrl,
-  });
-  return checkoutUrl;
-}
-```
-
-```tsx
-// ❌ WRONG — "kitchen sink" hook that returns a large object for many consumers
-function useCart() {
-  const cartQuery = useSuspenseQuery(cartQueries.detail(cartId));
-  return {
-    cart: cartQuery.data,        // entire cart object
-    cartQuantity: cartQuery.data.totalQuantity,
-    cartQuery,                   // raw query object leaked to consumers
-  };
-}
-```
-
-The kitchen-sink pattern creates several problems:
-
-1. **Unnecessary re-renders.** Every consumer subscribes to the entire cart, so a price change re-renders the quantity badge.
-2. **Hidden coupling.** Consumers depend on the full cart shape even when they only use one field, making refactors harder.
-3. **Opaque intent.** When reading the consuming component, you can't tell which fields it actually needs — you have to trace through the returned object.
-
-When you need data from the same query in multiple components, write a small hook per concern that selects just what that concern needs. Name the hook after the data it provides (`useCartQuantity`, `useProductTitle`), not after the query it reads from.
-
-## Do Not Prop Drill — Pull Data Where You Need It
-
-This is the single most important rule for state flow in this project. Hooks like `useSearch`, `useSuspenseQuery`, `useRouteContext`, and `useStore` exist specifically so that any component in the tree can pull data directly. **If a hook gives a component direct access to the data it needs, use the hook. Do not pass that data through props from a parent.**
-
-```tsx
-// ❌ WRONG — drilling search params through intermediaries
-function ParentRoute() {
-  const search = useSearch({ from: "/products" });
-  return <Filters sortBy={search.sortBy} />;
-}
-function Filters({ sortBy }: { sortBy: string }) {
-  return <SortControl sortBy={sortBy} />;
-}
-```
-
-```tsx
-// ✅ CORRECT — pull data at the leaf where it's needed
-function SortControl() {
-  const sortBy = useSearch({
-    from: "/products",
-    select: (s) => s.sortBy,
-  });
-  // use sortBy directly
-}
-```
-
-This applies equally to query data, route context, store state, and search params. The same data that's available via `useSearch` at the route level is available via `useSearch` in any descendant component. The same query the loader prefetched can be consumed via `useSuspenseQuery` in any descendant. There is no reason to read data at a high level and pass it down.
-
-One level of props is normal for component-specific configuration (e.g. a `variant` prop on a button). But data available via hooks should always be pulled directly at the component that needs it.
-
-## URL State
-
-TanStack Start provides strong primitives for storing state in the URL. Define search param validators per route for validated, type-safe access:
-
-```tsx
-export const Route = createFileRoute("/dashboard")({
-  component: DashboardRoute,
-  validateSearch: z.object({
-    q: z.string().optional(),
-  }),
-});
-```
-
-Any descendant component can access the params directly:
-
-```tsx
-const searchTerm = useSearch({
-  from: "/dashboard",
-  select: (search) => search.q,
-});
-```
-
-**Always use `select`** with `useSearch` so the component only re-renders when the specific param it uses changes.
-
-URL state is the right choice when you want state that:
-
-- Persists across full page refreshes
-- Is shareable via link
-- Survives if a user bookmarks the page
-
-## Mutations
-
-Mutations must always be driven by user events (clicks, form submissions, gestures). Never trigger a mutation from `useEffect`, render logic, or any other React lifecycle behavior.
-
-At the call site, spread the centralized mutation entry and add only the handlers you need:
-
-```tsx
-const addToCart = useMutation({
-  ...cartMutations.lineAdd,
-  onSuccess: (nextCart) => {
-    queryClient.setQueryData(
-      cartQueries.detail(nextCart.id).queryKey,
-      nextCart,
-    );
-  },
-});
-```
-
-For Convex mutations:
-
-```tsx
-const pageMutations = usePageMutations();
-const { mutate } = useMutation({
-  ...pageMutations.saveDraft,
-  onSuccess: () => {
-    /* ... */
-  },
-});
-```
-
-## Optimistic Updates
-
-Use optimistic updates for instant feedback on user actions. The approach differs between TanStack Query and Convex.
-
-**TanStack Query**: Cancel in-flight queries in `onMutate`, snapshot previous data, apply the optimistic change, and roll back in `onError`:
-
-```tsx
-useMutation({
-  ...cartMutations.lineUpdate,
-  onMutate: async (variables) => {
-    await queryClient.cancelQueries({
-      queryKey: cartQueries.all().queryKey,
-    });
-    const cartQueryKey = cartQueries.detail(variables.cartId).queryKey;
-    const previous = queryClient.getQueryData(cartQueryKey);
-    queryClient.setQueryData(cartQueryKey, (current) =>
-      current ? applyOptimisticCartLineUpdate(current, variables) : current,
-    );
-    return { previous };
-  },
-  onError: (_err, variables, context) => {
-    if (context?.previous) {
-      queryClient.setQueryData(
-        cartQueries.detail(variables.cartId).queryKey,
-        context.previous,
-      );
-    }
-  },
-});
-```
-
-**Convex**: Use the `.withOptimisticUpdate` API on the mutation:
-
-```tsx
-const updateAccess = useConvexMutation(
-  api.users.updateUserAccessLevel,
-).withOptimisticUpdate((localStore, args) => {
-  const results = localStore.getAllQueries(api.users.searchUsersPaginated);
-  for (const result of results) {
-    if (result.value === undefined) continue;
-    localStore.setQuery(api.users.searchUsersPaginated, result.args, {
-      ...result.value,
-      page: result.value.page.map((user) =>
-        user._id === args.userId
-          ? { ...user, accessLevel: args.accessLevel }
-          : user,
-      ),
-    });
-  }
-});
-```
-
-Prioritize optimistic updates for actions where perceived latency matters most: cart operations, toggles, and inline edits.
-
-## Rostra Stores — Non-Server State Only
-
-Rostra is for state that is **not** server data: form inputs before submission, global concerns (auth, theme), UI state shared across a subtree.
-
-```tsx
-function useInternalStore({ initial }: { initial: PageFields }) {
-  const [title, setTitle] = useState(initial.title);
-  const [path, setPath] = useState(initial.path);
-  const [content, setContent] = useState(initial.content);
-  return { title, path, content, setTitle, setPath, setContent };
-}
-
-export const { Store: PageFormStore, useStore: usePageFormStore } =
-  createStore(useInternalStore);
-```
-
-This is a legitimate use of Rostra: collecting user edits in local state before they are submitted via a mutation. The form fields live outside the data-fetching lifecycle.
-
-**If the state is server data, use a query cache instead.** Do not duplicate server data into a Rostra store. See the `rostra` skill for API details.
-
-## Loading and Error States
-
-Do **not** manually write loading spinners or error messages based on query status. TanStack Start handles this at the route level through default components configured on the router:
-
-- `defaultPendingComponent` — shown while the route loader is in flight
-- `defaultErrorComponent` — shown when the loader or component throws
-- `defaultNotFoundComponent` — shown for 404s
-
-Any route using `ensureQueryData` in its loader gets loading and error handling for free. If a specific route needs custom error handling, override it on the route definition.
-
-The only place where you should check mutation status (`isPending`, `isError`, `isSuccess`) is for mutation-driven UI feedback (disabling buttons, showing inline toasts, etc.) — never for data-loading states.
-
-## Prop Drilling
-
-Avoid prop drilling by default. Passing props one level down is normal. Passing the same data through multiple intermediary components just to reach a deep leaf is a smell — use the hooks described in the "Do Not Prop Drill" section above.
diff --git a/.agents/skills/refactor/SKILL.md b/.agents/skills/refactor/SKILL.md
deleted file mode 100644
index c622fb71..00000000
--- a/.agents/skills/refactor/SKILL.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-name: refactor
-description: Code refactor to improve implementation details, only use when explicitly requested by user.
----
-
-# Overview
-
-This skill turns "it works" code into code that is robust, maintainable, and aligned with the project's standards.
-Instead of reading every rule yourself and trying to apply them all at once, delegate to subagents, one per skill. Each subagent becomes a deep expert on its skill and evaluates the current changes entirely through that lens.
-
-## 1. Determine the scope
-
-The user may specify a scope — for example, "refactor the convex package" or "just look at the CMS app changes." When they do, pass that scope to each subagent so it only examines the relevant subset of changes.
-
-If the user does not specify a scope, the default is the entire active change set (all staged and unstaged changes across the repo).
-
-## 2. Spawn one subagent per skill
-
-Look at which files were changed and determine which skills are necessary to refactor. Once you've figured that out, spawn one subagent per skill so that that specific subagent focuses solely on that one skill. **_IMPORTANT_**: Typically, changes don't require every single skill to be used, so make sure you don't use skills that aren't relevant to the changes made.
-
-For each subagent, provide these instructions:
-
-1. **Role:** You are a senior engineer mentoring a junior teammate. You have been given a skill that describes coding standards the team has agreed on. Your job is to deeply internalize every rule in the skill, study the current changes, and produce a thorough assessment of how the code should be overhauled to fully align with these standards.
-2. **Read-only constraint:** Do NOT edit, create, or delete any files. Your only job is to read code, analyze it, and return findings.
-3. **Skill:** Read the skill file and all of its reference files carefully and completely before doing anything else.
-4. **Getting the changes:** Run `git diff` and `git diff --cached` to see the current change set. If the user specified a scope (e.g. a specific package or app), filter to only those paths — for example `git diff -- packages/convex/` or `git diff -- apps/cms/`. Also read the full contents of every changed file so you have complete context, not just the diff hunks.
-5. **What to return:** Report **every single finding** — no filtering, no prioritizing, no "I'll skip the small stuff." Every violation of the skill standards, from major architectural missteps down to the smallest style nit, must be included. Do not summarize or group findings to save space. Do not omit issues you consider minor. The main agent needs the complete, unabridged list to present to the user. Look for places where the implementation approach itself is wrong and needs to be overhauled — but also catch every small issue along the way. If the code uses the wrong patterns, the wrong architecture, the wrong abstractions - recommend ripping out the current approach and replacing it with one that properly aligns with the standards. Partial adjustments are not enough when the foundation is wrong.
-   For each finding, include:
-   - What is wrong with the current approach and why it does not satisfy the standard
-   - Where the problem is (file path and relevant code)
-   - What the correct approach looks like — described in enough detail that someone could implement it without having to re-read the skill
-   - Why this matters (what breaks, degrades, or becomes unmaintainable if left as-is)
-
-6. **If no issues are found:** Explicitly state that the current changes already satisfy the standards and no changes are needed.
-
-## 3. Synthesize findings
-
-Once all subagents have returned their findings, consolidate everything they reported. Identify overlaps, dependencies, and conflicts between findings from different skills. Do not leave out any details provided by subagents.
-
-Present the combined findings to the user as a proposed plan. Ask the user questions about how they want to proceed — which findings to act on, which to skip, and any tradeoffs between competing concerns.
-
-### Handling conflicts
-
-Different skills will sometimes recommend incompatible approaches for the same code. When this happens, do not resolve the conflict yourself. Present the conflict to the user, explain what each skill is asking for and why they are at odds, and let the user decide. Every conflict is its own question. Do not bundle multiple conflicts into a single question and do not silently pick a side.
diff --git a/.agents/skills/rostra/SKILL.md b/.agents/skills/rostra/SKILL.md
deleted file mode 100644
index 908d92e5..00000000
--- a/.agents/skills/rostra/SKILL.md
+++ /dev/null
@@ -1,136 +0,0 @@
----
-name: rostra
-description: Guides correct usage of the Rostra state management library (createStore, Store, useStore), including store scoping, selectors, optional access, prop-driven initialization, and typing. Use only when the user asks you to work with an existing rostra store or to implement a new one.
----
-
-## Overview
-
-The TL;DR is that its like React context, except with Zustand like selectors to improve performance.
-
-You define your state at a level where it can be shared with a subtree of components, and then pull it in at lower levels exactly where it's needed. It's designed to avoid prop drilling by allowing you to pull state directly into the leaf component where it is needed, even if the store component is many nodes higher in the tree. You write a React hook just like any other, but then Rostra turns it into a store component. Any child component of the store can pull in pieces of the state returned from the store using fine-grained selectors.
-
-## Core rules
-
-- `useInternalStore` is only used as an argument to `createStore`. Never call it directly from components.
-- `useStore` is the only supported read/write access path for consumers.
-- Wrap consumers in the matching `Store` provider. `useStore` throws if called outside its provider (unless `optional: true` is used).
-- Keep stores as local as possible (feature-scoped) and only lift scope when multiple siblings need the state.
-
-## Default workflow
-
-1. Decide store scope
-   - A single feature/subtree → create a local store and wrap that subtree.
-   - Cross-cutting concerns (auth, theme) → create a higher-level store and wrap the app shell.
-2. Implement the internal hook
-   - Use React state/hooks inside the internal hook.
-   - Return a plain object with state values and action functions.
-3. Create the store
-   - Call `createStore(useInternalStore)` and export its `Store` and `useStore`.
-4. Consume with selectors
-   - Select the smallest slice needed: `useStore(s => s.someValue)`.
-   - Select actions separately: `useStore(s => s.someAction)`.
-5. Add optional access only when necessary
-   - Use `useStore(selector, { optional: true })` when the provider may not be present.
-
-## Examples
-
-### Minimal store
-
-```tsx
-import { useState } from "react";
-import { createStore } from "rostra";
-
-function useInternalStore() {
-  const [count, setCount] = useState(0);
-  const increment = () => setCount((prev) => prev + 1);
-  return { count, increment };
-}
-
-export const { Store, useStore } = createStore(useInternalStore);
-```
-
-```tsx
-import { Store, useStore } from "./counter-store";
-
-export function Counter() {
-  return (
-    <Store>
-      <Value />
-      <IncrementButton />
-    </Store>
-  );
-}
-
-function Value() {
-  const count = useStore((s) => s.count);
-  return <p>Count: {count}</p>;
-}
-
-function IncrementButton() {
-  const increment = useStore((s) => s.increment);
-  return <button onClick={increment}>Increment</button>;
-}
-```
-
-### Store props (initialization)
-
-```tsx
-import { useState } from "react";
-import { createStore } from "rostra";
-
-type StoreProps = { initialCount: number };
-
-function useInternalStore({ initialCount }: StoreProps) {
-  const [count, setCount] = useState(initialCount);
-  const increment = () => setCount((prev) => prev + 1);
-  return { count, increment };
-}
-
-export const { Store, useStore } = createStore(useInternalStore);
-```
-
-```tsx
-import { Store } from "./counter-store";
-
-export function Counter() {
-  return (
-    <Store initialCount={10}>
-      <div />
-    </Store>
-  );
-}
-```
-
-### Strict typing (catch breaking changes early)
-
-Most stores can rely on inference. Reach for an explicit `StoreState` only when you intentionally want the store contract to be a checked public boundary and you want the internal hook to fail fast if that contract changes.
-
-```tsx
-import { useState } from "react";
-import { createStore } from "rostra";
-
-type StoreProps = { initialCount: number };
-type StoreState = { count: number; increment: () => void };
-
-function useInternalStore({ initialCount }: StoreProps): StoreState {
-  const [count, setCount] = useState(initialCount);
-  const increment = () => setCount((prev) => prev + 1);
-  return { count, increment };
-}
-
-export const { Store, useStore } = createStore<StoreProps, StoreState>(
-  useInternalStore,
-);
-```
-
-### Optional access (provider may not exist)
-
-```tsx
-import { useStore } from "./counter-store";
-
-export function MaybeCount() {
-  const count = useStore((s) => s.count, { optional: true });
-  if (count === undefined) return null;
-  return <p>Count: {count}</p>;
-}
-```
diff --git a/.agents/skills/shopify/SKILL.md b/.agents/skills/shopify/SKILL.md
deleted file mode 100644
index 9e37360a..00000000
--- a/.agents/skills/shopify/SKILL.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: shopify
-description: Use whenever the scope of your task touches the shopify package or its uses anywhere in the project.
----
-
-This project uses Shopify headless. `@acme/shopify` is configured so that GraphQL queries written inside the package will have TypeScript types generated for them.
-
-As you are working on any Shopify/GraphQL code in this project, make sure you STRICTLY adhere to the principles listed below. If you think there might actually be a valid use case for breaking them, pause and confirm first with the user.
-
-## Principles
-
-- Since the Shopify package generates types for the GraphQL queries written in it, you should ALWAYS write GraphQL queries inside the shopify package. Writing them directly in the app code will not result in generated types and will therefore not give you any type safety.
-- You should always rely on type inference for getting the types of the data returned from GraphQL queries. You should NEVER have to use generics or type casting on the GraphQL operations being called from the app code.
-- **AVOID AT ALL COSTS** normalizing the data returned from the GraphQL queries. You should not need to write custom functions to transform the data returned from them into a custom shape defined in the app code. You should ALWAYS rely on the types generated from the shopify package.
-
-## Required Actions
-
-After creating or modifying any GraphQL queries in the shopify package, you must always run:
-
-`pnpm --filter @acme/shopify run build`
diff --git a/.agents/skills/typescript/SKILL.md b/.agents/skills/typescript/SKILL.md
deleted file mode 100644
index 9f6b5c6b..00000000
--- a/.agents/skills/typescript/SKILL.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-name: typescript
-description: TypeScript coding standards for this project. Use when writing or modifying TypeScript files.
----
-
-# TypeScript
-
-These are the TypeScript standards for this project. Follow them when writing or modifying any TypeScript code.
-
-## Const Assertions
-
-Use `as const` to preserve exact literal types and `readonly`. This is the one acceptable use of `as` since it tightens types rather than loosening them.
-
-- Use on configuration objects, lookup maps, and any data that defines a fixed set of values.
-- Use on arrays that represent a known set of options, then derive union types: `type Status = (typeof STATUS)[number]`.
-- Prefer `as const` over manually writing literal union types when the source of truth is an array or object.
-- Pair with `satisfies` when you need both exact literal types and structural validation.
-
-```typescript
-const STATUS = ["idle", "loading", "success", "error"] as const;
-type Status = (typeof STATUS)[number];
-
-const PLAN_LIMITS = {
-  free: { projects: 3, storage: 500 },
-  pro: { projects: 50, storage: 10_000 },
-} as const satisfies Record<string, Record<string, number>>;
-
-type Plan = keyof typeof PLAN_LIMITS;
-```
-
-## Early Returns
-
-- Guard against invalid or edge-case inputs at the top of the function and return/throw immediately.
-- In multi-step transformations, validate and bail out between each step rather than wrapping everything in nested conditionals.
-- This directly improves type narrowing — each early return eliminates a possibility, giving tighter types for the code that follows.
-
-## Discriminated Unions & Narrowing
-
-Model variants explicitly so the compiler forces you to handle each case.
-
-- Use a shared literal field (the discriminant) to distinguish between variants. Common discriminants: `type`, `status`, `kind`.
-- Narrow using `if`/`switch` on the discriminant, not by checking for optional field existence.
-- Avoid modeling variants as a single type with many optional fields — this forces consumers to handle impossible combinations.
-- Prefer `switch` with exhaustiveness checking when there are three or more variants. The linter enforces exhaustive `switch` statements.
-
-```typescript
-type Result =
-  | { status: "success"; data: Order }
-  | { status: "error"; error: string };
-
-function handleResult(result: Result) {
-  switch (result.status) {
-    case "success":
-      return processOrder(result.data);
-    case "error":
-      return reportError(result.error);
-  }
-}
-```
-
-## Inference Over Annotation
-
-- Never annotate a variable when the right-hand side already tells the compiler the type.
-- Function parameters are the exception — they have no value to infer from, so explicit types are expected.
-- Heavy annotations are a signal that the code structure should be rethought, not papered over with types.
-
-## Prohibited patterns
-
-- **No re-export shims.** When moving a function to a new module, update every import site to point to the new location. Never import a function into the old file and re-export it (under the same or a different name) just to avoid updating consumers. This creates indirection that makes the codebase harder to reason about and defeats the purpose of the refactor. The same applies to functions that are one line and simply just call another function. These add unnecessary complexity and should always be avoided.
diff --git a/AGENTS.md b/AGENTS.md
index 8a95560e..f15cb7d7 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -2,8 +2,7 @@
 
 ## Repository Summary
 
-- AI chat app
-- Uses turbo repo to house apps for various platforms + the convex database
+This project was initally an AI chat app, and is now being rebuilt as a decentralized, easily self-hostable messaing & email platform.
 
 ## Required Validation After Changes
 
@@ -17,8 +16,3 @@ If all of these succeed, run:
 4. `pnpm run format:fix`
 
 Then summarize changes for the user.
-
-## Preferences
-
-- Do **_NOT_** leave excessive comments when writing code. Only leave comments when
-  the code itself does not clearly explain what it does
diff --git a/LICENSE b/LICENSE
index 85cb0a66..20f08db2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,11 +1,675 @@
-Copyright 2026 Shawn Rodgers
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+                            Preamble
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+0. Definitions.
+
+"This License" refers to version 3 of the GNU General Public License.
+
+"Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+1. Source Code.
+
+The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+The Corresponding Source for a work in source code form is that
+same work.
+
+2. Basic Permissions.
+
+All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+7. Additional Terms.
+
+"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+8. Termination.
+
+You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+11. Patents.
+
+A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    Decentralized Convex federation toolkit.
+    Copyright (C) 2026 Shawn Rodgers
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+  Vera Copyright (C) 2026 Shawn Rodgers
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/LICENSE.agent b/LICENSE.agent
deleted file mode 100644
index eedc68be..00000000
--- a/LICENSE.agent
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1.  Definitions.
-
-    "License" shall mean the terms and conditions for use, reproduction,
-    and distribution as defined by Sections 1 through 9 of this document.
-
-    "Licensor" shall mean the copyright owner or entity authorized by
-    the copyright owner that is granting the License.
-
-    "Legal Entity" shall mean the union of the acting entity and all
-    other entities that control, are controlled by, or are under common
-    control with that entity. For the purposes of this definition,
-    "control" means (i) the power, direct or indirect, to cause the
-    direction or management of such entity, whether by contract or
-    otherwise, or (ii) ownership of fifty percent (50%) or more of the
-    outstanding shares, or (iii) beneficial ownership of such entity.
-
-    "You" (or "Your") shall mean an individual or Legal Entity
-    exercising permissions granted by this License.
-
-    "Source" form shall mean the preferred form for making modifications,
-    including but not limited to software source code, documentation
-    source, and configuration files.
-
-    "Object" form shall mean any form resulting from mechanical
-    transformation or translation of a Source form, including but
-    not limited to compiled object code, generated documentation,
-    and conversions to other media types.
-
-    "Work" shall mean the work of authorship, whether in Source or
-    Object form, made available under the License, as indicated by a
-    copyright notice that is included in or attached to the work
-    (an example is provided in the Appendix below).
-
-    "Derivative Works" shall mean any work, whether in Source or Object
-    form, that is based on (or derived from) the Work and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship. For the purposes
-    of this License, Derivative Works shall not include works that remain
-    separable from, or merely link (or bind by name) to the interfaces of,
-    the Work and Derivative Works thereof.
-
-    "Contribution" shall mean any work of authorship, including
-    the original version of the Work and any modifications or additions
-    to that Work or Derivative Works thereof, that is intentionally
-    submitted to Licensor for inclusion in the Work by the copyright owner
-    or by an individual or Legal Entity authorized to submit on behalf of
-    the copyright owner. For the purposes of this definition, "submitted"
-    means any form of electronic, verbal, or written communication sent
-    to the Licensor or its representatives, including but not limited to
-    communication on electronic mailing lists, source code control systems,
-    and issue tracking systems that are managed by, or on behalf of, the
-    Licensor for the purpose of discussing and improving the Work, but
-    excluding communication that is conspicuously marked or otherwise
-    designated in writing by the copyright owner as "Not a Contribution."
-
-    "Contributor" shall mean Licensor and any individual or Legal Entity
-    on behalf of whom a Contribution has been received by Licensor and
-    subsequently incorporated within the Work.
-
-2.  Grant of Copyright License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    copyright license to reproduce, prepare Derivative Works of,
-    publicly display, publicly perform, sublicense, and distribute the
-    Work and such Derivative Works in Source or Object form.
-
-3.  Grant of Patent License. Subject to the terms and conditions of
-    this License, each Contributor hereby grants to You a perpetual,
-    worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-    (except as stated in this section) patent license to make, have made,
-    use, offer to sell, sell, import, and otherwise transfer the Work,
-    where such license applies only to those patent claims licensable
-    by such Contributor that are necessarily infringed by their
-    Contribution(s) alone or by combination of their Contribution(s)
-    with the Work to which such Contribution(s) was submitted. If You
-    institute patent litigation against any entity (including a
-    cross-claim or counterclaim in a lawsuit) alleging that the Work
-    or a Contribution incorporated within the Work constitutes direct
-    or contributory patent infringement, then any patent licenses
-    granted to You under this License for that Work shall terminate
-    as of the date such litigation is filed.
-
-4.  Redistribution. You may reproduce and distribute copies of the
-    Work or Derivative Works thereof in any medium, with or without
-    modifications, and in Source or Object form, provided that You
-    meet the following conditions:
-
-    (a) You must give any other recipients of the Work or
-    Derivative Works a copy of this License; and
-
-    (b) You must cause any modified files to carry prominent notices
-    stating that You changed the files; and
-
-    (c) You must retain, in the Source form of any Derivative Works
-    that You distribute, all copyright, patent, trademark, and
-    attribution notices from the Source form of the Work,
-    excluding those notices that do not pertain to any part of
-    the Derivative Works; and
-
-    (d) If the Work includes a "NOTICE" text file as part of its
-    distribution, then any Derivative Works that You distribute must
-    include a readable copy of the attribution notices contained
-    within such NOTICE file, excluding those notices that do not
-    pertain to any part of the Derivative Works, in at least one
-    of the following places: within a NOTICE text file distributed
-    as part of the Derivative Works; within the Source form or
-    documentation, if provided along with the Derivative Works; or,
-    within a display generated by the Derivative Works, if and
-    wherever such third-party notices normally appear. The contents
-    of the NOTICE file are for informational purposes only and
-    do not modify the License. You may add Your own attribution
-    notices within Derivative Works that You distribute, alongside
-    or as an addendum to the NOTICE text from the Work, provided
-    that such additional attribution notices cannot be construed
-    as modifying the License.
-
-    You may add Your own copyright statement to Your modifications and
-    may provide additional or different license terms and conditions
-    for use, reproduction, or distribution of Your modifications, or
-    for any such Derivative Works as a whole, provided Your use,
-    reproduction, and distribution of the Work otherwise complies with
-    the conditions stated in this License.
-
-5.  Submission of Contributions. Unless You explicitly state otherwise,
-    any Contribution intentionally submitted for inclusion in the Work
-    by You to the Licensor shall be under the terms and conditions of
-    this License, without any additional terms or conditions.
-    Notwithstanding the above, nothing herein shall supersede or modify
-    the terms of any separate license agreement you may have executed
-    with Licensor regarding such Contributions.
-
-6.  Trademarks. This License does not grant permission to use the trade
-    names, trademarks, service marks, or product names of the Licensor,
-    except as required for reasonable and customary use in describing the
-    origin of the Work and reproducing the content of the NOTICE file.
-
-7.  Disclaimer of Warranty. Unless required by applicable law or
-    agreed to in writing, Licensor provides the Work (and each
-    Contributor provides its Contributions) on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-    implied, including, without limitation, any warranties or conditions
-    of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-    PARTICULAR PURPOSE. You are solely responsible for determining the
-    appropriateness of using or redistributing the Work and assume any
-    risks associated with Your exercise of permissions under this License.
-
-8.  Limitation of Liability. In no event and under no legal theory,
-    whether in tort (including negligence), contract, or otherwise,
-    unless required by applicable law (such as deliberate and grossly
-    negligent acts) or agreed to in writing, shall any Contributor be
-    liable to You for damages, including any direct, indirect, special,
-    incidental, or consequential damages of any character arising as a
-    result of this License or out of the use or inability to use the
-    Work (including but not limited to damages for loss of goodwill,
-    work stoppage, computer failure or malfunction, or any and all
-    other commercial damages or losses), even if such Contributor
-    has been advised of the possibility of such damages.
-
-9.  Accepting Warranty or Additional Liability. While redistributing
-    the Work or Derivative Works thereof, You may choose to offer,
-    and charge a fee for, acceptance of support, warranty, indemnity,
-    or other liability obligations and/or rights consistent with this
-    License. However, in accepting such obligations, You may act only
-    on Your own behalf and on Your sole responsibility, not on behalf
-    of any other Contributor, and only if You agree to indemnify,
-    defend, and hold each Contributor harmless for any liability
-    incurred by, or claims asserted against, such Contributor by reason
-    of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/LICENSE.t3 b/LICENSE.t3-turbo
similarity index 100%
rename from LICENSE.t3
rename to LICENSE.t3-turbo

From 79cccd002d599c85ef8a4b27f8be973057d9900d Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Sun, 2 Aug 2026 11:37:01 -0400
Subject: [PATCH 03/17] legacy readme

---
 legacy/README.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 legacy/README.md

diff --git a/legacy/README.md b/legacy/README.md
new file mode 100644
index 00000000..580321e3
--- /dev/null
+++ b/legacy/README.md
@@ -0,0 +1,5 @@
+Vera was originally an AI chat app. Basically chatgpt.com except you can use any model. I'm not pivoting it away from AI and towards being a communications app. The long term goal is to be a decentralized, easily self-hostable messaging & email platform.
+
+This legacy folder contains the old web app and db that were used for the AI chat app. They may serve as a reference for certain features that I want to include in the new Vera, but they are intentionally put off to the side so that they are not integrated into the new project in any physical way.
+
+I repeat, the code in this folder is meant to serve solely as a **REFERENCE**. New things should not be built in here.

From 0572e5e54a316d5ae7d6842a54519e590bbbc29c Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Sun, 9 Aug 2026 22:39:50 -0400
Subject: [PATCH 04/17] Add decentralized PDS accounts and authenticated
 messaging

- Add reusable accounts and messages Components
- Discover PDS homes from Vera addresses
- Authenticate federated reads and mutations
---
 README.md                                     |  12 +-
 apps/web/README.md                            |  41 ++-
 apps/web/package.json                         |   8 +-
 apps/web/src/auth-client.ts                   |   4 +-
 apps/web/src/cloud/AuthForm.tsx               |   7 +-
 apps/web/src/cloud/AuthenticatedSession.tsx   |  80 +++-
 apps/web/src/cloud/ChatRoom.tsx               |   7 +-
 apps/web/src/cloud/ChatSidebar.tsx            |   8 +-
 apps/web/src/cloud/ConnectionDiagnostics.tsx  |   2 +-
 apps/web/src/cloud/ConversationHeader.tsx     |   9 +-
 apps/web/src/cloud/HomeServerSession.tsx      |   7 +-
 apps/web/src/cloud/Message.tsx                |   9 +-
 apps/web/src/cloud/MessageComposer.tsx        |   4 +-
 apps/web/src/cloud/MessageList.tsx            |  26 +-
 apps/web/src/cloud/SessionGate.tsx            |   1 +
 apps/web/src/cloud/use-chat-room.ts           |  22 +-
 apps/web/src/federation-auth.ts               | 146 ++++++++
 apps/web/src/live/config.ts                   |  40 +-
 apps/web/src/live/queries.ts                  |  32 +-
 apps/web/src/routes/index.tsx                 |  19 +-
 apps/web/src/server-picker/ServerPicker.tsx   |  94 +++--
 apps/web/src/styles.css                       |  24 +-
 apps/web/vite.config.ts                       |   5 +
 .../decentralized-convex-accounts/README.md   |  11 +
 .../_generated/api.ts                         |  54 +++
 .../_generated/component.ts                   |  91 +++++
 .../_generated/dataModel.ts                   |  60 +++
 .../_generated/server.ts                      | 156 ++++++++
 .../convex.config.ts                          |   5 +
 .../dispatcher.ts                             |  77 ++++
 .../eslint.config.ts                          |   5 +
 .../decentralized-convex-accounts/index.ts    |   2 +
 .../package.json                              |  33 ++
 .../decentralized-convex-accounts/protocol.ts |  38 ++
 .../decentralized-convex-accounts/schema.ts   |  10 +
 .../tsconfig.json                             |   9 +
 .../decentralized-convex-address/package.json |   3 -
 .../src/address.ts                            |   4 +-
 .../src/discovery.test.ts                     | 143 ++++++++
 .../src/discovery.ts                          | 218 +++++++++++
 .../decentralized-convex-address/src/index.ts |  13 +
 .../decentralized-convex-client/package.json  |   2 +
 .../src/client.test.ts                        |  60 ++-
 .../decentralized-convex-client/src/client.ts |  58 +++
 .../src/connection.ts                         |   8 +
 .../decentralized-convex-client/src/index.ts  |  28 ++
 .../src/pds-observer.ts                       |  87 +++++
 .../src/pds.test.ts                           |  85 +++++
 .../decentralized-convex-client/src/pds.ts    | 341 ++++++++++++++++++
 .../src/pds.type-test.ts                      |  68 ++++
 .../decentralized-convex-messages/README.md   |  11 +
 .../_generated/api.ts                         |  54 +++
 .../_generated/component.ts                   |  87 +++++
 .../_generated/dataModel.ts                   |  60 +++
 .../_generated/server.ts                      | 156 ++++++++
 .../convex.config.ts                          |   5 +
 .../dispatcher.ts                             |  90 +++++
 .../eslint.config.ts                          |   5 +
 .../decentralized-convex-messages/index.ts    |   2 +
 .../package.json                              |  33 ++
 .../decentralized-convex-messages/protocol.ts |  38 ++
 .../decentralized-convex-messages/schema.ts   |  15 +
 .../tsconfig.json                             |   9 +
 .../decentralized-convex-plugin/README.md     | 104 ++++++
 .../eslint.config.ts                          |   5 +
 .../decentralized-convex-plugin/package.json  |  31 ++
 .../src/capability.ts                         |  46 +++
 .../src/compose.ts                            | 185 ++++++++++
 .../decentralized-convex-plugin/src/graph.ts  | 263 ++++++++++++++
 .../decentralized-convex-plugin/src/index.ts  |  46 +++
 .../src/operations.test.ts                    |  47 +++
 .../src/operations.ts                         | 131 +++++++
 .../src/plugin.test.ts                        | 270 ++++++++++++++
 .../decentralized-convex-plugin/src/plugin.ts |  66 ++++
 .../src/plugin.type-test.ts                   |  68 ++++
 .../decentralized-convex-plugin/tsconfig.json |   9 +
 .../decentralized-convex-server/package.json  |   1 +
 .../src/descriptor.test.ts                    |   4 +
 .../src/descriptor.ts                         |   2 +
 .../src/dispatcher.ts                         | 269 ++++++++++++++
 .../decentralized-convex-server/src/index.ts  |   6 +
 .../src/index.ts                              |   9 +-
 .../src/options.ts                            |  20 +
 .../src/useFederatedPdsQuery.ts               | 100 +++++
 pnpm-lock.yaml                                | 131 ++++++-
 pnpm-workspace.yaml                           |   1 +
 services/backend/README.md                    |  32 +-
 services/backend/convex/_generated/api.d.ts   |  16 +-
 .../backend/convex/_generated/dataModel.d.ts  |   3 +-
 .../backend/convex/_generated/server.d.ts     |  11 +-
 services/backend/convex/_generated/server.js  |   4 +-
 services/backend/convex/auth.ts               |  17 +-
 services/backend/convex/convex.config.ts      |   4 +
 services/backend/convex/federationAuth.ts     | 180 +++++++++
 services/backend/convex/http.ts               |   7 +-
 services/backend/convex/messages.ts           |  59 ---
 services/backend/convex/pds.ts                |  10 +
 services/backend/convex/schema.ts             |  17 +-
 services/backend/package.json                 |   7 +-
 99 files changed, 4763 insertions(+), 259 deletions(-)
 create mode 100644 apps/web/src/federation-auth.ts
 create mode 100644 packages/decentralized-convex-accounts/README.md
 create mode 100644 packages/decentralized-convex-accounts/_generated/api.ts
 create mode 100644 packages/decentralized-convex-accounts/_generated/component.ts
 create mode 100644 packages/decentralized-convex-accounts/_generated/dataModel.ts
 create mode 100644 packages/decentralized-convex-accounts/_generated/server.ts
 create mode 100644 packages/decentralized-convex-accounts/convex.config.ts
 create mode 100644 packages/decentralized-convex-accounts/dispatcher.ts
 create mode 100644 packages/decentralized-convex-accounts/eslint.config.ts
 create mode 100644 packages/decentralized-convex-accounts/index.ts
 create mode 100644 packages/decentralized-convex-accounts/package.json
 create mode 100644 packages/decentralized-convex-accounts/protocol.ts
 create mode 100644 packages/decentralized-convex-accounts/schema.ts
 create mode 100644 packages/decentralized-convex-accounts/tsconfig.json
 create mode 100644 packages/decentralized-convex-address/src/discovery.test.ts
 create mode 100644 packages/decentralized-convex-address/src/discovery.ts
 create mode 100644 packages/decentralized-convex-client/src/pds-observer.ts
 create mode 100644 packages/decentralized-convex-client/src/pds.test.ts
 create mode 100644 packages/decentralized-convex-client/src/pds.ts
 create mode 100644 packages/decentralized-convex-client/src/pds.type-test.ts
 create mode 100644 packages/decentralized-convex-messages/README.md
 create mode 100644 packages/decentralized-convex-messages/_generated/api.ts
 create mode 100644 packages/decentralized-convex-messages/_generated/component.ts
 create mode 100644 packages/decentralized-convex-messages/_generated/dataModel.ts
 create mode 100644 packages/decentralized-convex-messages/_generated/server.ts
 create mode 100644 packages/decentralized-convex-messages/convex.config.ts
 create mode 100644 packages/decentralized-convex-messages/dispatcher.ts
 create mode 100644 packages/decentralized-convex-messages/eslint.config.ts
 create mode 100644 packages/decentralized-convex-messages/index.ts
 create mode 100644 packages/decentralized-convex-messages/package.json
 create mode 100644 packages/decentralized-convex-messages/protocol.ts
 create mode 100644 packages/decentralized-convex-messages/schema.ts
 create mode 100644 packages/decentralized-convex-messages/tsconfig.json
 create mode 100644 packages/decentralized-convex-plugin/README.md
 create mode 100644 packages/decentralized-convex-plugin/eslint.config.ts
 create mode 100644 packages/decentralized-convex-plugin/package.json
 create mode 100644 packages/decentralized-convex-plugin/src/capability.ts
 create mode 100644 packages/decentralized-convex-plugin/src/compose.ts
 create mode 100644 packages/decentralized-convex-plugin/src/graph.ts
 create mode 100644 packages/decentralized-convex-plugin/src/index.ts
 create mode 100644 packages/decentralized-convex-plugin/src/operations.test.ts
 create mode 100644 packages/decentralized-convex-plugin/src/operations.ts
 create mode 100644 packages/decentralized-convex-plugin/src/plugin.test.ts
 create mode 100644 packages/decentralized-convex-plugin/src/plugin.ts
 create mode 100644 packages/decentralized-convex-plugin/src/plugin.type-test.ts
 create mode 100644 packages/decentralized-convex-plugin/tsconfig.json
 create mode 100644 packages/decentralized-convex-server/src/dispatcher.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts
 create mode 100644 services/backend/convex/federationAuth.ts
 delete mode 100644 services/backend/convex/messages.ts
 create mode 100644 services/backend/convex/pds.ts

diff --git a/README.md b/README.md
index bd0eb25f..a4f2119d 100644
--- a/README.md
+++ b/README.md
@@ -9,14 +9,16 @@ quickly.
 
 - `apps/web` — the TanStack Start Vera client
 - `services/backend` — the Convex backend deployed to each Vera server
-- `packages/decentralized-convex-*` — reusable federation packages
+- `packages/decentralized-convex-accounts` — reusable PDS account profiles
+- `packages/decentralized-convex-messages` — reusable authenticated messaging
+- `packages/decentralized-convex-*` — shared protocols, routing, and clients
 - `shared` — private code shared by Vera workspace projects
 - `deps` — source dependencies that Vera may need to maintain directly
 - `legacy` — the archived centralized Vera application
 
-The standalone decentralized-convex repository remains intact as a milestone.
-During incubation, changes are developed and exercised here without an npm
-publish/install cycle.
+The active backend consumes the reusable Components through their workspace
+package exports exactly as an external PDS would. Vera-specific code remains in
+the app and service folders; the Components do not import Vera.
 
 ## Development
 
@@ -27,5 +29,5 @@ pnpm install
 pnpm --filter @vera/web dev
 ```
 
-The web app runs at `http://localhost:5173`. Copy the checked-in environment
+The web app runs at `https://www.vera.localhost`. Copy the checked-in environment
 examples before connecting different Convex deployments.
diff --git a/apps/web/README.md b/apps/web/README.md
index f5a20dee..bfdbb703 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -1,31 +1,36 @@
 # Vera web
 
-A TanStack Start messaging client that reads one conversation across independent
-Convex deployments.
+A TanStack Start messaging client that reads one private conversation across
+independent Convex PDS deployments.
 
 ```sh
 pnpm --filter @vera/web dev
 ```
 
-Open `http://localhost:5173` and:
+Open `https://www.vera.localhost` and:
 
-1. Choose a Convex deployment and create a username and password.
-2. Open a second tab.
-3. Choose the other deployment and create another account.
-4. Send messages in either tab.
+1. Enter a full Vera address such as `alice@a.vera.chat`.
+2. Create or sign into that account on its discovered home PDS.
+3. Send messages. Vera reads the conversation from both development PDSs with
+   the one home login.
 
 Each signup and outgoing message is stored only on the selected home
-deployment. Both tabs run the same federated query against both deployments and
-combine the results through TanStack Query.
+deployment. Each home keeps its own isolated Better Auth and Messages Component
+data. The home PDS issues a short-lived, destination-bound identity proof; the
+other PDS verifies it through discovery and returns a local Convex credential.
+The client opens an authenticated subscription to each home and reconciles both
+results through TanStack Query.
 
-The account address is derived from the selected deployment, such as
-`alice@your-a-deployment.convex.cloud`. The user chooses only `alice`; the
-server owns the domain. Better Auth is used by this example, not required by the
-decentralized-convex packages.
+The account address uses the PDS's public account domain, never its internal
+`convex.cloud` transport hostname. Better Auth is Vera's current host adapter,
+not a dependency of the reusable decentralized Convex packages.
 
-The checked-in `.env.example` documents the required deployment URLs. Deploy
+The checked-in `.env.example` documents the deployment configuration. Deploy
 the same `convex/` backend to each target and set `SITE_URL` and
-`FEDERATION_DOMAIN` on each deployment. `FEDERATION_DOMAIN` must be the
-deployment's actual `.convex.cloud` hostname or its configured custom hostname.
-Reads are intentionally public in this auth-development room; portable
-private-read authorization is not implemented.
+`FEDERATION_DOMAIN` on each deployment. Publish the single `_pds` TXT discovery
+record described in the backend README. Free and Pro Convex deployments use the
+same discovery flow; Convex custom domains are optional.
+
+The web app imports only the product-agnostic Messages protocol. It does not
+import either deployment's generated message API; both homes expose the same
+canonical `pds:dispatchQuery` and `pds:dispatchMutation` functions.
diff --git a/apps/web/package.json b/apps/web/package.json
index 07250b80..c78d48f9 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -9,7 +9,8 @@
   "scripts": {
     "build": "vite build",
     "clean": "git clean -xdf .cache .turbo .output node_modules",
-    "dev": "vite --port 5173 --strictPort",
+    "dev": "portless",
+    "dev:app": "vite",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "format:fix": "prettier --write . --ignore-path ../../.gitignore",
     "generate-routes": "tsr generate",
@@ -20,6 +21,7 @@
   "dependencies": {
     "@convex-dev/better-auth": "0.12.5",
     "@decentralized-convex/client": "workspace:*",
+    "@decentralized-convex/messages": "workspace:*",
     "@decentralized-convex/react": "workspace:*",
     "@decentralized-convex/tanstack-query": "workspace:*",
     "@tanstack/react-query": "catalog:",
@@ -46,5 +48,9 @@
     "typescript": "catalog:",
     "vite": "catalog:"
   },
+  "portless": {
+    "name": "www.vera",
+    "script": "dev:app"
+  },
   "prettier": "@acme/prettier-config"
 }
diff --git a/apps/web/src/auth-client.ts b/apps/web/src/auth-client.ts
index e9d83a83..3f6fb0ad 100644
--- a/apps/web/src/auth-client.ts
+++ b/apps/web/src/auth-client.ts
@@ -4,10 +4,10 @@ import {
 } from "@convex-dev/better-auth/client/plugins";
 import { createAuthClient } from "better-auth/react";
 
-export function createHomeAuthClient(siteUrl: string) {
+export function createHomeAuthClient(siteUrl: string, storagePrefix: string) {
   return createAuthClient({
     baseURL: siteUrl,
-    plugins: [convexClient(), crossDomainClient()],
+    plugins: [convexClient(), crossDomainClient({ storagePrefix })],
   });
 }
 
diff --git a/apps/web/src/cloud/AuthForm.tsx b/apps/web/src/cloud/AuthForm.tsx
index 6e2cac92..944ba54f 100644
--- a/apps/web/src/cloud/AuthForm.tsx
+++ b/apps/web/src/cloud/AuthForm.tsx
@@ -7,6 +7,7 @@ import type { HomeServer } from "../live/config.ts";
 interface AuthFormProps {
   authClient: HomeAuthClient;
   home: HomeServer;
+  initialUsername: string;
   onChooseServer: () => void;
 }
 
@@ -22,7 +23,7 @@ export function AuthForm(props: AuthFormProps) {
           onClick={props.onChooseServer}
           type="button"
         >
-          ← Servers
+          ← Back
         </button>
         <header className="account-header">
           <span className="app-icon" aria-hidden="true">
@@ -91,12 +92,12 @@ export function AuthForm(props: AuthFormProps) {
   );
 }
 
-function useAuthForm({ authClient, home }: AuthFormProps) {
+function useAuthForm({ authClient, home, initialUsername }: AuthFormProps) {
   const [error, setError] = useState<string>();
   const [mode, setMode] = useState<"sign-in" | "sign-up">("sign-up");
   const [password, setPassword] = useState("");
   const [submitting, setSubmitting] = useState(false);
-  const [username, setUsername] = useState("");
+  const [username, setUsername] = useState(initialUsername);
 
   async function submit(event: FormEvent<HTMLFormElement>) {
     event.preventDefault();
diff --git a/apps/web/src/cloud/AuthenticatedSession.tsx b/apps/web/src/cloud/AuthenticatedSession.tsx
index 13b8d84b..693d9c15 100644
--- a/apps/web/src/cloud/AuthenticatedSession.tsx
+++ b/apps/web/src/cloud/AuthenticatedSession.tsx
@@ -1,5 +1,8 @@
 import { useEffect, useState } from "react";
-import { DecentralizedConvexClient } from "@decentralized-convex/client";
+import {
+  DecentralizedConvexClient,
+  discoverPds,
+} from "@decentralized-convex/client";
 import {
   DecentralizedConvexProvider,
   useQuery,
@@ -8,6 +11,8 @@ import { api } from "@vera/backend/api";
 
 import type { HomeAuthClient } from "../auth-client.ts";
 import type { HomeServer } from "../live/config.ts";
+import { createFederationAuthTokenFetcher } from "../federation-auth.ts";
+import { conversation, homeFromDiscovery } from "../live/config.ts";
 import { ChatRoom } from "./ChatRoom.tsx";
 import { ServerLoading } from "./ServerLoading.tsx";
 
@@ -19,15 +24,34 @@ interface AuthenticatedSessionProps {
 
 export function AuthenticatedSession(props: AuthenticatedSessionProps) {
   const user = useQuery(api.auth.currentUser);
-  const client = useFederationClient(props.authClient, props.home);
+  const federation = useFederationClient(props.authClient, props.home);
+
+  if (federation !== undefined && "error" in federation) {
+    return (
+      <main className="account-shell">
+        <section className="account-panel auth-panel">
+          <h1>Could not connect to the conversation</h1>
+          <p className="auth-error">{federation.error.message}</p>
+          <button
+            className="primary-button"
+            onClick={props.onChooseServer}
+            type="button"
+          >
+            Back
+          </button>
+        </section>
+      </main>
+    );
+  }
 
-  if (user === undefined || user === null || client === undefined) {
+  if (user === undefined || user === null || federation === undefined) {
     return <ServerLoading home={props.home} />;
   }
 
   return (
-    <DecentralizedConvexProvider client={client}>
+    <DecentralizedConvexProvider client={federation.client}>
       <ChatRoom
+        conversationHomes={federation.homes}
         home={props.home}
         onChooseServer={props.onChooseServer}
         onSignOut={() => props.authClient.signOut()}
@@ -38,27 +62,45 @@ export function AuthenticatedSession(props: AuthenticatedSessionProps) {
 }
 
 function useFederationClient(authClient: HomeAuthClient, home: HomeServer) {
-  const [client, setClient] = useState<DecentralizedConvexClient>();
+  const [federation, setFederation] = useState<
+    | { client: DecentralizedConvexClient; homes: readonly HomeServer[] }
+    | { error: Error }
+  >();
 
   useEffect(() => {
     let active = true;
-    const nextClient = new DecentralizedConvexClient({
-      getAuthToken: async ({ url }) => {
-        if (url !== home.convexUrl) return null;
-        const token = await authClient.convex.token({
-          fetchOptions: { throw: false },
+    let nextClient: DecentralizedConvexClient | undefined;
+    void Promise.all(
+      conversation.participantDomains.map(async (domain) =>
+        domain === home.domain
+          ? home
+          : homeFromDiscovery(await discoverPds(domain)),
+      ),
+    )
+      .then((homes) => {
+        if (!active) return;
+        const client = new DecentralizedConvexClient({
+          getAuthToken: createFederationAuthTokenFetcher({
+            authClient,
+            home,
+            homes,
+          }),
+        });
+        nextClient = client;
+        setFederation({ client, homes });
+      })
+      .catch((cause: unknown) => {
+        if (!active) return;
+        setFederation({
+          error:
+            cause instanceof Error ? cause : new Error("PDS discovery failed"),
         });
-        return token.data?.token ?? null;
-      },
-    });
-    queueMicrotask(() => {
-      if (active) setClient(nextClient);
-    });
+      });
     return () => {
       active = false;
-      void nextClient.close();
+      if (nextClient !== undefined) void nextClient.close();
     };
-  }, [authClient, home.convexUrl]);
+  }, [authClient, home]);
 
-  return client;
+  return federation;
 }
diff --git a/apps/web/src/cloud/ChatRoom.tsx b/apps/web/src/cloud/ChatRoom.tsx
index 999016b3..a05eb08c 100644
--- a/apps/web/src/cloud/ChatRoom.tsx
+++ b/apps/web/src/cloud/ChatRoom.tsx
@@ -10,6 +10,7 @@ interface CurrentUser {
 }
 
 interface ChatRoomProps {
+  conversationHomes: readonly HomeServer[];
   home: HomeServer;
   onChooseServer: () => void;
   onSignOut: () => Promise<unknown>;
@@ -17,7 +18,11 @@ interface ChatRoomProps {
 }
 
 export function ChatRoom(props: ChatRoomProps) {
-  const chat = useChatRoom({ home: props.home, user: props.user });
+  const chat = useChatRoom({
+    homes: props.conversationHomes,
+    home: props.home,
+    user: props.user,
+  });
 
   return (
     <main className="chat-app">
diff --git a/apps/web/src/cloud/ChatSidebar.tsx b/apps/web/src/cloud/ChatSidebar.tsx
index 3a10096d..c67b6b38 100644
--- a/apps/web/src/cloud/ChatSidebar.tsx
+++ b/apps/web/src/cloud/ChatSidebar.tsx
@@ -25,10 +25,10 @@ export function ChatSidebar({
           <small>Federated messaging</small>
         </div>
       </div>
-      <nav className="room-list" aria-label="Rooms">
-        <span>Rooms</span>
+      <nav className="room-list" aria-label="Conversations">
+        <span>Conversations</span>
         <button aria-current="page" type="button">
-          <span>#</span> general
+          <span>↔</span> Test conversation
         </button>
       </nav>
       <div className="sidebar-account">
@@ -41,7 +41,7 @@ export function ChatSidebar({
           <summary aria-label="Account options">•••</summary>
           <div>
             <button onClick={onChooseServer} type="button">
-              Change server
+              Change account
             </button>
             <button onClick={() => void onSignOut()} type="button">
               Sign out
diff --git a/apps/web/src/cloud/ConnectionDiagnostics.tsx b/apps/web/src/cloud/ConnectionDiagnostics.tsx
index dccb91f2..3c6c194a 100644
--- a/apps/web/src/cloud/ConnectionDiagnostics.tsx
+++ b/apps/web/src/cloud/ConnectionDiagnostics.tsx
@@ -35,7 +35,7 @@ export function ConnectionDiagnostics({
           </div>
           <div>
             <dt>Remote reads</dt>
-            <dd>Public during federation development</dd>
+            <dd>Authenticated per home server</dd>
           </div>
         </dl>
       </div>
diff --git a/apps/web/src/cloud/ConversationHeader.tsx b/apps/web/src/cloud/ConversationHeader.tsx
index ee24ad95..67c3c730 100644
--- a/apps/web/src/cloud/ConversationHeader.tsx
+++ b/apps/web/src/cloud/ConversationHeader.tsx
@@ -19,12 +19,17 @@ export function ConversationHeader({
 }: ConversationHeaderProps) {
   const { sources, status } = messages.federation;
   const live = sources.filter((source) => source.status === "live").length;
+  const complete = live === sources.length;
 
   return (
     <header className="channel-header">
       <div>
-        <h1># general</h1>
-        <p>Messages from every participant's home server</p>
+        <h1>Test conversation</h1>
+        <p>
+          {complete
+            ? "Messages from every participant's home server"
+            : `Incomplete history — ${live} of ${sources.length} homes connected`}
+        </p>
       </div>
       <div className="channel-actions">
         <span className="connection-summary" data-status={status}>
diff --git a/apps/web/src/cloud/HomeServerSession.tsx b/apps/web/src/cloud/HomeServerSession.tsx
index a3f4e2ce..a46b30fa 100644
--- a/apps/web/src/cloud/HomeServerSession.tsx
+++ b/apps/web/src/cloud/HomeServerSession.tsx
@@ -9,14 +9,18 @@ import { SessionGate } from "./SessionGate.tsx";
 
 interface HomeServerSessionProps {
   home: HomeServer;
+  initialUsername: string;
   onChooseServer: () => void;
 }
 
 export function HomeServerSession({
   home,
+  initialUsername,
   onChooseServer,
 }: HomeServerSessionProps) {
-  const [authClient] = useState(() => createHomeAuthClient(home.siteUrl));
+  const [authClient] = useState(() =>
+    createHomeAuthClient(home.siteUrl, `vera-${home.id}`),
+  );
   const [convex] = useState(
     () => new ConvexReactClient(home.convexUrl, { expectAuth: true }),
   );
@@ -29,6 +33,7 @@ export function HomeServerSession({
       <SessionGate
         authClient={authClient}
         home={home}
+        initialUsername={initialUsername}
         onChooseServer={onChooseServer}
       />
     </ConvexBetterAuthProvider>
diff --git a/apps/web/src/cloud/Message.tsx b/apps/web/src/cloud/Message.tsx
index da5f4b38..7e1c09bf 100644
--- a/apps/web/src/cloud/Message.tsx
+++ b/apps/web/src/cloud/Message.tsx
@@ -2,13 +2,16 @@ import type { ChatMessage } from "../live/queries.ts";
 import { ActorAvatar, actorUsername } from "./actor.tsx";
 
 export function Message({ message }: { message: ChatMessage }) {
+  const domain = message.authorId.split("@")[1] ?? message.authorId;
   return (
     <article className="message">
-      <ActorAvatar actor={message.author} />
+      <ActorAvatar actor={message.authorId} />
       <div>
         <header>
-          <strong>{actorUsername(message.author)}</strong>
-          <span>@{message.origin}</span>
+          <strong>
+            {message.authorName || actorUsername(message.authorId)}
+          </strong>
+          <span>@{domain}</span>
           <time dateTime={new Date(message.sentAt).toISOString()}>
             {formatTime(message.sentAt)}
           </time>
diff --git a/apps/web/src/cloud/MessageComposer.tsx b/apps/web/src/cloud/MessageComposer.tsx
index c6eb0ac1..eb57e58b 100644
--- a/apps/web/src/cloud/MessageComposer.tsx
+++ b/apps/web/src/cloud/MessageComposer.tsx
@@ -18,7 +18,7 @@ export function MessageComposer({
   return (
     <form className="composer" onSubmit={(event) => void submit(event)}>
       <label>
-        <span className="sr-only">Message #general</span>
+        <span className="sr-only">Message conversation</span>
         <textarea
           maxLength={4_000}
           onChange={(event) => setDraft(event.target.value)}
@@ -28,7 +28,7 @@ export function MessageComposer({
               event.currentTarget.form?.requestSubmit();
             }
           }}
-          placeholder="Message #general"
+          placeholder="Write a message"
           rows={1}
           value={draft}
         />
diff --git a/apps/web/src/cloud/MessageList.tsx b/apps/web/src/cloud/MessageList.tsx
index 77bda0c5..10a4b569 100644
--- a/apps/web/src/cloud/MessageList.tsx
+++ b/apps/web/src/cloud/MessageList.tsx
@@ -4,12 +4,34 @@ import { Message } from "./Message.tsx";
 
 interface MessageListProps {
   home: HomeServer;
-  messages: { data?: readonly ChatMessage[]; isPending: boolean };
+  messages: {
+    data?: readonly ChatMessage[];
+    federation: {
+      sources: readonly { status: string }[];
+      status: string;
+    };
+    isPending: boolean;
+  };
 }
 
 export function MessageList({ home, messages }: MessageListProps) {
+  const live = messages.federation.sources.filter(
+    (source) => source.status === "live",
+  ).length;
+  const total = messages.federation.sources.length;
+  const incomplete = live < total;
+
   return (
     <div className="message-list" aria-live="polite">
+      {incomplete ? (
+        <aside className="federation-warning" role="status">
+          <strong>Showing partial history</strong>
+          <p>
+            This browser is authenticated with {live} of {total} PDS homes.
+            Portable cross-PDS authentication is not connected yet.
+          </p>
+        </aside>
+      ) : null}
       {messages.isPending ? (
         <p className="empty-state">Connecting to participant servers…</p>
       ) : null}
@@ -21,7 +43,7 @@ export function MessageList({ home, messages }: MessageListProps) {
         </div>
       ) : null}
       {messages.data?.map((message) => (
-        <Message key={message.eventId} message={message} />
+        <Message key={message.messageId} message={message} />
       ))}
     </div>
   );
diff --git a/apps/web/src/cloud/SessionGate.tsx b/apps/web/src/cloud/SessionGate.tsx
index 1db5464c..3072461c 100644
--- a/apps/web/src/cloud/SessionGate.tsx
+++ b/apps/web/src/cloud/SessionGate.tsx
@@ -9,6 +9,7 @@ import { ServerLoading } from "./ServerLoading.tsx";
 interface SessionGateProps {
   authClient: HomeAuthClient;
   home: HomeServer;
+  initialUsername: string;
   onChooseServer: () => void;
 }
 
diff --git a/apps/web/src/cloud/use-chat-room.ts b/apps/web/src/cloud/use-chat-room.ts
index 16ebeb51..9aedb5e3 100644
--- a/apps/web/src/cloud/use-chat-room.ts
+++ b/apps/web/src/cloud/use-chat-room.ts
@@ -1,21 +1,21 @@
 import type { FormEvent } from "react";
 import { useState } from "react";
 import { useDecentralizedConvex } from "@decentralized-convex/react";
-import { useFederatedQuery } from "@decentralized-convex/tanstack-query";
-import { api } from "@vera/backend/api";
+import { useFederatedPdsQuery } from "@decentralized-convex/tanstack-query";
 
 import type { HomeServer } from "../live/config.ts";
 import { conversation } from "../live/config.ts";
-import { messagesQueryOptions } from "../live/queries.ts";
+import { messagesQueryOptions, pdsApi } from "../live/queries.ts";
 
 interface UseChatRoomOptions {
   home: HomeServer;
+  homes: readonly HomeServer[];
   user: { actor: string };
 }
 
-export function useChatRoom({ home, user }: UseChatRoomOptions) {
+export function useChatRoom({ home, homes, user }: UseChatRoomOptions) {
   const client = useDecentralizedConvex();
-  const messages = useFederatedQuery(messagesQueryOptions());
+  const messages = useFederatedPdsQuery(messagesQueryOptions(homes));
   const [draft, setDraft] = useState("");
   const [error, setError] = useState<string>();
   const [sending, setSending] = useState(false);
@@ -28,15 +28,13 @@ export function useChatRoom({ home, user }: UseChatRoomOptions) {
     setError(undefined);
     setSending(true);
     try {
-      await client.mutation(
+      await client.pdsMutation(
         { id: user.actor, url: home.convexUrl },
-        api.messages.send,
-        {
+        pdsApi.messages.mutations.send({
           body,
-          eventId: crypto.randomUUID(),
-          roomId: conversation.id,
-          sentAt: Date.now(),
-        },
+          conversationId: conversation.id,
+          messageId: crypto.randomUUID(),
+        }),
       );
       setDraft("");
     } catch (cause) {
diff --git a/apps/web/src/federation-auth.ts b/apps/web/src/federation-auth.ts
new file mode 100644
index 00000000..cede56f1
--- /dev/null
+++ b/apps/web/src/federation-auth.ts
@@ -0,0 +1,146 @@
+import type { FederationAuthTokenFetcher } from "@decentralized-convex/client";
+
+import type { HomeAuthClient } from "./auth-client.ts";
+import type { HomeServer } from "./live/config.ts";
+
+interface FederationAuthOptions {
+  authClient: HomeAuthClient;
+  home: HomeServer;
+  homes: readonly HomeServer[];
+}
+
+interface CachedToken {
+  expiresAt: number;
+  token: string;
+}
+
+export function createFederationAuthTokenFetcher({
+  authClient,
+  home,
+  homes,
+}: FederationAuthOptions): FederationAuthTokenFetcher {
+  const cache = new Map<string, CachedToken>();
+  const homesByUrl = new Map(homes.map((server) => [server.convexUrl, server]));
+
+  return async ({ forceRefreshToken, url }) => {
+    if (url === home.convexUrl) {
+      return getHomeToken(authClient);
+    }
+
+    const target = homesByUrl.get(url);
+    if (target === undefined) return null;
+    return getRemoteToken({
+      authClient,
+      cache,
+      forceRefreshToken,
+      home,
+      target,
+      url,
+    });
+  };
+}
+
+async function getHomeToken(authClient: HomeAuthClient) {
+  const token = await authClient.convex.token({
+    fetchOptions: { throw: false },
+  });
+  return token.data?.token ?? null;
+}
+
+async function getRemoteToken({
+  authClient,
+  cache,
+  forceRefreshToken,
+  home,
+  target,
+  url,
+}: {
+  authClient: HomeAuthClient;
+  cache: Map<string, CachedToken>;
+  forceRefreshToken: boolean;
+  home: HomeServer;
+  target: HomeServer;
+  url: string;
+}) {
+  const cached = cache.get(url);
+  if (
+    !forceRefreshToken &&
+    cached !== undefined &&
+    cached.expiresAt > Date.now() / 1_000 + 30
+  ) {
+    return cached.token;
+  }
+
+  const session = await authClient.getSession();
+  const sessionToken = session.data?.session.token;
+  if (sessionToken === undefined) return null;
+  const assertionResponse = await postJson(
+    `${home.siteUrl}/api/auth/federation/assertion`,
+    { audience: target.domain },
+    { authorization: `Bearer ${sessionToken}` },
+  );
+  if (!assertionResponse.ok) {
+    throw new Error(
+      `Home PDS could not create an identity proof (${assertionResponse.status})`,
+    );
+  }
+  const assertionPayload = await readJson(assertionResponse);
+  const assertion = requireString(
+    readProperty(assertionPayload, "assertion"),
+    "assertion",
+  );
+  const exchangeResponse = await postJson(
+    `${target.siteUrl}/api/auth/federation/exchange`,
+    { assertion },
+  );
+  if (!exchangeResponse.ok) {
+    throw new Error(
+      `Remote PDS rejected the identity proof (${exchangeResponse.status})`,
+    );
+  }
+  const exchange = await readJson(exchangeResponse);
+  const result = {
+    expiresAt: requireNumber(readProperty(exchange, "expiresAt"), "expiresAt"),
+    token: requireString(readProperty(exchange, "token"), "token"),
+  };
+  cache.set(url, result);
+  return result.token;
+}
+
+function postJson(
+  url: string,
+  body: object,
+  headers: Readonly<Record<string, string>> = {},
+) {
+  return fetch(url, {
+    body: JSON.stringify(body),
+    headers: { ...headers, "content-type": "application/json" },
+    method: "POST",
+  });
+}
+
+async function readJson(response: Response): Promise<unknown> {
+  // The DOM library types Response.json() as `any`; treat the untrusted payload as unknown.
+  return response.json();
+}
+
+function readProperty(value: unknown, field: string): unknown {
+  if (typeof value !== "object" || value === null) {
+    throw new Error("PDS authentication returned an invalid response");
+  }
+  return Reflect.get(value, field);
+}
+
+function requireString(value: unknown, field: string) {
+  if (typeof value !== "string" || value.length === 0) {
+    throw new Error(`PDS authentication response is missing ${field}`);
+  }
+  return value;
+}
+
+function requireNumber(value: unknown, field: string) {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    throw new Error(`PDS authentication response is missing ${field}`);
+  }
+  return value;
+}
diff --git a/apps/web/src/live/config.ts b/apps/web/src/live/config.ts
index 70d98ac7..3c163ca5 100644
--- a/apps/web/src/live/config.ts
+++ b/apps/web/src/live/config.ts
@@ -1,40 +1,26 @@
+import type { DiscoveredPds } from "@decentralized-convex/client";
+
 export interface HomeServer {
   convexUrl: string;
   domain: string;
-  id: "a" | "b";
+  id: string;
+  manifestUrl: string;
   siteUrl: string;
 }
 
-export const homes: readonly HomeServer[] = [
-  createHome(
-    "a",
-    import.meta.env.VITE_HOME_A_CONVEX_URL,
-    import.meta.env.VITE_HOME_A_SITE_URL,
-  ),
-  createHome(
-    "b",
-    import.meta.env.VITE_HOME_B_CONVEX_URL,
-    import.meta.env.VITE_HOME_B_SITE_URL,
-  ),
-];
+export const testHomeDomains = ["a.vera.chat", "b.vera.chat"] as const;
 
 export const conversation = {
-  id: "room:general",
-  targets: homes.map((home) => ({
-    id: `member@${home.domain}`,
-    url: home.convexUrl,
-  })),
+  id: "conversation:direct:a.vera.chat:b.vera.chat",
+  participantDomains: testHomeDomains,
 };
 
-function createHome(
-  id: HomeServer["id"],
-  convexUrl: string,
-  siteUrl: string,
-): HomeServer {
+export function homeFromDiscovery(discovery: DiscoveredPds): HomeServer {
   return {
-    convexUrl,
-    domain: new URL(convexUrl).hostname,
-    id,
-    siteUrl,
+    convexUrl: discovery.manifest.deploymentUrl,
+    domain: discovery.domain,
+    id: discovery.domain,
+    manifestUrl: discovery.manifestUrl,
+    siteUrl: discovery.manifest.httpUrl,
   };
 }
diff --git a/apps/web/src/live/queries.ts b/apps/web/src/live/queries.ts
index 19214d61..9f261a02 100644
--- a/apps/web/src/live/queries.ts
+++ b/apps/web/src/live/queries.ts
@@ -1,25 +1,35 @@
-import type { FunctionReturnType } from "convex/server";
-import { federatedQueryOptions } from "@decentralized-convex/tanstack-query";
-import { api } from "@vera/backend/api";
+import type { Message } from "@decentralized-convex/messages";
+import { definePdsApi } from "@decentralized-convex/client";
+import { messagesProtocol } from "@decentralized-convex/messages";
+import { federatedPdsQueryOptions } from "@decentralized-convex/tanstack-query";
 
+import type { HomeServer } from "./config.ts";
 import { conversation } from "./config.ts";
 
-export type ChatMessage = FunctionReturnType<typeof api.messages.list>[number];
+export type ChatMessage = Message;
 
-export function messagesQueryOptions() {
-  return federatedQueryOptions({
-    args: { roomId: conversation.id },
+export const pdsApi = definePdsApi({ messages: messagesProtocol });
+
+export function messagesQueryOptions(homes: readonly HomeServer[]) {
+  return federatedPdsQueryOptions({
     combine: (sources) =>
       combineMessages(sources.flatMap((source) => source.data)),
-    query: api.messages.list,
     queryKey: ["messages", conversation.id],
-    targets: conversation.targets,
+    request: pdsApi.messages.queries.list({
+      conversationId: conversation.id,
+    }),
+    targets: homes.map((home) => ({
+      id: `member@${home.domain}`,
+      url: home.convexUrl,
+    })),
   });
 }
 
 function combineMessages(messages: readonly ChatMessage[]) {
-  const byId = new Map(messages.map((message) => [message.eventId, message]));
+  const byId = new Map(messages.map((message) => [message.messageId, message]));
   return [...byId.values()].sort(
-    (a, b) => a.sentAt - b.sentAt || a.eventId.localeCompare(b.eventId),
+    (left, right) =>
+      left.sentAt - right.sentAt ||
+      left.messageId.localeCompare(right.messageId),
   );
 }
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
index 2e273d48..ea5c1b1a 100644
--- a/apps/web/src/routes/index.tsx
+++ b/apps/web/src/routes/index.tsx
@@ -3,21 +3,28 @@ import { createFileRoute } from "@tanstack/react-router";
 
 import type { HomeServer } from "../live/config.ts";
 import { HomeServerSession } from "../cloud/HomeServerSession.tsx";
-import { homes } from "../live/config.ts";
 import { ServerPicker } from "../server-picker/ServerPicker.tsx";
 
 export const Route = createFileRoute("/")({ component: Home });
 
 function Home() {
-  const [home, setHome] = useState<HomeServer>();
-  if (home !== undefined) {
+  const [selection, setSelection] = useState<{
+    home: HomeServer;
+    username: string;
+  }>();
+  if (selection !== undefined) {
     return (
       <HomeServerSession
-        home={home}
-        onChooseServer={() => setHome(undefined)}
+        home={selection.home}
+        initialUsername={selection.username}
+        onChooseServer={() => setSelection(undefined)}
       />
     );
   }
 
-  return <ServerPicker homes={homes} onChoose={setHome} />;
+  return (
+    <ServerPicker
+      onChoose={(home, username) => setSelection({ home, username })}
+    />
+  );
 }
diff --git a/apps/web/src/server-picker/ServerPicker.tsx b/apps/web/src/server-picker/ServerPicker.tsx
index 3a065306..8ea2d317 100644
--- a/apps/web/src/server-picker/ServerPicker.tsx
+++ b/apps/web/src/server-picker/ServerPicker.tsx
@@ -1,46 +1,86 @@
+import type { FormEvent } from "react";
+import { useState } from "react";
+import { discoverPds } from "@decentralized-convex/client";
+
 import type { HomeServer } from "../live/config.ts";
+import { homeFromDiscovery } from "../live/config.ts";
 
 interface ServerPickerProps {
-  homes: readonly HomeServer[];
-  onChoose: (home: HomeServer) => void;
+  onChoose: (home: HomeServer, username: string) => void;
 }
 
-export function ServerPicker({ homes, onChoose }: ServerPickerProps) {
+export function ServerPicker({ onChoose }: ServerPickerProps) {
+  const form = useAddressDiscovery(onChoose);
+
   return (
     <main className="account-shell">
-      <section className="account-panel server-picker">
+      <section className="account-panel auth-panel">
         <header className="account-header">
           <span className="app-icon" aria-hidden="true">
             V
           </span>
           <div>
             <h1>Vera</h1>
-            <p>Choose the server where your account will live.</p>
+            <p>Sign in with your address on any compatible PDS.</p>
           </div>
         </header>
-        <div className="server-list">
-          {homes.map((server, index) => (
-            <button
-              className="server-row"
-              key={server.id}
-              onClick={() => onChoose(server)}
-              type="button"
-            >
-              <span className="server-index">{index + 1}</span>
-              <span className="server-address">
-                <strong>{server.domain}</strong>
-                <small>Convex deployment</small>
-              </span>
-              <span className="row-arrow" aria-hidden="true">
-                →
-              </span>
-            </button>
-          ))}
-        </div>
-        <p className="account-hint">
-          To test federation, open another tab and choose the other server.
-        </p>
+        <form onSubmit={(event) => void form.submit(event)}>
+          <label>
+            Vera address
+            <input
+              autoCapitalize="none"
+              autoComplete="username"
+              autoCorrect="off"
+              onChange={(event) => form.setAddress(event.target.value)}
+              placeholder="username@example.com"
+              required
+              spellCheck={false}
+              type="email"
+              value={form.address}
+            />
+          </label>
+          {form.error === undefined ? null : (
+            <p className="auth-error">{form.error}</p>
+          )}
+          <button
+            className="primary-button"
+            disabled={form.loading}
+            type="submit"
+          >
+            {form.loading ? "Finding your PDS…" : "Continue"}
+          </button>
+        </form>
       </section>
     </main>
   );
 }
+
+function useAddressDiscovery(onChoose: ServerPickerProps["onChoose"]) {
+  const [address, setAddress] = useState("");
+  const [error, setError] = useState<string>();
+  const [loading, setLoading] = useState(false);
+
+  async function submit(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    setError(undefined);
+    const normalized = address.trim().toLowerCase();
+    const separator = normalized.lastIndexOf("@");
+    const username = normalized.slice(0, separator);
+    if (separator <= 0 || !/^[a-z0-9][a-z0-9._-]{1,31}$/.test(username)) {
+      setError("Enter a valid username@domain address.");
+      return;
+    }
+
+    setLoading(true);
+    try {
+      const discovery = await discoverPds(normalized);
+      onChoose(homeFromDiscovery(discovery), username);
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "PDS discovery failed");
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  return { address, error, loading, setAddress, submit };
+}
diff --git a/apps/web/src/styles.css b/apps/web/src/styles.css
index 42f418e1..13ec2b53 100644
--- a/apps/web/src/styles.css
+++ b/apps/web/src/styles.css
@@ -627,6 +627,27 @@ summary:focus-visible {
   padding: 22px 24px;
 }
 
+.federation-warning {
+  display: grid;
+  gap: 4px;
+  margin: 0 6px 14px;
+  padding: 12px 14px;
+  border: 1px solid #e2c273;
+  border-radius: 8px;
+  color: #5f4818;
+  background: #fff8df;
+}
+
+.federation-warning strong {
+  font-size: 12px;
+}
+
+.federation-warning p {
+  margin: 0;
+  font-size: 11px;
+  line-height: 1.5;
+}
+
 .message {
   display: grid;
   gap: 11px;
@@ -852,8 +873,7 @@ summary:focus-visible {
     padding: 10px 14px;
   }
 
-  .channel-header p,
-  .connection-summary {
+  .channel-header p {
     display: none;
   }
 
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index d37915e1..188f7d38 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -3,5 +3,10 @@ import viteReact from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
 
 export default defineConfig({
+  clearScreen: false,
+  server: {
+    host: process.env.HOST,
+    port: process.env.PORT ? Number(process.env.PORT) : undefined,
+  },
   plugins: [tanstackStart(), viteReact()],
 });
diff --git a/packages/decentralized-convex-accounts/README.md b/packages/decentralized-convex-accounts/README.md
new file mode 100644
index 00000000..3a4d301d
--- /dev/null
+++ b/packages/decentralized-convex-accounts/README.md
@@ -0,0 +1,11 @@
+# `@decentralized-convex/accounts`
+
+The product-agnostic account profile Component for a decentralized Convex PDS.
+The authenticated identity comes from the host PDS; this package stores only
+the shared account profile that other products can build on.
+
+```ts
+import accounts from "@decentralized-convex/accounts/convex.config";
+
+app.use(accounts);
+```
diff --git a/packages/decentralized-convex-accounts/_generated/api.ts b/packages/decentralized-convex-accounts/_generated/api.ts
new file mode 100644
index 00000000..4940cc5b
--- /dev/null
+++ b/packages/decentralized-convex-accounts/_generated/api.ts
@@ -0,0 +1,54 @@
+/* eslint-disable */
+/**
+ * Generated `api` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type * as dispatcher from "../dispatcher.js";
+import type * as index from "../index.js";
+import type * as protocol from "../protocol.js";
+
+import type {
+  ApiFromModules,
+  FilterApi,
+  FunctionReference,
+} from "convex/server";
+import { anyApi, componentsGeneric } from "convex/server";
+
+const fullApi: ApiFromModules<{
+  dispatcher: typeof dispatcher;
+  index: typeof index;
+  protocol: typeof protocol;
+}> = anyApi as any;
+
+/**
+ * A utility for referencing Convex functions in your app's public API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = api.myModule.myFunction;
+ * ```
+ */
+export const api: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "public">
+> = anyApi as any;
+
+/**
+ * A utility for referencing Convex functions in your app's internal API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = internal.myModule.myFunction;
+ * ```
+ */
+export const internal: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "internal">
+> = anyApi as any;
+
+export const components = componentsGeneric() as unknown as {};
diff --git a/packages/decentralized-convex-accounts/_generated/component.ts b/packages/decentralized-convex-accounts/_generated/component.ts
new file mode 100644
index 00000000..0bc1564d
--- /dev/null
+++ b/packages/decentralized-convex-accounts/_generated/component.ts
@@ -0,0 +1,91 @@
+/* eslint-disable */
+/**
+ * Generated `ComponentApi` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type { FunctionReference } from "convex/server";
+
+/**
+ * A utility for referencing a Convex component's exposed API.
+ *
+ * Useful when expecting a parameter like `components.myComponent`.
+ * Usage:
+ * ```ts
+ * async function myFunction(ctx: QueryCtx, component: ComponentApi) {
+ *   return ctx.runQuery(component.someFile.someQuery, { ...args });
+ * }
+ * ```
+ */
+export type ComponentApi<Name extends string | undefined = string | undefined> =
+  {
+    dispatcher: {
+      dispatchMutation: FunctionReference<
+        "mutation",
+        "internal",
+        {
+          identity: null | {
+            accountId?: string;
+            email?: string;
+            issuer: string;
+            name?: string;
+            subject: string;
+            tokenIdentifier: string;
+          };
+          operation: {
+            args: { avatarUrl: null | string; displayName: string };
+            type: "upsertMyProfile";
+          };
+          version: "1";
+        },
+        {
+          type: "upsertMyProfile";
+          value: {
+            accountId: string;
+            avatarUrl: null | string;
+            displayName: string;
+          };
+        },
+        Name
+      >;
+      dispatchQuery: FunctionReference<
+        "query",
+        "internal",
+        {
+          identity: null | {
+            accountId?: string;
+            email?: string;
+            issuer: string;
+            name?: string;
+            subject: string;
+            tokenIdentifier: string;
+          };
+          operation:
+            | { args: {}; type: "getMyProfile" }
+            | { args: { accountId: string }; type: "getProfile" };
+          version: "1";
+        },
+        | {
+            type: "getMyProfile";
+            value: null | {
+              accountId: string;
+              avatarUrl: null | string;
+              displayName: string;
+            };
+          }
+        | {
+            type: "getProfile";
+            value: null | {
+              accountId: string;
+              avatarUrl: null | string;
+              displayName: string;
+            };
+          },
+        Name
+      >;
+    };
+  };
diff --git a/packages/decentralized-convex-accounts/_generated/dataModel.ts b/packages/decentralized-convex-accounts/_generated/dataModel.ts
new file mode 100644
index 00000000..f97fd194
--- /dev/null
+++ b/packages/decentralized-convex-accounts/_generated/dataModel.ts
@@ -0,0 +1,60 @@
+/* eslint-disable */
+/**
+ * Generated data model types.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type {
+  DataModelFromSchemaDefinition,
+  DocumentByName,
+  TableNamesInDataModel,
+  SystemTableNames,
+} from "convex/server";
+import type { GenericId } from "convex/values";
+import schema from "../schema.js";
+
+/**
+ * The names of all of your Convex tables.
+ */
+export type TableNames = TableNamesInDataModel<DataModel>;
+
+/**
+ * The type of a document stored in Convex.
+ *
+ * @typeParam TableName - A string literal type of the table name (like "users").
+ */
+export type Doc<TableName extends TableNames> = DocumentByName<
+  DataModel,
+  TableName
+>;
+
+/**
+ * An identifier for a document in Convex.
+ *
+ * Convex documents are uniquely identified by their `Id`, which is accessible
+ * on the `_id` field. To learn more, see [Document IDs](https://docs.convex.dev/using/document-ids).
+ *
+ * Documents can be loaded using `db.get(tableName, id)` in query and mutation functions.
+ *
+ * IDs are just strings at runtime, but this type can be used to distinguish them from other
+ * strings when type checking.
+ *
+ * @typeParam TableName - A string literal type of the table name (like "users").
+ */
+export type Id<TableName extends TableNames | SystemTableNames> =
+  GenericId<TableName>;
+
+/**
+ * A type describing your Convex data model.
+ *
+ * This type includes information about what tables you have, the type of
+ * documents stored in those tables, and the indexes defined on them.
+ *
+ * This type is used to parameterize methods like `queryGeneric` and
+ * `mutationGeneric` to make them type-safe.
+ */
+export type DataModel = DataModelFromSchemaDefinition<typeof schema>;
diff --git a/packages/decentralized-convex-accounts/_generated/server.ts b/packages/decentralized-convex-accounts/_generated/server.ts
new file mode 100644
index 00000000..739b02f7
--- /dev/null
+++ b/packages/decentralized-convex-accounts/_generated/server.ts
@@ -0,0 +1,156 @@
+/* eslint-disable */
+/**
+ * Generated utilities for implementing server-side Convex query and mutation functions.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type {
+  ActionBuilder,
+  HttpActionBuilder,
+  MutationBuilder,
+  QueryBuilder,
+  GenericActionCtx,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  GenericDatabaseReader,
+  GenericDatabaseWriter,
+} from "convex/server";
+import {
+  actionGeneric,
+  httpActionGeneric,
+  queryGeneric,
+  mutationGeneric,
+  internalActionGeneric,
+  internalMutationGeneric,
+  internalQueryGeneric,
+} from "convex/server";
+import type { DataModel } from "./dataModel.js";
+
+/**
+ * Define a query in this Convex app's public API.
+ *
+ * This function will be allowed to read your Convex database and will be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export const query: QueryBuilder<DataModel, "public"> = queryGeneric;
+
+/**
+ * Define a query that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to read from your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export const internalQuery: QueryBuilder<DataModel, "internal"> =
+  internalQueryGeneric;
+
+/**
+ * Define a mutation in this Convex app's public API.
+ *
+ * This function will be allowed to modify your Convex database and will be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export const mutation: MutationBuilder<DataModel, "public"> = mutationGeneric;
+
+/**
+ * Define a mutation that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to modify your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export const internalMutation: MutationBuilder<DataModel, "internal"> =
+  internalMutationGeneric;
+
+/**
+ * Define an action in this Convex app's public API.
+ *
+ * An action is a function which can execute any JavaScript code, including non-deterministic
+ * code and code with side-effects, like calling third-party services.
+ * They can be run in Convex's JavaScript environment or in Node.js using the "use node" directive.
+ * They can interact with the database indirectly by calling queries and mutations using the {@link ActionCtx}.
+ *
+ * @param func - The action. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped action. Include this as an `export` to name it and make it accessible.
+ */
+export const action: ActionBuilder<DataModel, "public"> = actionGeneric;
+
+/**
+ * Define an action that is only accessible from other Convex functions (but not from the client).
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped function. Include this as an `export` to name it and make it accessible.
+ */
+export const internalAction: ActionBuilder<DataModel, "internal"> =
+  internalActionGeneric;
+
+/**
+ * Define an HTTP action.
+ *
+ * The wrapped function will be used to respond to HTTP requests received
+ * by a Convex deployment if the requests matches the path and method where
+ * this action is routed. Be sure to route your httpAction in `convex/http.js`.
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument
+ * and a Fetch API `Request` object as its second.
+ * @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
+ */
+export const httpAction: HttpActionBuilder = httpActionGeneric;
+
+/**
+ * A set of services for use within Convex query functions.
+ *
+ * The query context is passed as the first argument to any Convex query
+ * function run on the server.
+ *
+ * If you're using code generation, use the `QueryCtx` type in `convex/_generated/server.d.ts` instead.
+ */
+export type QueryCtx = GenericQueryCtx<DataModel>;
+
+/**
+ * A set of services for use within Convex mutation functions.
+ *
+ * The mutation context is passed as the first argument to any Convex mutation
+ * function run on the server.
+ *
+ * If you're using code generation, use the `MutationCtx` type in `convex/_generated/server.d.ts` instead.
+ */
+export type MutationCtx = GenericMutationCtx<DataModel>;
+
+/**
+ * A set of services for use within Convex action functions.
+ *
+ * The action context is passed as the first argument to any Convex action
+ * function run on the server.
+ */
+export type ActionCtx = GenericActionCtx<DataModel>;
+
+/**
+ * An interface to read from the database within Convex query functions.
+ *
+ * The two entry points are {@link DatabaseReader.get}, which fetches a single
+ * document by its {@link Id}, or {@link DatabaseReader.query}, which starts
+ * building a query.
+ */
+export type DatabaseReader = GenericDatabaseReader<DataModel>;
+
+/**
+ * An interface to read from and write to the database within Convex mutation
+ * functions.
+ *
+ * Convex guarantees that all writes within a single mutation are
+ * executed atomically, so you never have to worry about partial writes leaving
+ * your data in an inconsistent state. See [the Convex Guide](https://docs.convex.dev/understanding/convex-fundamentals/functions#atomicity-and-optimistic-concurrency-control)
+ * for the guarantees Convex provides your functions.
+ */
+export type DatabaseWriter = GenericDatabaseWriter<DataModel>;
diff --git a/packages/decentralized-convex-accounts/convex.config.ts b/packages/decentralized-convex-accounts/convex.config.ts
new file mode 100644
index 00000000..f52017bb
--- /dev/null
+++ b/packages/decentralized-convex-accounts/convex.config.ts
@@ -0,0 +1,5 @@
+import { defineComponent } from "convex/server";
+
+import { accountsProtocol } from "./protocol.ts";
+
+export default defineComponent(accountsProtocol.name);
diff --git a/packages/decentralized-convex-accounts/dispatcher.ts b/packages/decentralized-convex-accounts/dispatcher.ts
new file mode 100644
index 00000000..c741772c
--- /dev/null
+++ b/packages/decentralized-convex-accounts/dispatcher.ts
@@ -0,0 +1,77 @@
+import { defineComponentDispatchers } from "@decentralized-convex/server";
+import { ConvexError } from "convex/values";
+
+import type { QueryCtx } from "./_generated/server.js";
+import { mutation, query } from "./_generated/server.js";
+import { accountsProtocol } from "./protocol.ts";
+
+export const { dispatchMutation, dispatchQuery } = defineComponentDispatchers({
+  handlers: {
+    mutations: {
+      upsertMyProfile: async (ctx, { args, identity }) => {
+        const accountId = requireAccountId(identity);
+        const displayName = args.displayName.trim();
+        if (displayName.length === 0 || displayName.length > 80) {
+          throw new ConvexError({ code: "INVALID_DISPLAY_NAME" });
+        }
+
+        const profile = {
+          accountId,
+          avatarUrl: args.avatarUrl,
+          displayName,
+        };
+        const existing = await ctx.db
+          .query("profiles")
+          .withIndex("by_account", (index) => index.eq("accountId", accountId))
+          .unique();
+
+        if (existing === null) {
+          await ctx.db.insert("profiles", profile);
+        } else {
+          await ctx.db.patch(existing._id, {
+            avatarUrl: profile.avatarUrl,
+            displayName: profile.displayName,
+          });
+        }
+        return profile;
+      },
+    },
+    queries: {
+      getMyProfile: async (ctx, { identity }) => {
+        if (identity === null) return null;
+        return findProfile(ctx, requireAccountId(identity));
+      },
+      getProfile: (ctx, { args }) =>
+        findProfile(ctx, args.accountId.trim().toLowerCase()),
+    },
+  },
+  mutation,
+  protocol: accountsProtocol,
+  query,
+});
+
+function requireAccountId(
+  identity: null | { accountId?: string; email?: string },
+) {
+  const accountId = (identity?.accountId ?? identity?.email)
+    ?.trim()
+    .toLowerCase();
+  if (accountId?.includes("@") !== true) {
+    throw new ConvexError({ code: "AUTHENTICATED_ACCOUNT_REQUIRED" });
+  }
+  return accountId;
+}
+
+async function findProfile(ctx: QueryCtx, accountId: string) {
+  const profile = await ctx.db
+    .query("profiles")
+    .withIndex("by_account", (index) => index.eq("accountId", accountId))
+    .unique();
+  return profile === null
+    ? null
+    : {
+        accountId: profile.accountId,
+        avatarUrl: profile.avatarUrl,
+        displayName: profile.displayName,
+      };
+}
diff --git a/packages/decentralized-convex-accounts/eslint.config.ts b/packages/decentralized-convex-accounts/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-accounts/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-accounts/index.ts b/packages/decentralized-convex-accounts/index.ts
new file mode 100644
index 00000000..7957d853
--- /dev/null
+++ b/packages/decentralized-convex-accounts/index.ts
@@ -0,0 +1,2 @@
+export { accountProfile, accountsProtocol } from "./protocol.ts";
+export type { AccountProfile } from "./protocol.ts";
diff --git a/packages/decentralized-convex-accounts/package.json b/packages/decentralized-convex-accounts/package.json
new file mode 100644
index 00000000..75f2bb80
--- /dev/null
+++ b/packages/decentralized-convex-accounts/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "@decentralized-convex/accounts",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./index.ts",
+    "./convex.config": "./convex.config.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config --ignore-pattern _generated",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@decentralized-convex/plugin": "workspace:*",
+    "@decentralized-convex/server": "workspace:*",
+    "convex": "catalog:"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-accounts/protocol.ts b/packages/decentralized-convex-accounts/protocol.ts
new file mode 100644
index 00000000..3492a4c2
--- /dev/null
+++ b/packages/decentralized-convex-accounts/protocol.ts
@@ -0,0 +1,38 @@
+import type { Infer } from "convex/values";
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { v } from "convex/values";
+
+export const accountProfile = v.object({
+  accountId: v.string(),
+  avatarUrl: v.union(v.null(), v.string()),
+  displayName: v.string(),
+});
+
+export type AccountProfile = Infer<typeof accountProfile>;
+
+export const accountsProtocol = definePluginProtocol({
+  name: "accounts",
+  mutations: {
+    upsertMyProfile: defineOperation({
+      args: v.object({
+        avatarUrl: v.union(v.null(), v.string()),
+        displayName: v.string(),
+      }),
+      returns: accountProfile,
+    }),
+  },
+  queries: {
+    getMyProfile: defineOperation({
+      args: v.object({}),
+      returns: v.union(v.null(), accountProfile),
+    }),
+    getProfile: defineOperation({
+      args: v.object({ accountId: v.string() }),
+      returns: v.union(v.null(), accountProfile),
+    }),
+  },
+  version: "1",
+});
diff --git a/packages/decentralized-convex-accounts/schema.ts b/packages/decentralized-convex-accounts/schema.ts
new file mode 100644
index 00000000..c27cbb96
--- /dev/null
+++ b/packages/decentralized-convex-accounts/schema.ts
@@ -0,0 +1,10 @@
+import { defineSchema, defineTable } from "convex/server";
+import { v } from "convex/values";
+
+export default defineSchema({
+  profiles: defineTable({
+    accountId: v.string(),
+    avatarUrl: v.union(v.null(), v.string()),
+    displayName: v.string(),
+  }).index("by_account", ["accountId"]),
+});
diff --git a/packages/decentralized-convex-accounts/tsconfig.json b/packages/decentralized-convex-accounts/tsconfig.json
new file mode 100644
index 00000000..3f6a953d
--- /dev/null
+++ b/packages/decentralized-convex-accounts/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022"],
+    "types": ["node"]
+  },
+  "include": ["*.ts", "_generated/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-address/package.json b/packages/decentralized-convex-address/package.json
index a1a82a0b..9ea13470 100644
--- a/packages/decentralized-convex-address/package.json
+++ b/packages/decentralized-convex-address/package.json
@@ -15,9 +15,6 @@
     "test": "node --experimental-strip-types --test src/*.test.ts",
     "typecheck": "tsgo --noEmit"
   },
-  "dependencies": {
-    "@decentralized-convex/client": "workspace:*"
-  },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",
     "@acme/prettier-config": "workspace:*",
diff --git a/packages/decentralized-convex-address/src/address.ts b/packages/decentralized-convex-address/src/address.ts
index e1744915..df166810 100644
--- a/packages/decentralized-convex-address/src/address.ts
+++ b/packages/decentralized-convex-address/src/address.ts
@@ -1,5 +1,3 @@
-import type { FederationTarget } from "@decentralized-convex/client";
-
 export interface DecentralizedAddress {
   domain: string;
   username: string;
@@ -24,7 +22,7 @@ export function formatAddress(address: DecentralizedAddress) {
     .toLowerCase()}`;
 }
 
-export function addressToTarget(value: string): FederationTarget {
+export function addressToTarget(value: string) {
   const address = parseAddress(value);
   return {
     id: formatAddress(address),
diff --git a/packages/decentralized-convex-address/src/discovery.test.ts b/packages/decentralized-convex-address/src/discovery.test.ts
new file mode 100644
index 00000000..dbee5075
--- /dev/null
+++ b/packages/decentralized-convex-address/src/discovery.test.ts
@@ -0,0 +1,143 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  accountDomain,
+  decodeDnsTxtData,
+  discoverPds,
+  parsePdsTxtRecord,
+} from "./discovery.ts";
+
+void test("extracts and validates an account domain", () => {
+  assert.equal(accountDomain(" Shawn@A.Vera.Chat. "), "a.vera.chat");
+  assert.throws(() => accountDomain("not-a-domain"), /valid/);
+});
+
+void test("parses the versioned one-record discovery format", () => {
+  assert.equal(
+    parsePdsTxtRecord(
+      "v=pds1;url=https://example.convex.site/.well-known/decentralized-convex",
+    ),
+    "https://example.convex.site/.well-known/decentralized-convex",
+  );
+  assert.equal(
+    parsePdsTxtRecord("v=unknown;url=https://example.com/manifest"),
+    null,
+  );
+  assert.equal(
+    decodeDnsTxtData('"v=pds1;url=https://example.com/" "manifest"'),
+    "v=pds1;url=https://example.com/manifest",
+  );
+});
+
+void test("discovers and validates a PDS manifest", async () => {
+  const result = await discoverPds("person@a.vera.chat", {
+    fetch: (input) => {
+      const url =
+        typeof input === "string"
+          ? input
+          : input instanceof URL
+            ? input.href
+            : input.url;
+      assert.equal(url, "https://a.example/.well-known/decentralized-convex");
+      return Promise.resolve(
+        Response.json({
+          accountDomain: "a.vera.chat",
+          auth: {
+            issuer: "https://a.example",
+            jwksUrl: "https://a.example/jwks",
+          },
+          capabilities: [{ id: "messages", versions: ["1"] }],
+          deploymentUrl: "https://a.example.convex.cloud",
+          httpUrl: "https://a.example.convex.site",
+          protocolVersion: "0.1",
+        }),
+      );
+    },
+    resolveTxt: (name) => {
+      assert.equal(name, "_pds.a.vera.chat");
+      return Promise.resolve([
+        "unrelated=value",
+        "v=pds1;url=https://a.example/.well-known/decentralized-convex",
+      ]);
+    },
+  });
+
+  assert.equal(result.domain, "a.vera.chat");
+  assert.equal(result.manifest.deploymentUrl, "https://a.example.convex.cloud");
+});
+
+void test("rejects a manifest for a different account domain", async () => {
+  await assert.rejects(
+    discoverPds("a.vera.chat", {
+      fetch: () =>
+        Promise.resolve(
+          Response.json({
+            accountDomain: "b.vera.chat",
+            deploymentUrl: "https://a.example.convex.cloud",
+            httpUrl: "https://a.example.convex.site",
+            protocolVersion: "0.1",
+          }),
+        ),
+      resolveTxt: () =>
+        Promise.resolve([
+          "v=pds1;url=https://a.example/.well-known/decentralized-convex",
+        ]),
+    }),
+    /belongs to b\.vera\.chat/,
+  );
+});
+
+void test("uses browser-compatible DNS-over-HTTPS by default", async () => {
+  const requested: string[] = [];
+  const result = await discoverPds("a.vera.chat", {
+    fetch: (input) => {
+      const url =
+        typeof input === "string"
+          ? input
+          : input instanceof URL
+            ? input.href
+            : input.url;
+      requested.push(url);
+      return Promise.resolve(
+        url.startsWith("https://cloudflare-dns.com/dns-query")
+          ? Response.json({
+              Answer: [
+                {
+                  data: '"v=pds1;url=https://a.example/manifest"',
+                  type: 16,
+                },
+              ],
+              Status: 0,
+            })
+          : Response.json({
+              accountDomain: "a.vera.chat",
+              deploymentUrl: "https://a.example.convex.cloud",
+              httpUrl: "https://a.example.convex.site",
+              protocolVersion: "0.1",
+            }),
+      );
+    },
+  });
+
+  assert.equal(result.manifestUrl, "https://a.example/manifest");
+  assert.match(requested[0] ?? "", /name=_pds\.a\.vera\.chat/);
+  assert.match(requested[0] ?? "", /type=TXT/);
+});
+
+void test("rejects ambiguous or insecure discovery records", async () => {
+  await assert.rejects(
+    discoverPds("a.vera.chat", {
+      resolveTxt: () =>
+        Promise.resolve([
+          "v=pds1;url=https://a.example/one",
+          "v=pds1;url=https://a.example/two",
+        ]),
+    }),
+    /Multiple PDS discovery records/,
+  );
+  assert.throws(
+    () => parsePdsTxtRecord("v=pds1;url=http://a.example/manifest"),
+    /HTTPS/,
+  );
+});
diff --git a/packages/decentralized-convex-address/src/discovery.ts b/packages/decentralized-convex-address/src/discovery.ts
new file mode 100644
index 00000000..fe3402dd
--- /dev/null
+++ b/packages/decentralized-convex-address/src/discovery.ts
@@ -0,0 +1,218 @@
+export const PDS_DISCOVERY_VERSION = "pds1";
+export const PDS_DNS_LABEL = "_pds";
+
+export interface PdsManifest {
+  accountDomain: string;
+  auth?: {
+    issuer: string;
+    jwksUrl: string;
+  };
+  capabilities?: readonly {
+    id: string;
+    versions: readonly string[];
+  }[];
+  deploymentUrl: string;
+  httpUrl: string;
+  protocolVersion: "0.1";
+}
+
+export interface DiscoveredPds {
+  domain: string;
+  manifest: PdsManifest;
+  manifestUrl: string;
+}
+
+export interface DiscoverPdsOptions {
+  fetch?: typeof fetch;
+  resolveTxt?: (name: string) => Promise<readonly string[]>;
+}
+
+export async function discoverPds(
+  addressOrDomain: string,
+  options: DiscoverPdsOptions = {},
+): Promise<DiscoveredPds> {
+  const domain = accountDomain(addressOrDomain);
+  const fetcher = options.fetch ?? fetch;
+  const records = await (options.resolveTxt === undefined
+    ? resolveTxtWithDoh(`${PDS_DNS_LABEL}.${domain}`, fetcher)
+    : options.resolveTxt(`${PDS_DNS_LABEL}.${domain}`));
+  const manifestUrl = selectManifestUrl(records);
+  const response = await fetcher(manifestUrl, {
+    headers: { accept: "application/json" },
+  });
+  if (!response.ok) {
+    throw new Error(`PDS manifest request failed (${response.status})`);
+  }
+  const manifest = parsePdsManifest(await response.json());
+  if (manifest.accountDomain !== domain) {
+    throw new Error(
+      `PDS manifest belongs to ${manifest.accountDomain}, not ${domain}`,
+    );
+  }
+  return { domain, manifest, manifestUrl };
+}
+
+export function accountDomain(addressOrDomain: string) {
+  const input = addressOrDomain.trim().toLowerCase();
+  const separator = input.lastIndexOf("@");
+  const domain = (
+    separator === -1 ? input : input.slice(separator + 1)
+  ).replace(/\.$/, "");
+  if (!isDomain(domain)) {
+    throw new Error("Enter a valid username@domain address");
+  }
+  return domain;
+}
+
+export function parsePdsTxtRecord(record: string) {
+  const fields = Object.fromEntries(
+    record
+      .split(";")
+      .map((field) => field.trim())
+      .filter(Boolean)
+      .map((field) => {
+        const separator = field.indexOf("=");
+        return separator === -1
+          ? [field, ""]
+          : [field.slice(0, separator), field.slice(separator + 1)];
+      }),
+  );
+  if (fields.v !== PDS_DISCOVERY_VERSION || fields.url === undefined) {
+    return null;
+  }
+  return requireHttpsUrl(fields.url, "PDS manifest URL");
+}
+
+export function decodeDnsTxtData(data: string) {
+  const segments = [...data.matchAll(/"((?:\\.|[^"\\])*)"/g)];
+  if (segments.length === 0) return data.trim();
+  return segments
+    .map((segment) => parseJsonString(`"${segment[1] ?? ""}"`))
+    .join("");
+}
+
+function parseJsonString(value: string) {
+  // JSON.parse is typed as `any`; DNS TXT segments are validated immediately.
+  const parsed: unknown = JSON.parse(value);
+  if (typeof parsed !== "string") throw new Error("Invalid DNS TXT segment");
+  return parsed;
+}
+
+function selectManifestUrl(records: readonly string[]) {
+  const matches = records
+    .map(parsePdsTxtRecord)
+    .filter((url): url is string => url !== null);
+  if (matches.length === 0) {
+    throw new Error(
+      `No ${PDS_DISCOVERY_VERSION} record found at the _pds DNS name`,
+    );
+  }
+  if (matches.length > 1) {
+    throw new Error("Multiple PDS discovery records were found");
+  }
+  const match = matches[0];
+  if (match === undefined) throw new Error("PDS discovery failed");
+  return match;
+}
+
+async function resolveTxtWithDoh(name: string, fetcher: typeof fetch) {
+  const url = new URL("https://cloudflare-dns.com/dns-query");
+  url.searchParams.set("name", name);
+  url.searchParams.set("type", "TXT");
+  const response = await fetcher(url, {
+    headers: { accept: "application/dns-json" },
+  });
+  if (!response.ok) {
+    throw new Error(`DNS lookup failed (${response.status})`);
+  }
+  const payload: unknown = await response.json();
+  if (!isRecord(payload) || payload.Status !== 0) {
+    throw new Error("The PDS DNS record could not be resolved");
+  }
+  if (!Array.isArray(payload.Answer)) return [];
+  return payload.Answer.flatMap((answer) =>
+    isRecord(answer) && answer.type === 16 && typeof answer.data === "string"
+      ? [decodeDnsTxtData(answer.data)]
+      : [],
+  );
+}
+
+function parsePdsManifest(value: unknown): PdsManifest {
+  if (!isRecord(value)) throw new Error("The PDS manifest is not an object");
+  const accountDomainValue = accountDomain(requireString(value.accountDomain));
+  const protocolVersion = requireString(value.protocolVersion);
+  if (protocolVersion !== "0.1") {
+    throw new Error(`Unsupported PDS protocol version: ${protocolVersion}`);
+  }
+  const auth = value.auth;
+  return {
+    accountDomain: accountDomainValue,
+    ...(auth === undefined ? {} : { auth: parseAuth(auth) }),
+    ...(value.capabilities === undefined
+      ? {}
+      : { capabilities: parseCapabilities(value.capabilities) }),
+    deploymentUrl: requireHttpsUrl(
+      requireString(value.deploymentUrl),
+      "Convex deployment URL",
+    ),
+    httpUrl: requireHttpsUrl(requireString(value.httpUrl), "PDS HTTP URL"),
+    protocolVersion,
+  };
+}
+
+function parseAuth(value: unknown) {
+  if (!isRecord(value)) throw new Error("Invalid PDS auth descriptor");
+  return {
+    issuer: requireHttpsUrl(requireString(value.issuer), "Auth issuer"),
+    jwksUrl: requireHttpsUrl(requireString(value.jwksUrl), "JWKS URL"),
+  };
+}
+
+function parseCapabilities(value: unknown) {
+  if (!Array.isArray(value)) throw new Error("Invalid PDS capabilities");
+  return value.map((capability) => {
+    if (!isRecord(capability) || !Array.isArray(capability.versions)) {
+      throw new Error("Invalid PDS capability");
+    }
+    return {
+      id: requireString(capability.id),
+      versions: capability.versions.map(requireString),
+    };
+  });
+}
+
+function requireHttpsUrl(input: string, label: string) {
+  let url: URL;
+  try {
+    url = new URL(input);
+  } catch {
+    throw new Error(`${label} is invalid`);
+  }
+  if (url.protocol !== "https:") throw new Error(`${label} must use HTTPS`);
+  return url.toString().replace(/\/$/, "");
+}
+
+function requireString(value: unknown) {
+  if (typeof value !== "string" || value.length === 0) {
+    throw new Error("PDS manifest contains an invalid string");
+  }
+  return value;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function isDomain(value: string) {
+  return (
+    value.length <= 253 &&
+    value.includes(".") &&
+    value.split(".").every((label) => {
+      return (
+        label.length >= 1 &&
+        label.length <= 63 &&
+        /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/.test(label)
+      );
+    })
+  );
+}
diff --git a/packages/decentralized-convex-address/src/index.ts b/packages/decentralized-convex-address/src/index.ts
index 397c5465..88774701 100644
--- a/packages/decentralized-convex-address/src/index.ts
+++ b/packages/decentralized-convex-address/src/index.ts
@@ -1,2 +1,15 @@
 export { addressToTarget, formatAddress, parseAddress } from "./address.ts";
 export type { DecentralizedAddress } from "./address.ts";
+export {
+  accountDomain,
+  decodeDnsTxtData,
+  discoverPds,
+  parsePdsTxtRecord,
+  PDS_DISCOVERY_VERSION,
+  PDS_DNS_LABEL,
+} from "./discovery.ts";
+export type {
+  DiscoverPdsOptions,
+  DiscoveredPds,
+  PdsManifest,
+} from "./discovery.ts";
diff --git a/packages/decentralized-convex-client/package.json b/packages/decentralized-convex-client/package.json
index 9d1fcae5..dce8f878 100644
--- a/packages/decentralized-convex-client/package.json
+++ b/packages/decentralized-convex-client/package.json
@@ -16,6 +16,8 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
+    "@decentralized-convex/address": "workspace:*",
+    "@decentralized-convex/plugin": "workspace:*",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
index d8af341a..ffe2317d 100644
--- a/packages/decentralized-convex-client/src/client.test.ts
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -1,7 +1,12 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
 import { makeFunctionReference } from "convex/server";
+import { v } from "convex/values";
 
 import type {
   FederationConnection,
@@ -9,6 +14,7 @@ import type {
   FederationQueryReference,
 } from "./types.ts";
 import { DecentralizedConvexClient } from "./client.ts";
+import { definePdsApi } from "./pds.ts";
 
 const listItems = makeFunctionReference<
   "query",
@@ -46,6 +52,44 @@ void test("groups identities by deployment and combines native query results", a
   await client.close();
 });
 
+void test("federates typed PDS requests without a generated backend API", async () => {
+  const notes = definePluginProtocol({
+    name: "notes",
+    mutations: {
+      create: defineOperation({
+        args: v.object({ body: v.string() }),
+        returns: v.object({ id: v.string() }),
+      }),
+    },
+    queries: {
+      list: defineOperation({
+        args: v.object({}),
+        returns: v.array(v.object({ body: v.string() })),
+      }),
+    },
+    version: "1",
+  });
+  const api = definePdsApi({ notes });
+  const client = new DecentralizedConvexClient({
+    connectionFactory: (url) => new MemoryConnection(url),
+  });
+
+  const snapshot = await client.pdsQuery({
+    request: api.notes.queries.list({}),
+    targets: [
+      { id: "alice@a.test", url: "https://a.test" },
+      { id: "bob@b.test", url: "https://b.test" },
+    ],
+  });
+
+  assert.equal(snapshot.status, "success");
+  assert.deepEqual(snapshot.data, [
+    { body: "https://a.test" },
+    { body: "https://b.test" },
+  ]);
+  await client.close();
+});
+
 class MemoryConnection implements FederationConnection {
   readonly #url;
 
@@ -67,11 +111,12 @@ class MemoryConnection implements FederationConnection {
     _query: Query,
     args: FunctionArgs<Query>,
   ): Promise<FunctionReturnType<Query>> {
+    const result = isPdsRequest(args)
+      ? [{ body: this.#url }]
+      : [{ id: this.#url, value: getScope(args) }];
     // The fake connection cannot derive a concrete return type from an arbitrary test reference.
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return Promise.resolve([
-      { id: this.#url, value: getScope(args) },
-    ]) as Promise<FunctionReturnType<Query>>;
+    return Promise.resolve(result) as Promise<FunctionReturnType<Query>>;
   }
 
   subscribe<Query extends FederationQueryReference>(
@@ -84,6 +129,15 @@ class MemoryConnection implements FederationConnection {
   }
 }
 
+function isPdsRequest(args: unknown) {
+  return (
+    typeof args === "object" &&
+    args !== null &&
+    "plugin" in args &&
+    typeof args.plugin === "string"
+  );
+}
+
 function getScope(args: unknown) {
   if (
     typeof args === "object" &&
diff --git a/packages/decentralized-convex-client/src/client.ts b/packages/decentralized-convex-client/src/client.ts
index 9e2802d8..939a661e 100644
--- a/packages/decentralized-convex-client/src/client.ts
+++ b/packages/decentralized-convex-client/src/client.ts
@@ -1,5 +1,12 @@
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
 
+import type {
+  AnyPdsMutationRequest,
+  AnyPdsQueryRequest,
+  DefaultCombinedPdsResult,
+  FederatedPdsQueryOptions,
+  PdsRequestResult,
+} from "./pds.ts";
 import type {
   FederatedQueryOptions,
   FederationClientOptions,
@@ -10,6 +17,8 @@ import type {
 } from "./types.ts";
 import { createConvexFederationConnection } from "./connection.ts";
 import { FederatedQueryObserver } from "./observer.ts";
+import { FederatedPdsQueryObserver } from "./pds-observer.ts";
+import { PdsClient } from "./pds.ts";
 import { createFederatedSnapshot } from "./snapshot.ts";
 import { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 
@@ -32,6 +41,15 @@ export class DecentralizedConvexClient {
     );
   }
 
+  watchPdsQuery<
+    Request extends AnyPdsQueryRequest,
+    Combined = DefaultCombinedPdsResult<Request>,
+  >(options: FederatedPdsQueryOptions<Request, Combined>) {
+    return new FederatedPdsQueryObserver(options, (url) =>
+      this.#getConnection(url),
+    );
+  }
+
   async query<Query extends FederationQueryReference, Combined>(
     options: FederatedQueryOptions<Query, Combined>,
   ) {
@@ -63,6 +81,37 @@ export class DecentralizedConvexClient {
     );
   }
 
+  async pdsQuery<
+    Request extends AnyPdsQueryRequest,
+    Combined = DefaultCombinedPdsResult<Request>,
+  >(options: FederatedPdsQueryOptions<Request, Combined>) {
+    const groups = groupFederationTargets(options.targets);
+    const settled = await Promise.all(
+      groups.map(async (target) => {
+        const request =
+          typeof options.request === "function"
+            ? options.request(target)
+            : options.request;
+        try {
+          const data = await new PdsClient({
+            connection: this.#getConnection(target.url),
+          }).query(request);
+          return { data, status: "live" as const, target };
+        } catch (error) {
+          return {
+            error: toError(error),
+            status: "error" as const,
+            target,
+          };
+        }
+      }),
+    );
+    return createFederatedSnapshot<PdsRequestResult<Request>, Combined>(
+      settled,
+      options.combine,
+    );
+  }
+
   mutation<Mutation extends FederationMutationReference>(
     target: FederationTarget,
     mutation: Mutation,
@@ -71,6 +120,15 @@ export class DecentralizedConvexClient {
     return this.#getConnection(target.url).mutation(mutation, args);
   }
 
+  pdsMutation<Request extends AnyPdsMutationRequest>(
+    target: FederationTarget,
+    request: Request,
+  ): Promise<PdsRequestResult<Request>> {
+    return new PdsClient({
+      connection: this.#getConnection(target.url),
+    }).mutation(request);
+  }
+
   async close() {
     await Promise.all(
       [...this.#connections.values()].map((connection) => connection.close()),
diff --git a/packages/decentralized-convex-client/src/connection.ts b/packages/decentralized-convex-client/src/connection.ts
index 657a9063..4127a5a9 100644
--- a/packages/decentralized-convex-client/src/connection.ts
+++ b/packages/decentralized-convex-client/src/connection.ts
@@ -1,6 +1,7 @@
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
 import { ConvexClient } from "convex/browser";
 
+import type { PdsConnection } from "./pds.ts";
 import type {
   FederationAuthTokenFetcher,
   FederationConnection,
@@ -54,3 +55,10 @@ export function createConvexFederationConnection(
 ): FederationConnection {
   return new ConvexFederationConnection(url, getAuthToken);
 }
+
+export function createConvexPdsConnection(
+  url: string,
+  getAuthToken?: FederationAuthTokenFetcher,
+): PdsConnection {
+  return new ConvexFederationConnection(url, getAuthToken);
+}
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 0709edd7..4e965694 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -1,5 +1,21 @@
 export { DecentralizedConvexClient } from "./client.ts";
+export {
+  accountDomain,
+  decodeDnsTxtData,
+  discoverPds,
+  parsePdsTxtRecord,
+  PDS_DISCOVERY_VERSION,
+  PDS_DNS_LABEL,
+} from "@decentralized-convex/address";
+export type {
+  DiscoverPdsOptions,
+  DiscoveredPds,
+  PdsManifest,
+} from "@decentralized-convex/address";
+export { createConvexPdsConnection } from "./connection.ts";
+export { definePdsApi, pdsFunctions, PdsClient } from "./pds.ts";
 export { FederatedQueryObserver } from "./observer.ts";
+export { FederatedPdsQueryObserver } from "./pds-observer.ts";
 export { defaultCombine } from "./snapshot.ts";
 export { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 export type {
@@ -21,3 +37,15 @@ export type {
   FederationTargetGroup,
   SuccessfulFederationSource,
 } from "./types.ts";
+export type {
+  AnyPdsMutationRequest,
+  AnyPdsQueryRequest,
+  BoundPdsApi,
+  DefaultCombinedPdsResult,
+  FederatedPdsQueryOptions,
+  PdsApi,
+  PdsConnection,
+  PdsPluginApi,
+  PdsRequest,
+  PdsRequestResult,
+} from "./pds.ts";
diff --git a/packages/decentralized-convex-client/src/pds-observer.ts b/packages/decentralized-convex-client/src/pds-observer.ts
new file mode 100644
index 00000000..352a91f9
--- /dev/null
+++ b/packages/decentralized-convex-client/src/pds-observer.ts
@@ -0,0 +1,87 @@
+import type {
+  AnyPdsQueryRequest,
+  FederatedPdsQueryOptions,
+  PdsConnection,
+  PdsRequestResult,
+} from "./pds.ts";
+import type {
+  FederatedQuerySnapshot,
+  FederationSourceSnapshot,
+} from "./types.ts";
+import { PdsClient } from "./pds.ts";
+import { createFederatedSnapshot } from "./snapshot.ts";
+import { groupFederationTargets } from "./targets.ts";
+
+export class FederatedPdsQueryObserver<
+  Request extends AnyPdsQueryRequest,
+  Combined,
+> {
+  readonly #listeners = new Set<() => void>();
+  readonly #options;
+  readonly #sources = new Map<
+    string,
+    FederationSourceSnapshot<PdsRequestResult<Request>>
+  >();
+  readonly #unsubscribes: (() => void)[] = [];
+  #closed = false;
+  #snapshot: FederatedQuerySnapshot<Combined, PdsRequestResult<Request>>;
+
+  constructor(
+    options: FederatedPdsQueryOptions<Request, Combined>,
+    getConnection: (url: string) => PdsConnection,
+  ) {
+    this.#options = options;
+    const targets = groupFederationTargets(options.targets);
+    for (const target of targets) {
+      this.#sources.set(target.url, { status: "pending", target });
+    }
+    this.#snapshot = createFederatedSnapshot(
+      [...this.#sources.values()],
+      options.combine,
+    );
+
+    for (const target of targets) {
+      const request =
+        typeof options.request === "function"
+          ? options.request(target)
+          : options.request;
+      const client = new PdsClient({ connection: getConnection(target.url) });
+      const unsubscribe = client.watchQuery(
+        request,
+        (data) => this.#update(target.url, { data, status: "live" }),
+        (error) => this.#update(target.url, { error, status: "error" }),
+      );
+      this.#unsubscribes.push(unsubscribe);
+    }
+  }
+
+  getSnapshot = () => this.#snapshot;
+
+  subscribe = (listener: () => void) => {
+    this.#listeners.add(listener);
+    return () => this.#listeners.delete(listener);
+  };
+
+  close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    for (const unsubscribe of this.#unsubscribes) unsubscribe();
+    this.#unsubscribes.length = 0;
+    this.#listeners.clear();
+  }
+
+  #update(
+    url: string,
+    patch: Partial<FederationSourceSnapshot<PdsRequestResult<Request>>>,
+  ) {
+    if (this.#closed) return;
+    const source = this.#sources.get(url);
+    if (source === undefined) return;
+    this.#sources.set(url, { ...source, ...patch });
+    this.#snapshot = createFederatedSnapshot(
+      [...this.#sources.values()],
+      this.#options.combine,
+    );
+    for (const listener of this.#listeners) listener();
+  }
+}
diff --git a/packages/decentralized-convex-client/src/pds.test.ts b/packages/decentralized-convex-client/src/pds.test.ts
new file mode 100644
index 00000000..efedd685
--- /dev/null
+++ b/packages/decentralized-convex-client/src/pds.test.ts
@@ -0,0 +1,85 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { getFunctionName } from "convex/server";
+import { v } from "convex/values";
+
+import type { PdsConnection } from "./pds.ts";
+import { definePdsApi, PdsClient, pdsFunctions } from "./pds.ts";
+
+const notes = definePluginProtocol({
+  name: "notes",
+  mutations: {
+    create: defineOperation({
+      args: v.object({ body: v.string() }),
+      returns: v.object({ id: v.string() }),
+    }),
+  },
+  queries: {
+    list: defineOperation({
+      args: v.object({ owner: v.string() }),
+      returns: v.array(v.object({ body: v.string(), id: v.string() })),
+    }),
+  },
+  version: "1",
+});
+
+void test("builds serializable PDS dispatcher requests", () => {
+  const api = definePdsApi({ notes });
+
+  assert.deepEqual(api.notes.queries.list({ owner: "shawn" }), {
+    operation: { args: { owner: "shawn" }, type: "list" },
+    plugin: "notes",
+    version: "1",
+  });
+  assert.deepEqual(api.notes.mutations.create({ body: "hello" }), {
+    operation: { args: { body: "hello" }, type: "create" },
+    plugin: "notes",
+    version: "1",
+  });
+});
+
+void test("binds protocols to canonical typed PDS calls", async () => {
+  const calls: unknown[] = [];
+  const connection: PdsConnection = {
+    close: () => Promise.resolve(),
+    mutation: (_mutation, args) => {
+      calls.push(args);
+      return Promise.resolve({ id: "note-1" });
+    },
+    query: (_query, args) => {
+      calls.push(args);
+      return Promise.resolve([{ body: "hello", id: "note-1" }]);
+    },
+    subscribe: (_query, args, onResult) => {
+      calls.push(args);
+      onResult([{ body: "live", id: "note-2" }]);
+      return () => undefined;
+    },
+  };
+  const client = new PdsClient({ connection });
+  const api = client.bind(definePdsApi({ notes }));
+
+  assert.equal(getFunctionName(pdsFunctions.query), "pds:dispatchQuery");
+  assert.equal(getFunctionName(pdsFunctions.mutation), "pds:dispatchMutation");
+  assert.deepEqual(await api.notes.mutation.create({ body: "hello" }), {
+    id: "note-1",
+  });
+  assert.deepEqual(await api.notes.query.list({ owner: "shawn" }), [
+    { body: "hello", id: "note-1" },
+  ]);
+
+  let live: unknown;
+  api.notes.watch.list(
+    { owner: "shawn" },
+    (result) => {
+      live = result;
+    },
+    assert.fail,
+  );
+  assert.deepEqual(live, [{ body: "live", id: "note-2" }]);
+  assert.equal(calls.length, 3);
+});
diff --git a/packages/decentralized-convex-client/src/pds.ts b/packages/decentralized-convex-client/src/pds.ts
new file mode 100644
index 00000000..d40760d8
--- /dev/null
+++ b/packages/decentralized-convex-client/src/pds.ts
@@ -0,0 +1,341 @@
+import type {
+  AnyPluginProtocol,
+  OperationArgs,
+  OperationMap,
+  OperationResult,
+} from "@decentralized-convex/plugin";
+import type { FunctionReference, FunctionReturnType } from "convex/server";
+import { makeFunctionReference } from "convex/server";
+
+import type {
+  FederationTarget,
+  FederationTargetGroup,
+  SuccessfulFederationSource,
+} from "./types.ts";
+
+declare const PdsResultType: unique symbol;
+
+interface SerializedPdsRequest {
+  readonly [key: string]: unknown;
+  readonly operation: {
+    readonly args: Record<string, unknown>;
+    readonly type: string;
+  };
+  readonly plugin: string;
+  readonly version: string;
+}
+
+export interface PdsRequest<
+  Result,
+  Kind extends "mutation" | "query",
+> extends SerializedPdsRequest {
+  readonly [PdsResultType]?: {
+    readonly kind: Kind;
+    readonly result: Result;
+  };
+}
+
+export type AnyPdsQueryRequest = PdsRequest<unknown, "query">;
+export type AnyPdsMutationRequest = PdsRequest<unknown, "mutation">;
+
+export type PdsRequestResult<Request> =
+  Request extends PdsRequest<infer Result, "mutation" | "query">
+    ? Result
+    : never;
+
+export type DefaultCombinedPdsResult<Request extends AnyPdsQueryRequest> =
+  PdsRequestResult<Request> extends readonly (infer Item)[]
+    ? Item[]
+    : PdsRequestResult<Request>[];
+
+export interface FederatedPdsQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Combined = DefaultCombinedPdsResult<Request>,
+> {
+  combine?: (
+    sources: readonly SuccessfulFederationSource<PdsRequestResult<Request>>[],
+  ) => Combined;
+  request: Request | ((target: FederationTargetGroup) => Request);
+  targets: readonly FederationTarget[];
+}
+
+type OperationRequestBuilders<
+  PluginName extends string,
+  PluginVersion extends string,
+  Operations extends OperationMap,
+  Kind extends "mutation" | "query",
+> = {
+  readonly [Name in keyof Operations]: (
+    args: OperationArgs<Operations[Name]>,
+  ) => PdsRequest<OperationResult<Operations[Name]>, Kind> & {
+    readonly operation: {
+      readonly args: OperationArgs<Operations[Name]>;
+      readonly type: Name;
+    };
+    readonly plugin: PluginName;
+    readonly version: PluginVersion;
+  };
+};
+
+export interface PdsPluginApi<Protocol extends AnyPluginProtocol> {
+  readonly mutations: OperationRequestBuilders<
+    Protocol["name"],
+    Protocol["version"],
+    Protocol["mutations"],
+    "mutation"
+  >;
+  readonly queries: OperationRequestBuilders<
+    Protocol["name"],
+    Protocol["version"],
+    Protocol["queries"],
+    "query"
+  >;
+}
+
+export type PdsApi<
+  Protocols extends Readonly<Record<string, AnyPluginProtocol>>,
+> = {
+  readonly [Name in keyof Protocols]: PdsPluginApi<Protocols[Name]>;
+};
+
+export function definePdsApi<
+  const Protocols extends Readonly<Record<string, AnyPluginProtocol>>,
+>(protocols: Protocols): PdsApi<Protocols> {
+  const api = Object.fromEntries(
+    Object.entries(protocols).map(([name, protocol]) => [
+      name,
+      {
+        mutations: defineRequestBuilders(
+          protocol.name,
+          protocol.version,
+          protocol.mutations,
+        ),
+        queries: defineRequestBuilders(
+          protocol.name,
+          protocol.version,
+          protocol.queries,
+        ),
+      },
+    ]),
+  );
+
+  // The runtime object is constructed from the exact protocol map supplied by the caller.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return api as PdsApi<Protocols>;
+}
+
+type RootQuery = FunctionReference<
+  "query",
+  "public",
+  SerializedPdsRequest,
+  unknown
+>;
+
+type RootMutation = FunctionReference<
+  "mutation",
+  "public",
+  SerializedPdsRequest,
+  unknown
+>;
+
+export const pdsFunctions = Object.freeze({
+  mutation: makeFunctionReference<"mutation", SerializedPdsRequest, unknown>(
+    "pds:dispatchMutation",
+  ),
+  query: makeFunctionReference<"query", SerializedPdsRequest, unknown>(
+    "pds:dispatchQuery",
+  ),
+});
+
+export interface PdsConnection {
+  close(): Promise<void>;
+  mutation<Mutation extends RootMutation>(
+    mutation: Mutation,
+    args: SerializedPdsRequest,
+  ): Promise<FunctionReturnType<Mutation>>;
+  query<Query extends RootQuery>(
+    query: Query,
+    args: SerializedPdsRequest,
+  ): Promise<FunctionReturnType<Query>>;
+  subscribe<Query extends RootQuery>(
+    query: Query,
+    args: SerializedPdsRequest,
+    onResult: (result: FunctionReturnType<Query>) => void,
+    onError: (error: Error) => void,
+  ): () => void;
+}
+
+export class PdsClient {
+  readonly #connection;
+  readonly #mutation;
+  readonly #query;
+
+  constructor(options: {
+    readonly connection: PdsConnection;
+    readonly mutation?: RootMutation;
+    readonly query?: RootQuery;
+  }) {
+    this.#connection = options.connection;
+    this.#mutation = options.mutation ?? pdsFunctions.mutation;
+    this.#query = options.query ?? pdsFunctions.query;
+  }
+
+  mutation<Request extends AnyPdsMutationRequest>(
+    request: Request,
+  ): Promise<PdsRequestResult<Request>> {
+    // The request's phantom result is defined by the same protocol that created its payload.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return this.#connection.mutation(this.#mutation, request) as Promise<
+      PdsRequestResult<Request>
+    >;
+  }
+
+  query<Request extends AnyPdsQueryRequest>(
+    request: Request,
+  ): Promise<PdsRequestResult<Request>> {
+    // The request's phantom result is defined by the same protocol that created its payload.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return this.#connection.query(this.#query, request) as Promise<
+      PdsRequestResult<Request>
+    >;
+  }
+
+  watchQuery<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    onResult: (result: PdsRequestResult<Request>) => void,
+    onError: (error: Error) => void,
+  ) {
+    return this.#connection.subscribe(
+      this.#query,
+      request,
+      // The subscription uses the same typed request and root query as the point query path.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      (result) => onResult(result as PdsRequestResult<Request>),
+      onError,
+    );
+  }
+
+  bind<const Api extends BindablePdsApi>(api: Api): BoundPdsApi<Api> {
+    const bound = Object.fromEntries(
+      Object.entries(api).map(([name, plugin]) => [
+        name,
+        {
+          mutation: bindRequests(plugin.mutations, (request) =>
+            this.mutation(request),
+          ),
+          query: bindRequests(plugin.queries, (request) => this.query(request)),
+          watch: bindWatches(plugin.queries, this),
+        },
+      ]),
+    );
+
+    // The bound methods are constructed directly from every request builder in the supplied API.
+    const erased: unknown = bound;
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return erased as BoundPdsApi<Api>;
+  }
+}
+
+function defineRequestBuilders(
+  plugin: string,
+  version: string,
+  operations: OperationMap,
+): Readonly<
+  Record<string, (args: Record<string, unknown>) => SerializedPdsRequest>
+> {
+  return Object.freeze(
+    Object.fromEntries(
+      Object.keys(operations).map((type) => [
+        type,
+        (args: Record<string, unknown>) => ({
+          operation: { args, type },
+          plugin,
+          version,
+        }),
+      ]),
+    ),
+  );
+}
+
+type MutationRequestBuilder = (...args: never[]) => AnyPdsMutationRequest;
+type QueryRequestBuilder = (...args: never[]) => AnyPdsQueryRequest;
+
+interface BindablePdsPlugin {
+  readonly mutations: Readonly<Record<string, MutationRequestBuilder>>;
+  readonly queries: Readonly<Record<string, QueryRequestBuilder>>;
+}
+
+type BindablePdsApi = Readonly<Record<string, BindablePdsPlugin>>;
+
+type BoundRequests<
+  Builders extends Readonly<
+    Record<string, MutationRequestBuilder | QueryRequestBuilder>
+  >,
+> = {
+  readonly [Name in keyof Builders]: (
+    args: Parameters<Builders[Name]>[0],
+  ) => Promise<PdsRequestResult<ReturnType<Builders[Name]>>>;
+};
+
+type BoundWatches<
+  Builders extends Readonly<Record<string, QueryRequestBuilder>>,
+> = {
+  readonly [Name in keyof Builders]: (
+    args: Parameters<Builders[Name]>[0],
+    onResult: (result: PdsRequestResult<ReturnType<Builders[Name]>>) => void,
+    onError: (error: Error) => void,
+  ) => () => void;
+};
+
+export type BoundPdsApi<Api extends BindablePdsApi> = {
+  readonly [PluginName in keyof Api]: {
+    readonly mutation: BoundRequests<Api[PluginName]["mutations"]>;
+    readonly query: BoundRequests<Api[PluginName]["queries"]>;
+    readonly watch: BoundWatches<Api[PluginName]["queries"]>;
+  };
+};
+
+function bindRequests<
+  const Builders extends Readonly<
+    Record<string, MutationRequestBuilder | QueryRequestBuilder>
+  >,
+>(
+  builders: Builders,
+  execute: (request: ReturnType<Builders[keyof Builders]>) => Promise<unknown>,
+) {
+  return Object.fromEntries(
+    Object.entries(builders).map(([name, build]) => {
+      // Object.entries erases each operation's argument type after BoundRequests captures it.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      const buildRequest = build as (
+        args: Record<string, unknown>,
+      ) => ReturnType<Builders[keyof Builders]>;
+      return [
+        name,
+        (args: Record<string, unknown>) => execute(buildRequest(args)),
+      ];
+    }),
+  );
+}
+
+function bindWatches<
+  const Builders extends Readonly<Record<string, QueryRequestBuilder>>,
+>(builders: Builders, client: PdsClient) {
+  return Object.fromEntries(
+    Object.entries(builders).map(([name, build]) => {
+      // Object.entries erases each operation's argument type after BoundWatches captures it.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      const buildRequest = build as (
+        args: Record<string, unknown>,
+      ) => ReturnType<Builders[keyof Builders]>;
+      return [
+        name,
+        (
+          args: Record<string, unknown>,
+          onResult: (result: unknown) => void,
+          onError: (error: Error) => void,
+        ) => client.watchQuery(buildRequest(args), onResult, onError),
+      ];
+    }),
+  );
+}
diff --git a/packages/decentralized-convex-client/src/pds.type-test.ts b/packages/decentralized-convex-client/src/pds.type-test.ts
new file mode 100644
index 00000000..74679313
--- /dev/null
+++ b/packages/decentralized-convex-client/src/pds.type-test.ts
@@ -0,0 +1,68 @@
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { v } from "convex/values";
+
+import type { DecentralizedConvexClient } from "./client.ts";
+import type { PdsClient, PdsRequestResult } from "./pds.ts";
+import type { FederatedQuerySnapshot } from "./types.ts";
+import { definePdsApi } from "./pds.ts";
+
+const messaging = definePluginProtocol({
+  name: "messaging",
+  mutations: {
+    sendMessage: defineOperation({
+      args: v.object({ body: v.string() }),
+      returns: v.object({ messageId: v.string() }),
+    }),
+  },
+  queries: {
+    listMessages: defineOperation({
+      args: v.object({ conversationId: v.string() }),
+      returns: v.array(v.object({ body: v.string() })),
+    }),
+  },
+  version: "1",
+});
+
+const api = definePdsApi({ messaging });
+declare const client: PdsClient;
+const bound = client.bind(api);
+const send = api.messaging.mutations.sendMessage({ body: "hello" });
+const list = api.messaging.queries.listMessages({ conversationId: "general" });
+void send;
+void list;
+
+const boundSendResult: Promise<{ messageId: string }> =
+  bound.messaging.mutation.sendMessage({ body: "hello" });
+const boundListResult: Promise<{ body: string }[]> =
+  bound.messaging.query.listMessages({ conversationId: "general" });
+void boundSendResult;
+void boundListResult;
+
+declare const federationClient: DecentralizedConvexClient;
+const federatedListResult: Promise<
+  FederatedQuerySnapshot<{ body: string }[], { body: string }[]>
+> = federationClient.pdsQuery({
+  request: list,
+  targets: [{ id: "shawn@example.com", url: "https://pds.example.com" }],
+});
+void federatedListResult;
+
+const sendResult: PdsRequestResult<typeof send> = { messageId: "message-1" };
+const listResult: PdsRequestResult<typeof list> = [{ body: "hello" }];
+void sendResult;
+void listResult;
+
+// @ts-expect-error -- the operation requires a string body.
+api.messaging.mutations.sendMessage({ body: 42 });
+
+type MessagingQueryName = keyof typeof api.messaging.queries;
+// @ts-expect-error -- this operation is not part of the messaging contract.
+const missingOperation: MessagingQueryName = "getProfile";
+void missingOperation;
+
+// @ts-expect-error -- sendMessage returns a message ID, not a message list.
+const incorrectResult: PdsRequestResult<typeof send> = [{ body: "hello" }];
+void incorrectResult;
diff --git a/packages/decentralized-convex-messages/README.md b/packages/decentralized-convex-messages/README.md
new file mode 100644
index 00000000..cc12ed0a
--- /dev/null
+++ b/packages/decentralized-convex-messages/README.md
@@ -0,0 +1,11 @@
+# `@decentralized-convex/messages`
+
+The product-agnostic messaging Component used by Vera and any other compatible
+decentralized Convex client. The host PDS owns authentication; the Component
+owns message storage and derives authorship from the forwarded identity.
+
+```ts
+import messages from "@decentralized-convex/messages/convex.config";
+
+app.use(messages);
+```
diff --git a/packages/decentralized-convex-messages/_generated/api.ts b/packages/decentralized-convex-messages/_generated/api.ts
new file mode 100644
index 00000000..4940cc5b
--- /dev/null
+++ b/packages/decentralized-convex-messages/_generated/api.ts
@@ -0,0 +1,54 @@
+/* eslint-disable */
+/**
+ * Generated `api` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type * as dispatcher from "../dispatcher.js";
+import type * as index from "../index.js";
+import type * as protocol from "../protocol.js";
+
+import type {
+  ApiFromModules,
+  FilterApi,
+  FunctionReference,
+} from "convex/server";
+import { anyApi, componentsGeneric } from "convex/server";
+
+const fullApi: ApiFromModules<{
+  dispatcher: typeof dispatcher;
+  index: typeof index;
+  protocol: typeof protocol;
+}> = anyApi as any;
+
+/**
+ * A utility for referencing Convex functions in your app's public API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = api.myModule.myFunction;
+ * ```
+ */
+export const api: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "public">
+> = anyApi as any;
+
+/**
+ * A utility for referencing Convex functions in your app's internal API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = internal.myModule.myFunction;
+ * ```
+ */
+export const internal: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "internal">
+> = anyApi as any;
+
+export const components = componentsGeneric() as unknown as {};
diff --git a/packages/decentralized-convex-messages/_generated/component.ts b/packages/decentralized-convex-messages/_generated/component.ts
new file mode 100644
index 00000000..080f1b3e
--- /dev/null
+++ b/packages/decentralized-convex-messages/_generated/component.ts
@@ -0,0 +1,87 @@
+/* eslint-disable */
+/**
+ * Generated `ComponentApi` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type { FunctionReference } from "convex/server";
+
+/**
+ * A utility for referencing a Convex component's exposed API.
+ *
+ * Useful when expecting a parameter like `components.myComponent`.
+ * Usage:
+ * ```ts
+ * async function myFunction(ctx: QueryCtx, component: ComponentApi) {
+ *   return ctx.runQuery(component.someFile.someQuery, { ...args });
+ * }
+ * ```
+ */
+export type ComponentApi<Name extends string | undefined = string | undefined> =
+  {
+    dispatcher: {
+      dispatchMutation: FunctionReference<
+        "mutation",
+        "internal",
+        {
+          identity: null | {
+            accountId?: string;
+            email?: string;
+            issuer: string;
+            name?: string;
+            subject: string;
+            tokenIdentifier: string;
+          };
+          operation: {
+            args: { body: string; conversationId: string; messageId: string };
+            type: "send";
+          };
+          version: "1";
+        },
+        {
+          type: "send";
+          value: {
+            authorId: string;
+            authorName: string;
+            body: string;
+            conversationId: string;
+            messageId: string;
+            sentAt: number;
+          };
+        },
+        Name
+      >;
+      dispatchQuery: FunctionReference<
+        "query",
+        "internal",
+        {
+          identity: null | {
+            accountId?: string;
+            email?: string;
+            issuer: string;
+            name?: string;
+            subject: string;
+            tokenIdentifier: string;
+          };
+          operation: { args: { conversationId: string }; type: "list" };
+          version: "1";
+        },
+        {
+          type: "list";
+          value: Array<{
+            authorId: string;
+            authorName: string;
+            body: string;
+            conversationId: string;
+            messageId: string;
+            sentAt: number;
+          }>;
+        },
+        Name
+      >;
+    };
+  };
diff --git a/packages/decentralized-convex-messages/_generated/dataModel.ts b/packages/decentralized-convex-messages/_generated/dataModel.ts
new file mode 100644
index 00000000..f97fd194
--- /dev/null
+++ b/packages/decentralized-convex-messages/_generated/dataModel.ts
@@ -0,0 +1,60 @@
+/* eslint-disable */
+/**
+ * Generated data model types.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type {
+  DataModelFromSchemaDefinition,
+  DocumentByName,
+  TableNamesInDataModel,
+  SystemTableNames,
+} from "convex/server";
+import type { GenericId } from "convex/values";
+import schema from "../schema.js";
+
+/**
+ * The names of all of your Convex tables.
+ */
+export type TableNames = TableNamesInDataModel<DataModel>;
+
+/**
+ * The type of a document stored in Convex.
+ *
+ * @typeParam TableName - A string literal type of the table name (like "users").
+ */
+export type Doc<TableName extends TableNames> = DocumentByName<
+  DataModel,
+  TableName
+>;
+
+/**
+ * An identifier for a document in Convex.
+ *
+ * Convex documents are uniquely identified by their `Id`, which is accessible
+ * on the `_id` field. To learn more, see [Document IDs](https://docs.convex.dev/using/document-ids).
+ *
+ * Documents can be loaded using `db.get(tableName, id)` in query and mutation functions.
+ *
+ * IDs are just strings at runtime, but this type can be used to distinguish them from other
+ * strings when type checking.
+ *
+ * @typeParam TableName - A string literal type of the table name (like "users").
+ */
+export type Id<TableName extends TableNames | SystemTableNames> =
+  GenericId<TableName>;
+
+/**
+ * A type describing your Convex data model.
+ *
+ * This type includes information about what tables you have, the type of
+ * documents stored in those tables, and the indexes defined on them.
+ *
+ * This type is used to parameterize methods like `queryGeneric` and
+ * `mutationGeneric` to make them type-safe.
+ */
+export type DataModel = DataModelFromSchemaDefinition<typeof schema>;
diff --git a/packages/decentralized-convex-messages/_generated/server.ts b/packages/decentralized-convex-messages/_generated/server.ts
new file mode 100644
index 00000000..739b02f7
--- /dev/null
+++ b/packages/decentralized-convex-messages/_generated/server.ts
@@ -0,0 +1,156 @@
+/* eslint-disable */
+/**
+ * Generated utilities for implementing server-side Convex query and mutation functions.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type {
+  ActionBuilder,
+  HttpActionBuilder,
+  MutationBuilder,
+  QueryBuilder,
+  GenericActionCtx,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  GenericDatabaseReader,
+  GenericDatabaseWriter,
+} from "convex/server";
+import {
+  actionGeneric,
+  httpActionGeneric,
+  queryGeneric,
+  mutationGeneric,
+  internalActionGeneric,
+  internalMutationGeneric,
+  internalQueryGeneric,
+} from "convex/server";
+import type { DataModel } from "./dataModel.js";
+
+/**
+ * Define a query in this Convex app's public API.
+ *
+ * This function will be allowed to read your Convex database and will be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export const query: QueryBuilder<DataModel, "public"> = queryGeneric;
+
+/**
+ * Define a query that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to read from your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The query function. It receives a {@link QueryCtx} as its first argument.
+ * @returns The wrapped query. Include this as an `export` to name it and make it accessible.
+ */
+export const internalQuery: QueryBuilder<DataModel, "internal"> =
+  internalQueryGeneric;
+
+/**
+ * Define a mutation in this Convex app's public API.
+ *
+ * This function will be allowed to modify your Convex database and will be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export const mutation: MutationBuilder<DataModel, "public"> = mutationGeneric;
+
+/**
+ * Define a mutation that is only accessible from other Convex functions (but not from the client).
+ *
+ * This function will be allowed to modify your Convex database. It will not be accessible from the client.
+ *
+ * @param func - The mutation function. It receives a {@link MutationCtx} as its first argument.
+ * @returns The wrapped mutation. Include this as an `export` to name it and make it accessible.
+ */
+export const internalMutation: MutationBuilder<DataModel, "internal"> =
+  internalMutationGeneric;
+
+/**
+ * Define an action in this Convex app's public API.
+ *
+ * An action is a function which can execute any JavaScript code, including non-deterministic
+ * code and code with side-effects, like calling third-party services.
+ * They can be run in Convex's JavaScript environment or in Node.js using the "use node" directive.
+ * They can interact with the database indirectly by calling queries and mutations using the {@link ActionCtx}.
+ *
+ * @param func - The action. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped action. Include this as an `export` to name it and make it accessible.
+ */
+export const action: ActionBuilder<DataModel, "public"> = actionGeneric;
+
+/**
+ * Define an action that is only accessible from other Convex functions (but not from the client).
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument.
+ * @returns The wrapped function. Include this as an `export` to name it and make it accessible.
+ */
+export const internalAction: ActionBuilder<DataModel, "internal"> =
+  internalActionGeneric;
+
+/**
+ * Define an HTTP action.
+ *
+ * The wrapped function will be used to respond to HTTP requests received
+ * by a Convex deployment if the requests matches the path and method where
+ * this action is routed. Be sure to route your httpAction in `convex/http.js`.
+ *
+ * @param func - The function. It receives an {@link ActionCtx} as its first argument
+ * and a Fetch API `Request` object as its second.
+ * @returns The wrapped function. Import this function from `convex/http.js` and route it to hook it up.
+ */
+export const httpAction: HttpActionBuilder = httpActionGeneric;
+
+/**
+ * A set of services for use within Convex query functions.
+ *
+ * The query context is passed as the first argument to any Convex query
+ * function run on the server.
+ *
+ * If you're using code generation, use the `QueryCtx` type in `convex/_generated/server.d.ts` instead.
+ */
+export type QueryCtx = GenericQueryCtx<DataModel>;
+
+/**
+ * A set of services for use within Convex mutation functions.
+ *
+ * The mutation context is passed as the first argument to any Convex mutation
+ * function run on the server.
+ *
+ * If you're using code generation, use the `MutationCtx` type in `convex/_generated/server.d.ts` instead.
+ */
+export type MutationCtx = GenericMutationCtx<DataModel>;
+
+/**
+ * A set of services for use within Convex action functions.
+ *
+ * The action context is passed as the first argument to any Convex action
+ * function run on the server.
+ */
+export type ActionCtx = GenericActionCtx<DataModel>;
+
+/**
+ * An interface to read from the database within Convex query functions.
+ *
+ * The two entry points are {@link DatabaseReader.get}, which fetches a single
+ * document by its {@link Id}, or {@link DatabaseReader.query}, which starts
+ * building a query.
+ */
+export type DatabaseReader = GenericDatabaseReader<DataModel>;
+
+/**
+ * An interface to read from and write to the database within Convex mutation
+ * functions.
+ *
+ * Convex guarantees that all writes within a single mutation are
+ * executed atomically, so you never have to worry about partial writes leaving
+ * your data in an inconsistent state. See [the Convex Guide](https://docs.convex.dev/understanding/convex-fundamentals/functions#atomicity-and-optimistic-concurrency-control)
+ * for the guarantees Convex provides your functions.
+ */
+export type DatabaseWriter = GenericDatabaseWriter<DataModel>;
diff --git a/packages/decentralized-convex-messages/convex.config.ts b/packages/decentralized-convex-messages/convex.config.ts
new file mode 100644
index 00000000..348fe775
--- /dev/null
+++ b/packages/decentralized-convex-messages/convex.config.ts
@@ -0,0 +1,5 @@
+import { defineComponent } from "convex/server";
+
+import { messagesProtocol } from "./protocol.ts";
+
+export default defineComponent(messagesProtocol.name);
diff --git a/packages/decentralized-convex-messages/dispatcher.ts b/packages/decentralized-convex-messages/dispatcher.ts
new file mode 100644
index 00000000..d92525f4
--- /dev/null
+++ b/packages/decentralized-convex-messages/dispatcher.ts
@@ -0,0 +1,90 @@
+import { defineComponentDispatchers } from "@decentralized-convex/server";
+import { ConvexError } from "convex/values";
+
+import { mutation, query } from "./_generated/server.js";
+import { messagesProtocol } from "./protocol.ts";
+
+export const { dispatchMutation, dispatchQuery } = defineComponentDispatchers({
+  handlers: {
+    mutations: {
+      send: async (ctx, { args, identity }) => {
+        const authorId = requireAccountId(identity);
+        const body = args.body.trim();
+        if (body.length === 0 || body.length > 4_000) {
+          throw new ConvexError({ code: "INVALID_MESSAGE_BODY" });
+        }
+
+        const existing = await ctx.db
+          .query("messages")
+          .withIndex("by_message", (index) =>
+            index.eq("messageId", args.messageId),
+          )
+          .unique();
+        if (existing !== null) return toMessage(existing);
+
+        const message = {
+          authorId,
+          authorName:
+            identity?.name?.trim() ?? authorId.split("@")[0] ?? authorId,
+          body,
+          conversationId: args.conversationId,
+          messageId: args.messageId,
+          sentAt: Date.now(),
+        };
+        await ctx.db.insert("messages", message);
+        return message;
+      },
+    },
+    queries: {
+      list: async (ctx, { args, identity }) => {
+        requireAccountId(identity);
+        const messages = await ctx.db
+          .query("messages")
+          .withIndex("by_conversation", (index) =>
+            index.eq("conversationId", args.conversationId),
+          )
+          .collect();
+        return messages
+          .map(toMessage)
+          .sort(
+            (left, right) =>
+              left.sentAt - right.sentAt ||
+              left.messageId.localeCompare(right.messageId),
+          );
+      },
+    },
+  },
+  mutation,
+  protocol: messagesProtocol,
+  query,
+});
+
+function requireAccountId(
+  identity: null | { accountId?: string; email?: string },
+) {
+  const accountId = (identity?.accountId ?? identity?.email)
+    ?.trim()
+    .toLowerCase();
+  if (accountId?.includes("@") !== true) {
+    throw new ConvexError({ code: "AUTHENTICATED_ACCOUNT_REQUIRED" });
+  }
+  return accountId;
+}
+
+function toMessage(message: {
+  authorId: string;
+  authorName: string;
+  body: string;
+  conversationId: string;
+  messageId: string;
+  sentAt: number;
+}) {
+  return {
+    authorId: message.authorId,
+    authorName: message.authorName,
+    body: message.body,
+    conversationId: message.conversationId,
+    messageId: message.messageId,
+    sentAt: message.sentAt,
+  };
+}
diff --git a/packages/decentralized-convex-messages/eslint.config.ts b/packages/decentralized-convex-messages/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-messages/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-messages/index.ts b/packages/decentralized-convex-messages/index.ts
new file mode 100644
index 00000000..cec7f6db
--- /dev/null
+++ b/packages/decentralized-convex-messages/index.ts
@@ -0,0 +1,2 @@
+export { message, messagesProtocol } from "./protocol.ts";
+export type { Message } from "./protocol.ts";
diff --git a/packages/decentralized-convex-messages/package.json b/packages/decentralized-convex-messages/package.json
new file mode 100644
index 00000000..20a66bce
--- /dev/null
+++ b/packages/decentralized-convex-messages/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "@decentralized-convex/messages",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./index.ts",
+    "./convex.config": "./convex.config.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config --ignore-pattern _generated",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@decentralized-convex/plugin": "workspace:*",
+    "@decentralized-convex/server": "workspace:*",
+    "convex": "catalog:"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-messages/protocol.ts b/packages/decentralized-convex-messages/protocol.ts
new file mode 100644
index 00000000..3a372958
--- /dev/null
+++ b/packages/decentralized-convex-messages/protocol.ts
@@ -0,0 +1,38 @@
+import type { Infer } from "convex/values";
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { v } from "convex/values";
+
+export const message = v.object({
+  authorId: v.string(),
+  authorName: v.string(),
+  body: v.string(),
+  conversationId: v.string(),
+  messageId: v.string(),
+  sentAt: v.number(),
+});
+
+export type Message = Infer<typeof message>;
+
+export const messagesProtocol = definePluginProtocol({
+  name: "messages",
+  mutations: {
+    send: defineOperation({
+      args: v.object({
+        body: v.string(),
+        conversationId: v.string(),
+        messageId: v.string(),
+      }),
+      returns: message,
+    }),
+  },
+  queries: {
+    list: defineOperation({
+      args: v.object({ conversationId: v.string() }),
+      returns: v.array(message),
+    }),
+  },
+  version: "1",
+});
diff --git a/packages/decentralized-convex-messages/schema.ts b/packages/decentralized-convex-messages/schema.ts
new file mode 100644
index 00000000..9c270956
--- /dev/null
+++ b/packages/decentralized-convex-messages/schema.ts
@@ -0,0 +1,15 @@
+import { defineSchema, defineTable } from "convex/server";
+import { v } from "convex/values";
+
+export default defineSchema({
+  messages: defineTable({
+    authorId: v.string(),
+    authorName: v.string(),
+    body: v.string(),
+    conversationId: v.string(),
+    messageId: v.string(),
+    sentAt: v.number(),
+  })
+    .index("by_conversation", ["conversationId"])
+    .index("by_message", ["messageId"]),
+});
diff --git a/packages/decentralized-convex-messages/tsconfig.json b/packages/decentralized-convex-messages/tsconfig.json
new file mode 100644
index 00000000..3f6a953d
--- /dev/null
+++ b/packages/decentralized-convex-messages/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022"],
+    "types": ["node"]
+  },
+  "include": ["*.ts", "_generated/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-plugin/README.md b/packages/decentralized-convex-plugin/README.md
new file mode 100644
index 00000000..c60a4972
--- /dev/null
+++ b/packages/decentralized-convex-plugin/README.md
@@ -0,0 +1,104 @@
+# `@decentralized-convex/plugin`
+
+Shared plugin composition and operation protocols for decentralized Convex
+applications.
+
+Plugins provide versioned capability contracts and may require contracts from
+other plugins. The final composition boundary reports missing or incompatible
+providers at type-check time and validates the complete dependency graph before
+running plugin setup.
+
+```ts
+interface AccountsService {
+  getAccount(address: string): { address: string; displayName: string };
+}
+
+const Accounts = defineCapability<AccountsService>()({
+  id: "org.decentralized-convex.accounts",
+  version: "1",
+});
+
+const accountsPlugin = definePlugin({
+  name: "accounts",
+  provides: [Accounts],
+  requires: [],
+  setup: () => [accountsService],
+});
+
+const messagesPlugin = definePlugin({
+  name: "messages",
+  provides: [Messaging],
+  requires: [Accounts],
+  setup: ({ get }) => {
+    const accounts = get(Accounts);
+    return [createMessagingService(accounts)];
+  },
+});
+
+const app = composePlugins(messagesPlugin, accountsPlugin);
+const messaging = app.get(Messaging);
+```
+
+Plugin order does not matter. Dependencies determine setup order. Omitting the
+accounts provider produces a TypeScript error at `composePlugins`.
+
+A product profile is another dependent capability rather than a mutation of the
+accounts contract. For example, a `VeraProfiles` plugin can require `Accounts`,
+inherit the account display name and avatar, and provide Vera-specific overrides.
+Ruby or Sync can install separate profile capabilities over the same account.
+
+## Component operation protocols
+
+A Component can define all of its client-facing behavior as typed operations.
+Each operation owns its argument and return validators, and a plugin protocol
+groups them into query and mutation maps:
+
+```ts
+const messages = definePluginProtocol({
+  name: "messages",
+  version: "1",
+  queries: {
+    listMessages: defineOperation({
+      args: v.object({ conversationId: v.string() }),
+      returns: v.array(message),
+    }),
+  },
+  mutations: {
+    sendMessage: defineOperation({
+      args: message,
+      returns: message,
+    }),
+  },
+});
+```
+
+`defineComponentDispatchers` from `@decentralized-convex/server` turns those
+maps into one real Convex query and one real mutation. `definePdsRouter` exposes
+one root query and mutation for every installed Component. The client SDK uses
+the same protocol to restore operation-specific argument and return types even
+though the root Convex functions are intentionally generic.
+
+The Component uses its protocol name as its Convex name:
+
+```ts
+export default defineComponent(messages.name);
+```
+
+Installing it into a PDS is one line:
+
+```ts
+app.use(messagesComponent);
+```
+
+The shared root router resolves that install name dynamically, so installing a
+plugin does not require adding wrapper functions or a second router registry.
+
+Once bound, client calls stay small and contain only application arguments:
+
+```ts
+const client = new PdsClient({ connection });
+const pds = client.bind(definePdsApi({ messages }));
+
+const result = await pds.messages.query.listMessages({ conversationId });
+await pds.messages.mutation.sendMessage(message);
+```
diff --git a/packages/decentralized-convex-plugin/eslint.config.ts b/packages/decentralized-convex-plugin/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-plugin/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-plugin/package.json b/packages/decentralized-convex-plugin/package.json
new file mode 100644
index 00000000..7bd8af25
--- /dev/null
+++ b/packages/decentralized-convex-plugin/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "@decentralized-convex/plugin",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "convex": "catalog:"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-plugin/src/capability.ts b/packages/decentralized-convex-plugin/src/capability.ts
new file mode 100644
index 00000000..8ea3a916
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/capability.ts
@@ -0,0 +1,46 @@
+export const CapabilityTypeId = Symbol("decentralized-convex/capability");
+
+export interface Capability<
+  Id extends string,
+  Version extends string,
+  Service,
+> {
+  readonly id: Id;
+  readonly version: Version;
+  readonly [CapabilityTypeId]: (value: unknown) => Service;
+}
+
+export type AnyCapability = Capability<string, string, unknown>;
+
+export type CapabilityService<Value extends AnyCapability> = ReturnType<
+  Value[typeof CapabilityTypeId]
+>;
+
+export type CapabilityKey<Value extends AnyCapability> =
+  `${Value["id"]}@${Value["version"]}`;
+
+export function defineCapability<Service>() {
+  return <const Id extends string, const Version extends string>({
+    id,
+    version,
+  }: {
+    readonly id: Id;
+    readonly version: Version;
+  }): Capability<Id, Version, Service> =>
+    Object.freeze({
+      id,
+      version,
+      // Capability identity and graph validation make this the package's one trusted erasure boundary.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      [CapabilityTypeId]: (value: unknown) => value as Service,
+    });
+}
+
+export function readCapabilityService<Capability extends AnyCapability>(
+  capability: Capability,
+  value: unknown,
+): CapabilityService<Capability> {
+  // The capability token is the runtime witness for its erased service type.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return capability[CapabilityTypeId](value) as CapabilityService<Capability>;
+}
diff --git a/packages/decentralized-convex-plugin/src/compose.ts b/packages/decentralized-convex-plugin/src/compose.ts
new file mode 100644
index 00000000..464f4085
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/compose.ts
@@ -0,0 +1,185 @@
+import type {
+  AnyCapability,
+  CapabilityKey,
+  CapabilityService,
+} from "./capability.ts";
+import type {
+  AnyPlugin,
+  PluginContext,
+  PluginProvisions,
+  PluginRequirements,
+} from "./plugin.ts";
+import { readCapabilityService } from "./capability.ts";
+import { assertPluginGraph } from "./graph.ts";
+
+type PluginsRequirements<Plugins extends readonly AnyPlugin[]> =
+  PluginRequirements<Plugins[number]>;
+
+type PluginsProvisions<Plugins extends readonly AnyPlugin[]> = PluginProvisions<
+  Plugins[number]
+>;
+
+type MatchingProvision<
+  Requirement extends AnyCapability,
+  Provisions extends AnyCapability,
+> = Provisions extends AnyCapability
+  ? Provisions["id"] extends Requirement["id"]
+    ? Provisions["version"] extends Requirement["version"]
+      ? Provisions
+      : never
+    : never
+  : never;
+
+type UnsatisfiedRequirements<
+  Requirements extends AnyCapability,
+  Provisions extends AnyCapability,
+> = Requirements extends AnyCapability
+  ? [MatchingProvision<Requirements, Provisions>] extends [never]
+    ? Requirements
+    : never
+  : never;
+
+type MissingRequirements<Plugins extends readonly AnyPlugin[]> =
+  UnsatisfiedRequirements<
+    PluginsRequirements<Plugins>,
+    PluginsProvisions<Plugins>
+  >;
+
+type SameIdProvision<
+  Requirement extends AnyCapability,
+  Provisions extends AnyCapability,
+> = Provisions extends AnyCapability
+  ? Provisions["id"] extends Requirement["id"]
+    ? Provisions
+    : never
+  : never;
+
+type IncompatibleRequirements<Plugins extends readonly AnyPlugin[]> =
+  MissingRequirements<Plugins> extends infer Requirement extends AnyCapability
+    ? [SameIdProvision<Requirement, PluginsProvisions<Plugins>>] extends [never]
+      ? never
+      : Requirement
+    : never;
+
+type AbsentRequirements<Plugins extends readonly AnyPlugin[]> = Exclude<
+  MissingRequirements<Plugins>,
+  IncompatibleRequirements<Plugins>
+>;
+
+type ProviderIds<Value extends AnyPlugin> = PluginProvisions<Value>["id"];
+
+type DuplicateProviderIds<
+  Plugins extends readonly AnyPlugin[],
+  Seen extends string = never,
+> = Plugins extends readonly [
+  infer Head extends AnyPlugin,
+  ...infer Tail extends readonly AnyPlugin[],
+]
+  ?
+      | Extract<ProviderIds<Head>, Seen>
+      | DuplicateProviderIds<Tail, Seen | ProviderIds<Head>>
+  : never;
+
+type PluginGraphConstraint<Plugins extends readonly AnyPlugin[]> = Plugins &
+  ([AbsentRequirements<Plugins>] extends [never]
+    ? unknown
+    : {
+        readonly __missingPluginRequirements: CapabilityKey<
+          AbsentRequirements<Plugins>
+        >;
+      }) &
+  ([IncompatibleRequirements<Plugins>] extends [never]
+    ? unknown
+    : {
+        readonly __incompatiblePluginRequirements: CapabilityKey<
+          IncompatibleRequirements<Plugins>
+        >;
+      }) &
+  ([DuplicateProviderIds<Plugins>] extends [never]
+    ? unknown
+    : {
+        readonly __duplicatePluginProviders: DuplicateProviderIds<Plugins>;
+      });
+
+export interface PluginManifestCapability {
+  readonly id: string;
+  readonly version: string;
+}
+
+export interface PluginManifestEntry {
+  readonly name: string;
+  readonly provides: readonly PluginManifestCapability[];
+  readonly requires: readonly PluginManifestCapability[];
+}
+
+export interface PluginApp<Provisions extends AnyCapability> {
+  readonly get: <Capability extends Provisions>(
+    capability: Capability,
+  ) => CapabilityService<Capability>;
+  readonly manifest: () => readonly PluginManifestEntry[];
+}
+
+export function composePlugins<const Plugins extends readonly AnyPlugin[]>(
+  ...plugins: PluginGraphConstraint<Plugins>
+): PluginApp<PluginsProvisions<Plugins>> {
+  const order = assertPluginGraph(plugins);
+  const services = new Map<
+    string,
+    { readonly service: unknown; readonly version: string }
+  >();
+
+  const context: PluginContext<readonly AnyCapability[]> = {
+    get: (capability) => {
+      const provided = services.get(capability.id);
+      if (provided?.version !== capability.version) {
+        throw new Error(
+          `Capability ${capability.id}@${capability.version} is not available during plugin setup.`,
+        );
+      }
+      return readCapabilityService(capability, provided.service);
+    },
+  };
+
+  for (const plugin of order) {
+    const implementations = plugin.setup(context);
+    if (implementations.length !== plugin.provides.length) {
+      throw new Error(
+        `Plugin ${plugin.name} declared ${plugin.provides.length} capabilities but returned ${implementations.length} implementations.`,
+      );
+    }
+    plugin.provides.forEach((capability, index) => {
+      services.set(capability.id, {
+        service: implementations[index],
+        version: capability.version,
+      });
+    });
+  }
+
+  return Object.freeze({
+    get: <Capability extends PluginsProvisions<Plugins>>(
+      capability: Capability,
+    ) => {
+      const provided = services.get(capability.id);
+      if (provided?.version !== capability.version) {
+        throw new Error(
+          `Capability ${capability.id}@${capability.version} is not installed.`,
+        );
+      }
+      return readCapabilityService(capability, provided.service);
+    },
+    manifest: () =>
+      Object.freeze(
+        order.map((plugin) =>
+          Object.freeze({
+            name: plugin.name,
+            provides: plugin.provides.map(capabilityManifestEntry),
+            requires: plugin.requires.map(capabilityManifestEntry),
+          }),
+        ),
+      ),
+  });
+}
+
+function capabilityManifestEntry(capability: AnyCapability) {
+  return Object.freeze({ id: capability.id, version: capability.version });
+}
diff --git a/packages/decentralized-convex-plugin/src/graph.ts b/packages/decentralized-convex-plugin/src/graph.ts
new file mode 100644
index 00000000..b396ab56
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/graph.ts
@@ -0,0 +1,263 @@
+import type { AnyCapability } from "./capability.ts";
+import type { AnyPlugin } from "./plugin.ts";
+
+export type PluginGraphIssue =
+  | {
+      readonly capabilityId: string;
+      readonly code: "duplicate-provider";
+      readonly plugins: readonly string[];
+    }
+  | {
+      readonly capabilityId: string;
+      readonly code: "incompatible-version";
+      readonly plugin: string;
+      readonly providedVersions: readonly string[];
+      readonly requiredVersion: string;
+    }
+  | {
+      readonly capabilityId: string;
+      readonly code: "missing-provider";
+      readonly plugin: string;
+      readonly requiredVersion: string;
+    }
+  | {
+      readonly code: "dependency-cycle";
+      readonly plugins: readonly string[];
+    }
+  | {
+      readonly code: "duplicate-plugin-name";
+      readonly name: string;
+    };
+
+interface ProviderCandidate {
+  readonly capability: AnyCapability;
+  readonly plugin: AnyPlugin;
+}
+
+type ProviderMap = ReadonlyMap<string, readonly ProviderCandidate[]>;
+type PluginDependencies = ReadonlyMap<AnyPlugin, ReadonlySet<AnyPlugin>>;
+
+interface GraphTraversal {
+  readonly complete: Set<AnyPlugin>;
+  readonly issues: PluginGraphIssue[];
+  readonly order: AnyPlugin[];
+  readonly reportedCycles: Set<string>;
+  readonly stack: AnyPlugin[];
+  readonly visiting: Set<AnyPlugin>;
+}
+
+export class PluginGraphError extends Error {
+  readonly issues: readonly PluginGraphIssue[];
+
+  constructor(issues: readonly PluginGraphIssue[]) {
+    super(formatPluginGraphIssues(issues));
+    this.name = "PluginGraphError";
+    this.issues = issues;
+  }
+}
+
+export function inspectPluginGraph(plugins: readonly AnyPlugin[]) {
+  return analyzePluginGraph(plugins).issues;
+}
+
+export function assertPluginGraph(plugins: readonly AnyPlugin[]) {
+  const analysis = analyzePluginGraph(plugins);
+  if (analysis.issues.length > 0) {
+    throw new PluginGraphError(analysis.issues);
+  }
+  return analysis.order;
+}
+
+function analyzePluginGraph(plugins: readonly AnyPlugin[]) {
+  const issues = inspectDuplicatePluginNames(plugins);
+  const providers = collectProviders(plugins);
+  issues.push(...inspectDuplicateProviders(providers));
+  const dependencies = collectDependencies({ issues, plugins, providers });
+  const order = resolvePluginOrder({ dependencies, issues, plugins });
+  return { issues, order };
+}
+
+function inspectDuplicatePluginNames(plugins: readonly AnyPlugin[]) {
+  const issues = Array<PluginGraphIssue>();
+  const pluginNames = new Set<string>();
+  for (const plugin of plugins) {
+    if (pluginNames.has(plugin.name)) {
+      issues.push({ code: "duplicate-plugin-name", name: plugin.name });
+    }
+    pluginNames.add(plugin.name);
+  }
+  return issues;
+}
+
+function collectProviders(plugins: readonly AnyPlugin[]) {
+  const providers = new Map<string, ProviderCandidate[]>();
+  for (const plugin of plugins) {
+    for (const capability of plugin.provides) {
+      const candidates = providers.get(capability.id) ?? [];
+      candidates.push({ capability, plugin });
+      providers.set(capability.id, candidates);
+    }
+  }
+  return providers;
+}
+
+function inspectDuplicateProviders(providers: ProviderMap) {
+  const issues = Array<PluginGraphIssue>();
+  for (const [capabilityId, candidates] of providers) {
+    if (candidates.length > 1) {
+      issues.push({
+        capabilityId,
+        code: "duplicate-provider",
+        plugins: candidates.map(({ plugin }) => plugin.name),
+      });
+    }
+  }
+  return issues;
+}
+
+function collectDependencies({
+  issues,
+  plugins,
+  providers,
+}: {
+  readonly issues: PluginGraphIssue[];
+  readonly plugins: readonly AnyPlugin[];
+  readonly providers: ProviderMap;
+}) {
+  const dependencies = new Map<AnyPlugin, Set<AnyPlugin>>(
+    plugins.map((plugin) => [plugin, new Set()]),
+  );
+
+  for (const plugin of plugins) {
+    for (const requirement of plugin.requires) {
+      const provider = resolveProvider({
+        issues,
+        plugin,
+        providers,
+        requirement,
+      });
+      if (provider) {
+        dependencies.get(plugin)?.add(provider);
+      }
+    }
+  }
+  return dependencies;
+}
+
+function resolveProvider({
+  issues,
+  plugin,
+  providers,
+  requirement,
+}: {
+  readonly issues: PluginGraphIssue[];
+  readonly plugin: AnyPlugin;
+  readonly providers: ProviderMap;
+  readonly requirement: AnyCapability;
+}) {
+  const candidates = providers.get(requirement.id) ?? [];
+  if (candidates.length === 0) {
+    issues.push({
+      capabilityId: requirement.id,
+      code: "missing-provider",
+      plugin: plugin.name,
+      requiredVersion: requirement.version,
+    });
+    return undefined;
+  }
+
+  const matching = candidates.find(
+    ({ capability }) => capability.version === requirement.version,
+  );
+  if (!matching) {
+    issues.push({
+      capabilityId: requirement.id,
+      code: "incompatible-version",
+      plugin: plugin.name,
+      providedVersions: candidates.map(({ capability }) => capability.version),
+      requiredVersion: requirement.version,
+    });
+  }
+  return matching?.plugin;
+}
+
+function resolvePluginOrder({
+  dependencies,
+  issues,
+  plugins,
+}: {
+  readonly dependencies: PluginDependencies;
+  readonly issues: PluginGraphIssue[];
+  readonly plugins: readonly AnyPlugin[];
+}) {
+  const traversal: GraphTraversal = {
+    complete: new Set(),
+    issues,
+    order: [],
+    reportedCycles: new Set(),
+    stack: [],
+    visiting: new Set(),
+  };
+  for (const plugin of plugins) {
+    visitPlugin({ dependencies, plugin, traversal });
+  }
+  return traversal.order;
+}
+
+function visitPlugin({
+  dependencies,
+  plugin,
+  traversal,
+}: {
+  readonly dependencies: PluginDependencies;
+  readonly plugin: AnyPlugin;
+  readonly traversal: GraphTraversal;
+}) {
+  if (traversal.complete.has(plugin)) {
+    return;
+  }
+  if (traversal.visiting.has(plugin)) {
+    reportDependencyCycle(plugin, traversal);
+    return;
+  }
+
+  traversal.visiting.add(plugin);
+  traversal.stack.push(plugin);
+  for (const dependency of dependencies.get(plugin) ?? []) {
+    visitPlugin({ dependencies, plugin: dependency, traversal });
+  }
+  traversal.stack.pop();
+  traversal.visiting.delete(plugin);
+  traversal.complete.add(plugin);
+  traversal.order.push(plugin);
+}
+
+function reportDependencyCycle(plugin: AnyPlugin, traversal: GraphTraversal) {
+  const cycleStart = traversal.stack.indexOf(plugin);
+  const cycle = [...traversal.stack.slice(cycleStart), plugin].map(
+    ({ name }) => name,
+  );
+  const key = [...new Set(cycle)].sort().join("|");
+  if (!traversal.reportedCycles.has(key)) {
+    traversal.issues.push({ code: "dependency-cycle", plugins: cycle });
+    traversal.reportedCycles.add(key);
+  }
+}
+
+function formatPluginGraphIssues(issues: readonly PluginGraphIssue[]) {
+  const details = issues.map((issue) => {
+    switch (issue.code) {
+      case "dependency-cycle":
+        return `dependency cycle: ${issue.plugins.join(" -> ")}`;
+      case "duplicate-plugin-name":
+        return `duplicate plugin name: ${issue.name}`;
+      case "duplicate-provider":
+        return `multiple plugins provide ${issue.capabilityId}: ${issue.plugins.join(", ")}`;
+      case "incompatible-version":
+        return `${issue.plugin} requires ${issue.capabilityId}@${issue.requiredVersion}, available: ${issue.providedVersions.join(", ")}`;
+      case "missing-provider":
+        return `${issue.plugin} requires missing ${issue.capabilityId}@${issue.requiredVersion}`;
+    }
+  });
+  return `Invalid plugin graph:\n- ${details.join("\n- ")}`;
+}
diff --git a/packages/decentralized-convex-plugin/src/index.ts b/packages/decentralized-convex-plugin/src/index.ts
new file mode 100644
index 00000000..20ca2271
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/index.ts
@@ -0,0 +1,46 @@
+export { defineCapability } from "./capability.ts";
+export type {
+  AnyCapability,
+  Capability,
+  CapabilityKey,
+  CapabilityService,
+} from "./capability.ts";
+export { composePlugins } from "./compose.ts";
+export type {
+  PluginApp,
+  PluginManifestCapability,
+  PluginManifestEntry,
+} from "./compose.ts";
+export {
+  assertPluginGraph,
+  inspectPluginGraph,
+  PluginGraphError,
+} from "./graph.ts";
+export type { PluginGraphIssue } from "./graph.ts";
+export { definePlugin } from "./plugin.ts";
+export type {
+  AnyPlugin,
+  CapabilityServices,
+  Plugin,
+  PluginContext,
+  PluginProvisions,
+  PluginRequirements,
+} from "./plugin.ts";
+export {
+  defineOperation,
+  definePluginProtocol,
+  operationResponseValidator,
+  operationValidator,
+} from "./operations.ts";
+export type {
+  AnyOperation,
+  AnyPluginProtocol,
+  Operation,
+  OperationArgs,
+  OperationMap,
+  OperationRequest,
+  OperationResponse,
+  OperationResult,
+  OperationReturn,
+  PluginProtocol,
+} from "./operations.ts";
diff --git a/packages/decentralized-convex-plugin/src/operations.test.ts b/packages/decentralized-convex-plugin/src/operations.test.ts
new file mode 100644
index 00000000..b88b2fc0
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/operations.test.ts
@@ -0,0 +1,47 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { v } from "convex/values";
+
+import {
+  defineOperation,
+  operationResponseValidator,
+  operationValidator,
+} from "./operations.ts";
+
+const operations = {
+  create: defineOperation({
+    args: v.object({ body: v.string() }),
+    returns: v.object({ id: v.string() }),
+  }),
+  remove: defineOperation({
+    args: v.object({ id: v.string() }),
+    returns: v.null(),
+  }),
+};
+
+void test("builds discriminated request and response validators", () => {
+  const requests = operationValidator(operations);
+  const responses = operationResponseValidator(operations);
+
+  assert.equal(requests.kind, "union");
+  assert.equal(responses.kind, "union");
+  assert.equal(requests.members.length, 2);
+  assert.equal(responses.members.length, 2);
+  assert.deepEqual(
+    responses.members.map((member) => {
+      assert.equal(member.kind, "object");
+      return Object.keys(member.fields);
+    }),
+    [
+      ["type", "value"],
+      ["type", "value"],
+    ],
+  );
+  assert.deepEqual(
+    responses.members.map((member) => {
+      assert.equal(member.kind, "object");
+      return member.fields.type?.kind;
+    }),
+    ["literal", "literal"],
+  );
+});
diff --git a/packages/decentralized-convex-plugin/src/operations.ts b/packages/decentralized-convex-plugin/src/operations.ts
new file mode 100644
index 00000000..736a44bf
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/operations.ts
@@ -0,0 +1,131 @@
+import type { Infer, Validator } from "convex/values";
+import { v } from "convex/values";
+
+export interface Operation<
+  Args extends Validator<Record<string, unknown>, "required", string>,
+  Result extends Validator<unknown, "required", string>,
+> {
+  readonly args: Args;
+  readonly returns: Result;
+}
+
+export type AnyOperation = Operation<
+  Validator<Record<string, unknown>, "required", string>,
+  Validator<unknown, "required", string>
+>;
+
+export type OperationMap = Readonly<Record<string, AnyOperation>>;
+
+export interface PluginProtocol<
+  Name extends string,
+  Version extends string,
+  Queries extends OperationMap,
+  Mutations extends OperationMap,
+> {
+  readonly name: Name;
+  readonly mutations: Mutations;
+  readonly queries: Queries;
+  readonly version: Version;
+}
+
+export type AnyPluginProtocol = PluginProtocol<
+  string,
+  string,
+  OperationMap,
+  OperationMap
+>;
+
+export type OperationArgs<Value extends AnyOperation> = Infer<Value["args"]>;
+export type OperationResult<Value extends AnyOperation> = Infer<
+  Value["returns"]
+>;
+
+export type OperationRequest<Operations extends OperationMap> = {
+  readonly [Name in keyof Operations & string]: {
+    readonly args: OperationArgs<Operations[Name]>;
+    readonly type: Name;
+  };
+}[keyof Operations & string];
+
+export type OperationReturn<
+  Operations extends OperationMap,
+  Request extends OperationRequest<Operations>,
+> = Request extends { readonly type: infer Name extends keyof Operations }
+  ? OperationResult<Operations[Name]>
+  : never;
+
+export type OperationResponse<Operations extends OperationMap> = {
+  readonly [Name in keyof Operations & string]: {
+    readonly type: Name;
+    readonly value: OperationResult<Operations[Name]>;
+  };
+}[keyof Operations & string];
+
+export function defineOperation<
+  const Args extends Validator<Record<string, unknown>, "required", string>,
+  const Result extends Validator<unknown, "required", string>,
+>(definition: Operation<Args, Result>): Operation<Args, Result> {
+  return Object.freeze(definition);
+}
+
+export function definePluginProtocol<
+  const Name extends string,
+  const Version extends string,
+  const Queries extends OperationMap,
+  const Mutations extends OperationMap,
+>(protocol: PluginProtocol<Name, Version, Queries, Mutations>) {
+  assertOperations(protocol.name, "query", protocol.queries);
+  assertOperations(protocol.name, "mutation", protocol.mutations);
+  return Object.freeze(protocol);
+}
+
+export function operationValidator<const Operations extends OperationMap>(
+  operations: Operations,
+): Validator<OperationRequest<Operations>, "required", string> {
+  const members = Object.entries(operations).map(([type, operation]) =>
+    v.object({ args: operation.args, type: v.literal(type) }),
+  );
+  if (members.length === 0) {
+    throw new Error("A dispatcher must define at least one operation.");
+  }
+
+  // Object.entries necessarily erases the literal operation names. The returned validator is
+  // reconstructed from those same definitions, making this the trusted runtime/type bridge.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return v.union(...members) as Validator<
+    OperationRequest<Operations>,
+    "required",
+    string
+  >;
+}
+
+export function operationResponseValidator<
+  const Operations extends OperationMap,
+>(
+  operations: Operations,
+): Validator<OperationResponse<Operations>, "required", string> {
+  const members = Object.entries(operations).map(([type, operation]) =>
+    v.object({ type: v.literal(type), value: operation.returns }),
+  );
+  if (members.length === 0) {
+    throw new Error("A dispatcher must define at least one operation.");
+  }
+
+  // Object.entries erases the literal operation names; the union is built from those exact names.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return v.union(...members) as Validator<
+    OperationResponse<Operations>,
+    "required",
+    string
+  >;
+}
+
+function assertOperations(
+  pluginName: string,
+  kind: "mutation" | "query",
+  operations: OperationMap,
+) {
+  if (Object.keys(operations).length === 0) {
+    throw new Error(`Plugin ${pluginName} must define at least one ${kind}.`);
+  }
+}
diff --git a/packages/decentralized-convex-plugin/src/plugin.test.ts b/packages/decentralized-convex-plugin/src/plugin.test.ts
new file mode 100644
index 00000000..47ce4b76
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/plugin.test.ts
@@ -0,0 +1,270 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  composePlugins,
+  defineCapability,
+  definePlugin,
+  inspectPluginGraph,
+  PluginGraphError,
+} from "./index.ts";
+
+interface AccountProfile {
+  readonly address: string;
+  readonly avatarUrl: string;
+  readonly displayName: string;
+}
+
+interface AccountsService {
+  getProfile(address: string): AccountProfile;
+  resolveProfile(
+    address: string,
+    override?: Partial<Pick<AccountProfile, "avatarUrl" | "displayName">>,
+  ): AccountProfile;
+}
+
+interface Message {
+  readonly author: AccountProfile;
+  readonly body: string;
+}
+
+interface MessagingService {
+  createMessage(input: {
+    readonly author: string;
+    readonly body: string;
+    readonly profile?: Partial<
+      Pick<AccountProfile, "avatarUrl" | "displayName">
+    >;
+  }): Message;
+}
+
+interface GifMessagingService {
+  createGifMessage(input: {
+    readonly author: string;
+    readonly gifUrl: string;
+  }): Message;
+}
+
+interface ProductProfilesService {
+  getProfile(address: string): AccountProfile;
+}
+
+const Accounts = defineCapability<AccountsService>()({
+  id: "org.decentralized-convex.accounts",
+  version: "1",
+});
+
+const Messaging = defineCapability<MessagingService>()({
+  id: "org.decentralized-convex.messaging",
+  version: "1",
+});
+
+const GifMessaging = defineCapability<GifMessagingService>()({
+  id: "org.decentralized-convex.messaging.gifs",
+  version: "1",
+});
+
+const VeraProfiles = defineCapability<ProductProfilesService>()({
+  id: "chat.vera.profiles",
+  version: "1",
+});
+
+const accountProfiles = new Map<string, AccountProfile>([
+  [
+    "shawn@rogers.dev",
+    {
+      address: "shawn@rogers.dev",
+      avatarUrl: "https://rogers.dev/shawn.png",
+      displayName: "Shawn Rogers",
+    },
+  ],
+]);
+
+function getAccountProfile(address: string) {
+  const profile = accountProfiles.get(address);
+  if (!profile) {
+    throw new Error(`Unknown account: ${address}`);
+  }
+  return profile;
+}
+
+const accountsService: AccountsService = {
+  getProfile: getAccountProfile,
+  resolveProfile: (address, override) => ({
+    ...getAccountProfile(address),
+    ...override,
+  }),
+};
+
+const accountsPlugin = definePlugin({
+  name: "accounts",
+  provides: [Accounts],
+  requires: [],
+  setup: () => [accountsService],
+});
+
+const messagingPlugin = definePlugin({
+  name: "messaging",
+  provides: [Messaging],
+  requires: [Accounts],
+  setup: ({ get }) => {
+    const accounts = get(Accounts);
+    return [
+      {
+        createMessage: ({ author, body, profile }) => ({
+          author: accounts.resolveProfile(author, profile),
+          body,
+        }),
+      },
+    ];
+  },
+});
+
+const gifMessagingPlugin = definePlugin({
+  name: "messaging-gifs",
+  provides: [GifMessaging],
+  requires: [Messaging],
+  setup: ({ get }) => {
+    const messaging = get(Messaging);
+    return [
+      {
+        createGifMessage: ({ author, gifUrl }) =>
+          messaging.createMessage({ author, body: `[gif](${gifUrl})` }),
+      },
+    ];
+  },
+});
+
+const veraProfilesPlugin = definePlugin({
+  name: "vera-profiles",
+  provides: [VeraProfiles],
+  requires: [Accounts],
+  setup: ({ get }) => {
+    const accounts = get(Accounts);
+    return [
+      {
+        getProfile: (address) =>
+          accounts.resolveProfile(address, { displayName: "Shawn on Vera" }),
+      },
+    ];
+  },
+});
+
+void test("resolves plugins by dependency and supports profile overrides", () => {
+  const app = composePlugins(
+    gifMessagingPlugin,
+    veraProfilesPlugin,
+    messagingPlugin,
+    accountsPlugin,
+  );
+  const messaging = app.get(Messaging);
+  const gifs = app.get(GifMessaging);
+  const veraProfiles = app.get(VeraProfiles);
+
+  assert.deepEqual(
+    messaging.createMessage({
+      author: "shawn@rogers.dev",
+      body: "hello",
+      profile: veraProfiles.getProfile("shawn@rogers.dev"),
+    }),
+    {
+      author: {
+        address: "shawn@rogers.dev",
+        avatarUrl: "https://rogers.dev/shawn.png",
+        displayName: "Shawn on Vera",
+      },
+      body: "hello",
+    },
+  );
+  assert.equal(
+    gifs.createGifMessage({
+      author: "shawn@rogers.dev",
+      gifUrl: "https://media.example/wave.gif",
+    }).body,
+    "[gif](https://media.example/wave.gif)",
+  );
+  assert.deepEqual(
+    app.manifest().map(({ name }) => name),
+    ["accounts", "messaging", "messaging-gifs", "vera-profiles"],
+  );
+});
+
+void test("reports missing and incompatible dependencies", () => {
+  const AccountsV2 = defineCapability<AccountsService>()({
+    id: "org.decentralized-convex.accounts",
+    version: "2",
+  });
+  const accountsV2Plugin = definePlugin({
+    name: "accounts-v2",
+    provides: [AccountsV2],
+    requires: [],
+    setup: () => [accountsService],
+  });
+
+  assert.deepEqual(inspectPluginGraph([messagingPlugin]), [
+    {
+      capabilityId: "org.decentralized-convex.accounts",
+      code: "missing-provider",
+      plugin: "messaging",
+      requiredVersion: "1",
+    },
+  ]);
+  assert.deepEqual(inspectPluginGraph([accountsV2Plugin, messagingPlugin]), [
+    {
+      capabilityId: "org.decentralized-convex.accounts",
+      code: "incompatible-version",
+      plugin: "messaging",
+      providedVersions: ["2"],
+      requiredVersion: "1",
+    },
+  ]);
+});
+
+void test("reports duplicate providers and dependency cycles", () => {
+  const alternativeAccountsPlugin = definePlugin({
+    name: "alternative-accounts",
+    provides: [Accounts],
+    requires: [],
+    setup: () => [accountsService],
+  });
+  const CapabilityA = defineCapability<{ readonly value: "a" }>()({
+    id: "example.a",
+    version: "1",
+  });
+  const CapabilityB = defineCapability<{ readonly value: "b" }>()({
+    id: "example.b",
+    version: "1",
+  });
+  const pluginA = definePlugin({
+    name: "a",
+    provides: [CapabilityA],
+    requires: [CapabilityB],
+    setup: () => [{ value: "a" }],
+  });
+  const pluginB = definePlugin({
+    name: "b",
+    provides: [CapabilityB],
+    requires: [CapabilityA],
+    setup: () => [{ value: "b" }],
+  });
+
+  assert.deepEqual(
+    inspectPluginGraph([accountsPlugin, alternativeAccountsPlugin]),
+    [
+      {
+        capabilityId: "org.decentralized-convex.accounts",
+        code: "duplicate-provider",
+        plugins: ["accounts", "alternative-accounts"],
+      },
+    ],
+  );
+  assert.deepEqual(inspectPluginGraph([pluginA, pluginB]), [
+    { code: "dependency-cycle", plugins: ["a", "b", "a"] },
+  ]);
+  assert.throws(
+    () => composePlugins(pluginA, pluginB),
+    (error: unknown) =>
+      error instanceof PluginGraphError &&
+      error.issues[0]?.code === "dependency-cycle",
+  );
+});
diff --git a/packages/decentralized-convex-plugin/src/plugin.ts b/packages/decentralized-convex-plugin/src/plugin.ts
new file mode 100644
index 00000000..698007ed
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/plugin.ts
@@ -0,0 +1,66 @@
+import type { AnyCapability, CapabilityService } from "./capability.ts";
+
+export interface PluginContext<Requirements extends readonly AnyCapability[]> {
+  readonly get: <Capability extends Requirements[number]>(
+    capability: Capability,
+  ) => CapabilityService<Capability>;
+}
+
+export type CapabilityServices<Capabilities extends readonly AnyCapability[]> =
+  {
+    readonly [Index in keyof Capabilities]: Capabilities[Index] extends AnyCapability
+      ? CapabilityService<Capabilities[Index]>
+      : never;
+  };
+
+export interface Plugin<
+  Name extends string,
+  Requirements extends readonly AnyCapability[],
+  Provisions extends readonly AnyCapability[],
+> {
+  readonly name: Name;
+  readonly provides: readonly [...Provisions];
+  readonly requires: readonly [...Requirements];
+  setup(context: PluginContext<Requirements>): CapabilityServices<Provisions>;
+}
+
+export type AnyPlugin = Plugin<
+  string,
+  readonly AnyCapability[],
+  readonly AnyCapability[]
+>;
+
+export type PluginRequirements<Value extends AnyPlugin> =
+  Value extends Plugin<string, infer Requirements, readonly AnyCapability[]>
+    ? Requirements[number]
+    : never;
+
+export type PluginProvisions<Value extends AnyPlugin> =
+  Value extends Plugin<string, readonly AnyCapability[], infer Provisions>
+    ? Provisions[number]
+    : never;
+
+export function definePlugin<
+  const Name extends string,
+  const Requirements extends readonly AnyCapability[],
+  const Provisions extends readonly AnyCapability[],
+>({
+  name,
+  provides,
+  requires,
+  setup,
+}: {
+  readonly name: Name;
+  readonly provides: readonly [...Provisions];
+  readonly requires: readonly [...Requirements];
+  readonly setup: (
+    context: PluginContext<Requirements>,
+  ) => CapabilityServices<Provisions>;
+}): Plugin<Name, Requirements, Provisions> {
+  return Object.freeze({
+    name,
+    provides,
+    requires,
+    setup,
+  });
+}
diff --git a/packages/decentralized-convex-plugin/src/plugin.type-test.ts b/packages/decentralized-convex-plugin/src/plugin.type-test.ts
new file mode 100644
index 00000000..fde745b7
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/plugin.type-test.ts
@@ -0,0 +1,68 @@
+import { composePlugins, defineCapability, definePlugin } from "./index.ts";
+
+interface AccountsService {
+  readonly kind: "accounts";
+}
+
+interface MessagingService {
+  readonly kind: "messaging";
+}
+
+const AccountsV1 = defineCapability<AccountsService>()({
+  id: "accounts",
+  version: "1",
+});
+const AccountsV2 = defineCapability<AccountsService>()({
+  id: "accounts",
+  version: "2",
+});
+const Messaging = defineCapability<MessagingService>()({
+  id: "messaging",
+  version: "1",
+});
+
+const accountsV1Plugin = definePlugin({
+  name: "accounts-v1",
+  provides: [AccountsV1],
+  requires: [],
+  setup: () => [{ kind: "accounts" }],
+});
+const accountsV2Plugin = definePlugin({
+  name: "accounts-v2",
+  provides: [AccountsV2],
+  requires: [],
+  setup: () => [{ kind: "accounts" }],
+});
+const alternativeAccountsV1Plugin = definePlugin({
+  name: "alternative-accounts-v1",
+  provides: [AccountsV1],
+  requires: [],
+  setup: () => [{ kind: "accounts" }],
+});
+const messagingPlugin = definePlugin({
+  name: "messaging",
+  provides: [Messaging],
+  requires: [AccountsV1],
+  setup: ({ get }) => {
+    get(AccountsV1);
+    return [{ kind: "messaging" }];
+  },
+});
+
+const app = composePlugins(messagingPlugin, accountsV1Plugin);
+const accounts: AccountsService = app.get(AccountsV1);
+const messaging: MessagingService = app.get(Messaging);
+void accounts;
+void messaging;
+
+// @ts-expect-error -- the messaging dependency is absent.
+composePlugins(messagingPlugin);
+
+// @ts-expect-error -- accounts@2 does not satisfy the accounts@1 requirement.
+composePlugins(accountsV2Plugin, messagingPlugin);
+
+// @ts-expect-error -- only one plugin may provide a capability ID.
+composePlugins(accountsV1Plugin, alternativeAccountsV1Plugin);
+
+// @ts-expect-error -- the application did not install accounts@2.
+app.get(AccountsV2);
diff --git a/packages/decentralized-convex-plugin/tsconfig.json b/packages/decentralized-convex-plugin/tsconfig.json
new file mode 100644
index 00000000..782fa4cf
--- /dev/null
+++ b/packages/decentralized-convex-plugin/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022"],
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-server/package.json b/packages/decentralized-convex-server/package.json
index 2107b8ca..92ea25f6 100644
--- a/packages/decentralized-convex-server/package.json
+++ b/packages/decentralized-convex-server/package.json
@@ -16,6 +16,7 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
+    "@decentralized-convex/plugin": "workspace:*",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-server/src/descriptor.test.ts b/packages/decentralized-convex-server/src/descriptor.test.ts
index 3c3e6c73..d1f1c8ff 100644
--- a/packages/decentralized-convex-server/src/descriptor.test.ts
+++ b/packages/decentralized-convex-server/src/descriptor.test.ts
@@ -5,15 +5,19 @@ import { federationDescriptorResponse } from "./descriptor.ts";
 
 void test("serves a capability-oriented descriptor", async () => {
   const response = federationDescriptorResponse({
+    accountDomain: "notes.example",
     capabilities: [{ id: "example.notes", versions: ["1"] }],
     deploymentUrl: "https://notes.example",
+    httpUrl: "https://notes-http.example",
     protocolVersion: "0.1",
   });
 
   assert.equal(response.status, 200);
   assert.deepEqual(await response.json(), {
+    accountDomain: "notes.example",
     capabilities: [{ id: "example.notes", versions: ["1"] }],
     deploymentUrl: "https://notes.example",
+    httpUrl: "https://notes-http.example",
     protocolVersion: "0.1",
   });
 });
diff --git a/packages/decentralized-convex-server/src/descriptor.ts b/packages/decentralized-convex-server/src/descriptor.ts
index 7cbaec50..7aab8ab3 100644
--- a/packages/decentralized-convex-server/src/descriptor.ts
+++ b/packages/decentralized-convex-server/src/descriptor.ts
@@ -13,9 +13,11 @@ export interface FederationAuthDescriptor {
 }
 
 export interface FederationDescriptor {
+  accountDomain: string;
   auth?: FederationAuthDescriptor;
   capabilities?: readonly FederationCapability[];
   deploymentUrl: string;
+  httpUrl: string;
   protocolVersion: "0.1";
 }
 
diff --git a/packages/decentralized-convex-server/src/dispatcher.ts b/packages/decentralized-convex-server/src/dispatcher.ts
new file mode 100644
index 00000000..c1f621ba
--- /dev/null
+++ b/packages/decentralized-convex-server/src/dispatcher.ts
@@ -0,0 +1,269 @@
+import type {
+  OperationArgs,
+  OperationMap,
+  OperationRequest,
+  OperationResponse,
+  OperationResult,
+  PluginProtocol,
+} from "@decentralized-convex/plugin";
+import type {
+  Auth,
+  FunctionReference,
+  GenericDataModel,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  MutationBuilder,
+  QueryBuilder,
+  ValidatorTypeToReturnType,
+} from "convex/server";
+import type { Value } from "convex/values";
+import {
+  operationResponseValidator,
+  operationValidator,
+} from "@decentralized-convex/plugin";
+import { ConvexError, v } from "convex/values";
+
+export interface DispatcherIdentity {
+  readonly accountId?: string;
+  readonly email?: string;
+  readonly issuer: string;
+  readonly name?: string;
+  readonly subject: string;
+  readonly tokenIdentifier: string;
+}
+
+const dispatcherIdentity = v.object({
+  accountId: v.optional(v.string()),
+  email: v.optional(v.string()),
+  issuer: v.string(),
+  name: v.optional(v.string()),
+  subject: v.string(),
+  tokenIdentifier: v.string(),
+});
+
+const componentDispatcherArgs = {
+  identity: v.union(v.null(), dispatcherIdentity),
+  operation: v.any(),
+};
+
+type MaybePromise<Value> = Promise<Value> | Value;
+
+export interface OperationHandlerContext<Args> {
+  readonly args: Args;
+  readonly identity: DispatcherIdentity | null;
+}
+
+export type OperationHandlers<Operations extends OperationMap, Context> = {
+  readonly [Name in keyof Operations]: (
+    ctx: Context,
+    request: OperationHandlerContext<OperationArgs<Operations[Name]>>,
+  ) => MaybePromise<OperationResult<Operations[Name]>>;
+};
+
+export function defineComponentDispatchers<
+  DataModel extends GenericDataModel,
+  const Name extends string,
+  const Version extends string,
+  const Queries extends OperationMap,
+  const Mutations extends OperationMap,
+>({
+  handlers,
+  mutation,
+  protocol,
+  query,
+}: {
+  readonly handlers: {
+    readonly mutations: OperationHandlers<
+      Mutations,
+      GenericMutationCtx<DataModel>
+    >;
+    readonly queries: OperationHandlers<Queries, GenericQueryCtx<DataModel>>;
+  };
+  readonly mutation: MutationBuilder<DataModel, "public">;
+  readonly protocol: PluginProtocol<Name, Version, Queries, Mutations>;
+  readonly query: QueryBuilder<DataModel, "public">;
+}) {
+  const queryOperation = operationValidator(protocol.queries);
+  const mutationOperation = operationValidator(protocol.mutations);
+  const queryReturns = operationResponseValidator(protocol.queries);
+  const mutationReturns = operationResponseValidator(protocol.mutations);
+
+  return {
+    dispatchMutation: mutation({
+      args: {
+        identity: componentDispatcherArgs.identity,
+        operation: mutationOperation,
+        version: v.literal(protocol.version),
+      },
+      returns: mutationReturns,
+      handler: async (ctx, { identity, operation }) =>
+        // Convex applies a top-level nullability transform that cannot be proven for an open union.
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        ({
+          type: operation.type,
+          value: await invokeOperation(
+            handlers.mutations,
+            ctx,
+            identity,
+            operation,
+          ),
+        }) as ValidatorTypeToReturnType<OperationResponse<Mutations>>,
+    }),
+    dispatchQuery: query({
+      args: {
+        identity: componentDispatcherArgs.identity,
+        operation: queryOperation,
+        version: v.literal(protocol.version),
+      },
+      returns: queryReturns,
+      handler: async (ctx, { identity, operation }) =>
+        // Convex applies a top-level nullability transform that cannot be proven for an open union.
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        ({
+          type: operation.type,
+          value: await invokeOperation(
+            handlers.queries,
+            ctx,
+            identity,
+            operation,
+          ),
+        }) as ValidatorTypeToReturnType<OperationResponse<Queries>>,
+    }),
+  } as const;
+}
+
+type ComponentQuery = FunctionReference<
+  "query",
+  "internal" | "public",
+  // Component operation unions differ by plugin and are erased only inside the trusted router.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  { identity: DispatcherIdentity | null; operation: any; version: string },
+  DispatcherResponse
+>;
+
+type ComponentMutation = FunctionReference<
+  "mutation",
+  "internal" | "public",
+  // Component operation unions differ by plugin and are erased only inside the trusted router.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  { identity: DispatcherIdentity | null; operation: any; version: string },
+  DispatcherResponse
+>;
+
+interface DispatcherResponse {
+  readonly type: string;
+  readonly value: Value;
+}
+
+export function definePdsRouter<DataModel extends GenericDataModel>({
+  components,
+  mutation,
+  query,
+}: {
+  readonly components: unknown;
+  readonly mutation: MutationBuilder<DataModel, "public">;
+  readonly query: QueryBuilder<DataModel, "public">;
+}) {
+  const installed = readDispatcherComponents(components);
+  return {
+    dispatchMutation: mutation({
+      args: { operation: v.any(), plugin: v.string(), version: v.string() },
+      returns: v.any(),
+      handler: async (ctx, request) => {
+        const component = getDispatcherComponent(installed, request.plugin);
+        const identity = await resolveIdentity(ctx);
+        const response = await ctx.runMutation(component.mutation, {
+          identity,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+          operation: request.operation,
+          version: request.version,
+        });
+        return response.value;
+      },
+    }),
+    dispatchQuery: query({
+      args: { operation: v.any(), plugin: v.string(), version: v.string() },
+      returns: v.any(),
+      handler: async (ctx, request) => {
+        const component = getDispatcherComponent(installed, request.plugin);
+        const identity = await resolveIdentity(ctx);
+        const response = await ctx.runQuery(component.query, {
+          identity,
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+          operation: request.operation,
+          version: request.version,
+        });
+        return response.value;
+      },
+    }),
+  } as const;
+}
+
+function invokeOperation<Operations extends OperationMap, Context>(
+  handlers: OperationHandlers<Operations, Context>,
+  ctx: Context,
+  identity: DispatcherIdentity | null,
+  operation: OperationRequest<Operations>,
+): MaybePromise<OperationResult<Operations[keyof Operations]>> {
+  const handler = handlers[operation.type];
+  if (typeof handler !== "function") {
+    throw new ConvexError({
+      code: "UNKNOWN_PLUGIN_OPERATION",
+      operation: operation.type,
+    });
+  }
+
+  // The discriminated operation validator guarantees this handler receives its matching args.
+  return Reflect.apply(handler, undefined, [
+    ctx,
+    { args: operation.args, identity },
+  ]);
+}
+
+interface DispatcherComponent {
+  readonly dispatcher: {
+    readonly dispatchMutation: ComponentMutation;
+    readonly dispatchQuery: ComponentQuery;
+  };
+}
+
+type DispatcherComponents = Readonly<Record<string, DispatcherComponent>>;
+
+function readDispatcherComponents(components: unknown): DispatcherComponents {
+  // Convex generates `components` as a lazy proxy. Computed property access creates the same
+  // FunctionReferences as static `components.myPlugin.dispatcher.*` access.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return components as DispatcherComponents;
+}
+
+function getDispatcherComponent(
+  components: DispatcherComponents,
+  plugin: string,
+) {
+  const component = components[plugin];
+  if (component === undefined) {
+    throw new ConvexError({ code: "PLUGIN_NOT_INSTALLED", plugin });
+  }
+  return {
+    mutation: component.dispatcher.dispatchMutation,
+    query: component.dispatcher.dispatchQuery,
+  };
+}
+
+async function resolveIdentity(ctx: {
+  readonly auth: Auth;
+}): Promise<DispatcherIdentity | null> {
+  const identity = await ctx.auth.getUserIdentity();
+  return identity === null
+    ? null
+    : {
+        ...(typeof identity.accountId === "string"
+          ? { accountId: identity.accountId }
+          : {}),
+        issuer: identity.issuer,
+        ...(identity.email === undefined ? {} : { email: identity.email }),
+        ...(identity.name === undefined ? {} : { name: identity.name }),
+        subject: identity.subject,
+        tokenIdentifier: identity.tokenIdentifier,
+      };
+}
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
index f1635aa6..ce6e1b26 100644
--- a/packages/decentralized-convex-server/src/index.ts
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -9,3 +9,9 @@ export type {
   FederationDescriptor,
   RegisterFederationRoutesOptions,
 } from "./descriptor.ts";
+export { defineComponentDispatchers, definePdsRouter } from "./dispatcher.ts";
+export type {
+  DispatcherIdentity,
+  OperationHandlerContext,
+  OperationHandlers,
+} from "./dispatcher.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index 93740b52..251d08c9 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -1,4 +1,9 @@
-export { federatedQueryOptions } from "./options.ts";
-export type { FederatedTanStackQueryOptions } from "./options.ts";
+export { federatedPdsQueryOptions, federatedQueryOptions } from "./options.ts";
+export type {
+  FederatedPdsTanStackQueryOptions,
+  FederatedTanStackQueryOptions,
+} from "./options.ts";
+export { useFederatedPdsQuery } from "./useFederatedPdsQuery.ts";
+export type { FederatedPdsTanStackQueryResult } from "./useFederatedPdsQuery.ts";
 export { useFederatedQuery } from "./useFederatedQuery.ts";
 export type { FederatedTanStackQueryResult } from "./useFederatedQuery.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/options.ts b/packages/decentralized-convex-tanstack-query/src/options.ts
index ceeddd8e..caec395e 100644
--- a/packages/decentralized-convex-tanstack-query/src/options.ts
+++ b/packages/decentralized-convex-tanstack-query/src/options.ts
@@ -1,5 +1,8 @@
 import type {
+  AnyPdsQueryRequest,
+  DefaultCombinedPdsResult,
   DefaultCombinedResult,
+  FederatedPdsQueryOptions,
   FederatedQueryOptions,
   FederationQueryReference,
 } from "@decentralized-convex/client";
@@ -22,3 +25,20 @@ export function federatedQueryOptions<
 ): FederatedTanStackQueryOptions<Query, Combined> {
   return options;
 }
+
+export interface FederatedPdsTanStackQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Combined = DefaultCombinedPdsResult<Request>,
+> extends FederatedPdsQueryOptions<Request, Combined> {
+  enabled?: boolean;
+  queryKey: QueryKey;
+}
+
+export function federatedPdsQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Combined = DefaultCombinedPdsResult<Request>,
+>(
+  options: FederatedPdsTanStackQueryOptions<Request, Combined>,
+): FederatedPdsTanStackQueryOptions<Request, Combined> {
+  return options;
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts b/packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts
new file mode 100644
index 00000000..c5f9f1c1
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts
@@ -0,0 +1,100 @@
+import type {
+  AnyPdsQueryRequest,
+  FederatedQueryStatus,
+  FederationSourceSnapshot,
+  PdsRequestResult,
+} from "@decentralized-convex/client";
+import type { DefaultError, UseQueryResult } from "@tanstack/react-query";
+import { useEffect, useEffectEvent, useState } from "react";
+import { hashKey, useQuery, useQueryClient } from "@tanstack/react-query";
+import { groupFederationTargets } from "@decentralized-convex/client";
+import { useDecentralizedConvex } from "@decentralized-convex/react";
+
+import type { FederatedPdsTanStackQueryOptions } from "./options.ts";
+
+export type FederatedPdsTanStackQueryResult<Data, SourceResult> =
+  UseQueryResult<Data, DefaultError> & {
+    federation: {
+      sources: readonly FederationSourceSnapshot<SourceResult>[];
+      status: FederatedQueryStatus;
+    };
+  };
+
+interface FederationState<SourceResult> {
+  sources: readonly FederationSourceSnapshot<SourceResult>[];
+  status: FederatedQueryStatus;
+}
+
+export function useFederatedPdsQuery<
+  Request extends AnyPdsQueryRequest,
+  Combined,
+>(
+  options: FederatedPdsTanStackQueryOptions<Request, Combined>,
+): FederatedPdsTanStackQueryResult<Combined, PdsRequestResult<Request>> {
+  const client = useDecentralizedConvex();
+  const queryClient = useQueryClient();
+  const queryHash = hashKey(options.queryKey);
+  const [federation, setFederation] = useState<
+    FederationState<PdsRequestResult<Request>>
+  >(() => emptyFederation(options));
+  const startObserver = useEffectEvent(() => client.watchPdsQuery(options));
+  const publish = useEffectEvent(
+    (snapshot: ReturnType<ReturnType<typeof startObserver>["getSnapshot"]>) => {
+      setFederation({ sources: snapshot.sources, status: snapshot.status });
+      if (snapshot.status === "success" || snapshot.status === "partial") {
+        queryClient.setQueryData(options.queryKey, snapshot.data);
+      }
+    },
+  );
+
+  const query = useQuery({
+    enabled: options.enabled,
+    queryFn: async () => {
+      const snapshot = await client.pdsQuery(options);
+      if (snapshot.status === "error") {
+        throw new AggregateError(
+          snapshot.sources.flatMap((source) => source.error ?? []),
+          "Every PDS query target failed",
+        );
+      }
+      return snapshot.data;
+    },
+    queryKey: options.queryKey,
+    staleTime: Infinity,
+  });
+
+  useEffect(() => {
+    if (options.enabled === false) return;
+    const observer = startObserver();
+    function publishCurrent() {
+      publish(observer.getSnapshot());
+    }
+    publishCurrent();
+    const unsubscribe = observer.subscribe(publishCurrent);
+    return () => {
+      unsubscribe();
+      observer.close();
+    };
+  }, [options.enabled, queryHash]);
+
+  return {
+    ...query,
+    federation: {
+      sources: federation.sources,
+      status: federation.status,
+    },
+  };
+}
+
+function emptyFederation<Request extends AnyPdsQueryRequest, Combined>(
+  options: FederatedPdsTanStackQueryOptions<Request, Combined>,
+): FederationState<PdsRequestResult<Request>> {
+  const sources = groupFederationTargets(options.targets).map((target) => ({
+    status: "pending" as const,
+    target,
+  }));
+  return {
+    sources,
+    status: sources.length === 0 ? "success" : "pending",
+  };
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9ad30a40..75a05145 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,6 +45,9 @@ catalogs:
     eslint:
       specifier: ^9.38.0
       version: 9.39.4
+    jose:
+      specifier: ^6.2.7
+      version: 6.2.7
     lucide-react:
       specifier: ^0.562.0
       version: 0.562.0
@@ -60,6 +63,9 @@ catalogs:
     typescript:
       specifier: ^5.9.3
       version: 5.9.3
+    zod:
+      specifier: ^3.25.76
+      version: 3.25.76
   react19:
     '@types/react':
       specifier: ~19.2.0
@@ -119,6 +125,9 @@ importers:
       '@decentralized-convex/client':
         specifier: workspace:*
         version: link:../../packages/decentralized-convex-client
+      '@decentralized-convex/messages':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-messages
       '@decentralized-convex/react':
         specifier: workspace:*
         version: link:../../packages/decentralized-convex-react
@@ -190,11 +199,41 @@ importers:
         specifier: ^7.3.1
         version: 7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)
 
-  packages/decentralized-convex-address:
+  packages/decentralized-convex-accounts:
     dependencies:
-      '@decentralized-convex/client':
+      '@decentralized-convex/plugin':
         specifier: workspace:*
-        version: link:../decentralized-convex-client
+        version: link:../decentralized-convex-plugin
+      '@decentralized-convex/server':
+        specifier: workspace:*
+        version: link:../decentralized-convex-server
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  packages/decentralized-convex-address:
     devDependencies:
       '@acme/eslint-config':
         specifier: workspace:*
@@ -219,6 +258,74 @@ importers:
         version: 5.9.3
 
   packages/decentralized-convex-client:
+    dependencies:
+      '@decentralized-convex/address':
+        specifier: workspace:*
+        version: link:../decentralized-convex-address
+      '@decentralized-convex/plugin':
+        specifier: workspace:*
+        version: link:../decentralized-convex-plugin
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  packages/decentralized-convex-messages:
+    dependencies:
+      '@decentralized-convex/plugin':
+        specifier: workspace:*
+        version: link:../decentralized-convex-plugin
+      '@decentralized-convex/server':
+        specifier: workspace:*
+        version: link:../decentralized-convex-server
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
+  packages/decentralized-convex-plugin:
     dependencies:
       convex:
         specifier: 'catalog:'
@@ -285,6 +392,9 @@ importers:
 
   packages/decentralized-convex-server:
     dependencies:
+      '@decentralized-convex/plugin':
+        specifier: workspace:*
+        version: link:../decentralized-convex-plugin
       convex:
         specifier: 'catalog:'
         version: 1.38.0(react@19.2.5)
@@ -359,6 +469,15 @@ importers:
       '@convex-dev/better-auth':
         specifier: 0.12.5
         version: 0.12.5(@standard-schema/spec@1.1.0)(better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)
+      '@decentralized-convex/accounts':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-accounts
+      '@decentralized-convex/address':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-address
+      '@decentralized-convex/messages':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-messages
       '@decentralized-convex/server':
         specifier: workspace:*
         version: link:../../packages/decentralized-convex-server
@@ -368,6 +487,12 @@ importers:
       convex:
         specifier: 'catalog:'
         version: 1.38.0(react@19.2.5)
+      jose:
+        specifier: 'catalog:'
+        version: 6.2.7
+      zod:
+        specifier: 'catalog:'
+        version: 3.25.76
     devDependencies:
       '@acme/eslint-config':
         specifier: workspace:*
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a17e0fbd..dcd7d67d 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -41,6 +41,7 @@ catalog:
   eslint: ^9.38.0
   fast-deep-equal: ^3.1.3
   great-time: ^1.0.0
+  jose: ^6.2.7
   lucide-react: ^0.562.0
   next-themes: ^0.4.6
   nitro: 3.0.1-alpha.2
diff --git a/services/backend/README.md b/services/backend/README.md
index 2c8458bd..393fd6aa 100644
--- a/services/backend/README.md
+++ b/services/backend/README.md
@@ -1,7 +1,16 @@
 # Vera backend
 
-This Convex service is the backend installed on each Vera home server. The same
-schema and functions can be deployed to multiple independent Convex deployments.
+This is the thin PDS host used by Vera. It installs reusable Components from the
+workspace packages instead of owning product data in its root database:
+
+```ts
+app.use(accounts);
+app.use(messages);
+```
+
+The root exposes Better Auth plus one generic PDS query and mutation. Message
+schema and behavior live entirely in `@decentralized-convex/messages`; account
+profiles live in `@decentralized-convex/accounts`.
 
 For local federation testing, create `.env.a.local` and `.env.b.local` from
 `.env.example`, then deploy each target:
@@ -13,4 +22,21 @@ pnpm --filter @vera/backend deploy:b
 
 Each deployment needs its own `FEDERATION_DOMAIN`. Better Auth is the current
 Vera authentication choice; the decentralized Convex packages remain auth
-provider agnostic.
+provider agnostic. The same backend is currently deployed to the independent A
+and B development deployments.
+
+## Public discovery
+
+An account domain needs exactly one DNS record. Publish a TXT record at
+`_pds.<account-domain>` with this value:
+
+```text
+v=pds1;url=https://<deployment>.convex.site/.well-known/decentralized-convex
+```
+
+The manifest returns the PDS's current Convex realtime URL, HTTP/auth URL,
+public signing keys, and installed protocol versions. The `convex.cloud` and
+`convex.site` hostnames are transport details; account identities remain
+`username@<account-domain>`. This setup is identical on free and Pro Convex
+plans. A host may use Convex custom domains internally, but Vera does not
+require or infer `api.` or `pds.` subdomains.
diff --git a/services/backend/convex/_generated/api.d.ts b/services/backend/convex/_generated/api.d.ts
index 997d2847..c38b6f31 100644
--- a/services/backend/convex/_generated/api.d.ts
+++ b/services/backend/convex/_generated/api.d.ts
@@ -8,22 +8,24 @@
  * @module
  */
 
+import type * as auth from "../auth.js";
+import type * as federationAuth from "../federationAuth.js";
+import type * as http from "../http.js";
+import type * as lib from "../lib.js";
+import type * as pds from "../pds.js";
+
 import type {
   ApiFromModules,
   FilterApi,
   FunctionReference,
 } from "convex/server";
 
-import type * as auth from "../auth.js";
-import type * as http from "../http.js";
-import type * as lib from "../lib.js";
-import type * as messages from "../messages.js";
-
 declare const fullApi: ApiFromModules<{
   auth: typeof auth;
+  federationAuth: typeof federationAuth;
   http: typeof http;
   lib: typeof lib;
-  messages: typeof messages;
+  pds: typeof pds;
 }>;
 
 /**
@@ -54,4 +56,6 @@ export declare const internal: FilterApi<
 
 export declare const components: {
   betterAuth: import("@convex-dev/better-auth/_generated/component.js").ComponentApi<"betterAuth">;
+  accounts: import("@decentralized-convex/accounts/_generated/component.js").ComponentApi<"accounts">;
+  messages: import("@decentralized-convex/messages/_generated/component.js").ComponentApi<"messages">;
 };
diff --git a/services/backend/convex/_generated/dataModel.d.ts b/services/backend/convex/_generated/dataModel.d.ts
index b3ac5131..f97fd194 100644
--- a/services/backend/convex/_generated/dataModel.d.ts
+++ b/services/backend/convex/_generated/dataModel.d.ts
@@ -11,11 +11,10 @@
 import type {
   DataModelFromSchemaDefinition,
   DocumentByName,
-  SystemTableNames,
   TableNamesInDataModel,
+  SystemTableNames,
 } from "convex/server";
 import type { GenericId } from "convex/values";
-
 import schema from "../schema.js";
 
 /**
diff --git a/services/backend/convex/_generated/server.d.ts b/services/backend/convex/_generated/server.d.ts
index f2c6ad31..bec05e68 100644
--- a/services/backend/convex/_generated/server.d.ts
+++ b/services/backend/convex/_generated/server.d.ts
@@ -10,16 +10,15 @@
 
 import {
   ActionBuilder,
-  GenericActionCtx,
-  GenericDatabaseReader,
-  GenericDatabaseWriter,
-  GenericMutationCtx,
-  GenericQueryCtx,
   HttpActionBuilder,
   MutationBuilder,
   QueryBuilder,
+  GenericActionCtx,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  GenericDatabaseReader,
+  GenericDatabaseWriter,
 } from "convex/server";
-
 import type { DataModel } from "./dataModel.js";
 
 /**
diff --git a/services/backend/convex/_generated/server.js b/services/backend/convex/_generated/server.js
index 3b69f406..bf3d25ad 100644
--- a/services/backend/convex/_generated/server.js
+++ b/services/backend/convex/_generated/server.js
@@ -11,11 +11,11 @@
 import {
   actionGeneric,
   httpActionGeneric,
+  queryGeneric,
+  mutationGeneric,
   internalActionGeneric,
   internalMutationGeneric,
   internalQueryGeneric,
-  mutationGeneric,
-  queryGeneric,
 } from "convex/server";
 
 /**
diff --git a/services/backend/convex/auth.ts b/services/backend/convex/auth.ts
index 6869473b..cee6e539 100644
--- a/services/backend/convex/auth.ts
+++ b/services/backend/convex/auth.ts
@@ -7,6 +7,7 @@ import type { DataModel } from "./_generated/dataModel";
 import { components } from "./_generated/api";
 import { query } from "./_generated/server";
 import authConfig from "./auth.config";
+import { pdsFederationAuth } from "./federationAuth";
 import { actorFromEmail, requireEnvironment } from "./lib";
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
@@ -22,7 +23,21 @@ export function createAuth(ctx: GenericCtx<DataModel>) {
     },
     plugins: [
       crossDomain({ siteUrl }),
-      convex({ authConfig, jwksRotateOnTokenGenerationError: true }),
+      convex({
+        authConfig,
+        jwksRotateOnTokenGenerationError: true,
+        jwt: {
+          definePayload: ({ user }) => ({
+            accountId: actorFromEmail(user.email),
+            email: user.email,
+            name: user.name,
+          }),
+        },
+      }),
+      pdsFederationAuth({
+        accountDomain: requireEnvironment("FEDERATION_DOMAIN"),
+        issuer: requireEnvironment("CONVEX_SITE_URL"),
+      }),
     ],
     trustedOrigins: [siteUrl],
   });
diff --git a/services/backend/convex/convex.config.ts b/services/backend/convex/convex.config.ts
index cd83cc50..6400869d 100644
--- a/services/backend/convex/convex.config.ts
+++ b/services/backend/convex/convex.config.ts
@@ -1,7 +1,11 @@
 import betterAuth from "@convex-dev/better-auth/convex.config";
+import accounts from "@decentralized-convex/accounts/convex.config";
+import messages from "@decentralized-convex/messages/convex.config";
 import { defineApp } from "convex/server";
 
 const app = defineApp();
 app.use(betterAuth);
+app.use(accounts);
+app.use(messages);
 
 export default app;
diff --git a/services/backend/convex/federationAuth.ts b/services/backend/convex/federationAuth.ts
new file mode 100644
index 00000000..58d587ca
--- /dev/null
+++ b/services/backend/convex/federationAuth.ts
@@ -0,0 +1,180 @@
+import type { BetterAuthPlugin } from "better-auth";
+import type { JwtOptions } from "better-auth/plugins/jwt";
+import { discoverPds } from "@decentralized-convex/address";
+import { createAuthEndpoint, sessionMiddleware } from "better-auth/api";
+import { signJWT } from "better-auth/plugins/jwt";
+import { createRemoteJWKSet, decodeJwt, jwtVerify } from "jose";
+import { z } from "zod";
+
+import { actorFromEmail } from "./lib";
+
+const assertionBody = z.object({
+  audience: z.string().min(1),
+});
+
+const exchangeBody = z.object({
+  assertion: z.string().min(1),
+});
+
+interface PdsFederationAuthOptions {
+  accountDomain: string;
+  issuer: string;
+}
+
+export function pdsFederationAuth(
+  options: PdsFederationAuthOptions,
+): BetterAuthPlugin {
+  const jwtOptions = {
+    jwt: {
+      audience: "convex",
+      expirationTime: "15m",
+      issuer: options.issuer,
+    },
+    jwks: { keyPairConfig: { alg: "EdDSA" } },
+  } satisfies JwtOptions;
+
+  return {
+    endpoints: {
+      createFederationAssertion: createAuthEndpoint(
+        "/federation/assertion",
+        { body: assertionBody, method: "POST", use: [sessionMiddleware] },
+        async (ctx) => {
+          const audience = normalizeDomain(ctx.body.audience);
+          const accountId = actorFromEmail(ctx.context.session.user.email);
+          const issuedAt = nowInSeconds();
+          const assertion = await signJWT(ctx, {
+            options: {
+              ...jwtOptions,
+              jwt: {
+                ...jwtOptions.jwt,
+                audience,
+                expirationTime: "5m",
+              },
+            },
+            payload: {
+              accountId,
+              aud: audience,
+              home: options.accountDomain,
+              iat: issuedAt,
+              jti: crypto.randomUUID(),
+              name: ctx.context.session.user.name,
+              purpose: "pds-federation",
+              sub: ctx.context.session.user.id,
+            },
+          });
+          return { assertion };
+        },
+      ),
+      exchangeFederationAssertion: createAuthEndpoint(
+        "/federation/exchange",
+        { body: exchangeBody, method: "POST" },
+        async (ctx) => {
+          let verifiedAssertion: VerifiedAssertion;
+          try {
+            verifiedAssertion = await verifyAssertion(
+              ctx.body.assertion,
+              options.accountDomain,
+            );
+          } catch {
+            throw ctx.error("UNAUTHORIZED", {
+              message: "Invalid federation assertion",
+            });
+          }
+          const { accountId, auth, homeDomain, payload } = verifiedAssertion;
+
+          const issuedAt = nowInSeconds();
+          const expiresAt = issuedAt + 15 * 60;
+          const token = await signJWT(ctx, {
+            options: jwtOptions,
+            payload: {
+              accountId,
+              aud: "convex",
+              email: accountId,
+              exp: expiresAt,
+              federated: true,
+              home: homeDomain,
+              iat: issuedAt,
+              jti: crypto.randomUUID(),
+              name:
+                typeof payload.name === "string"
+                  ? payload.name
+                  : accountId.split("@")[0],
+              originalIssuer: auth.issuer,
+              sub: accountId,
+            },
+          });
+          return { accountId, expiresAt, token };
+        },
+      ),
+    },
+    id: "pds-federation-auth",
+  } satisfies BetterAuthPlugin;
+}
+
+interface VerifiedAssertion {
+  accountId: string;
+  auth: { issuer: string; jwksUrl: string };
+  homeDomain: string;
+  payload: Awaited<ReturnType<typeof jwtVerify>>["payload"];
+}
+
+async function verifyAssertion(
+  assertion: string,
+  audience: string,
+): Promise<VerifiedAssertion> {
+  const unverified = decodeJwt(assertion);
+  const accountId = requireClaim(unverified.accountId, "accountId");
+  const homeDomain = accountDomainFromId(accountId);
+  if (unverified.purpose !== "pds-federation") {
+    throw new Error("Invalid federation assertion purpose");
+  }
+
+  const discovery = await discoverPds(homeDomain);
+  const auth = discovery.manifest.auth;
+  if (auth === undefined) {
+    throw new Error("The home PDS does not advertise authentication");
+  }
+  const verified = await jwtVerify(
+    assertion,
+    createRemoteJWKSet(new URL(auth.jwksUrl)),
+    { audience, issuer: auth.issuer },
+  );
+  if (
+    verified.payload.accountId !== accountId ||
+    verified.payload.home !== homeDomain ||
+    verified.payload.purpose !== "pds-federation"
+  ) {
+    throw new Error("Federation identity does not match its home PDS");
+  }
+  return { accountId, auth, homeDomain, payload: verified.payload };
+}
+
+function accountDomainFromId(accountId: string) {
+  const separator = accountId.lastIndexOf("@");
+  if (separator < 1) throw new Error("Invalid federated account ID");
+  return normalizeDomain(accountId.slice(separator + 1));
+}
+
+function normalizeDomain(value: string) {
+  const domain = value.trim().toLowerCase();
+  if (
+    !domain.includes(".") ||
+    !domain
+      .split(".")
+      .every((label) => /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/.test(label))
+  ) {
+    throw new Error("Invalid PDS account domain");
+  }
+  return domain;
+}
+
+function requireClaim(value: unknown, name: string) {
+  if (typeof value !== "string" || value.length === 0) {
+    throw new Error(`Federation assertion is missing ${name}`);
+  }
+  return value;
+}
+
+function nowInSeconds() {
+  return Math.floor(Date.now() / 1_000);
+}
diff --git a/services/backend/convex/http.ts b/services/backend/convex/http.ts
index ece6eac3..62791299 100644
--- a/services/backend/convex/http.ts
+++ b/services/backend/convex/http.ts
@@ -10,12 +10,17 @@ const http = httpRouter();
 authComponent.registerRoutes(http, createAuth, { cors: true });
 registerFederationRoutes(http, httpAction, {
   descriptor: () => ({
+    accountDomain: requireEnvironment("FEDERATION_DOMAIN"),
     auth: {
       issuer: requireEnvironment("CONVEX_SITE_URL"),
       jwksUrl: `${requireEnvironment("CONVEX_SITE_URL")}/api/auth/convex/jwks`,
     },
-    capabilities: [{ id: "vera.chat", versions: ["1"] }],
+    capabilities: [
+      { id: "accounts", versions: ["1"] },
+      { id: "messages", versions: ["1"] },
+    ],
     deploymentUrl: requireEnvironment("CONVEX_CLOUD_URL"),
+    httpUrl: requireEnvironment("CONVEX_SITE_URL"),
     protocolVersion: "0.1",
   }),
 });
diff --git a/services/backend/convex/messages.ts b/services/backend/convex/messages.ts
deleted file mode 100644
index 6f92f107..00000000
--- a/services/backend/convex/messages.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { v } from "convex/values";
-
-import { mutation, query } from "./_generated/server";
-import { authComponent } from "./auth";
-import { actorFromEmail, requireEnvironment } from "./lib";
-
-export const list = query({
-  args: { roomId: v.string() },
-  handler: async (ctx, { roomId }) => {
-    const messages = await ctx.db
-      .query("messages")
-      .withIndex("by_room", (index) => index.eq("roomId", roomId))
-      .collect();
-    return messages.map(
-      ({ author, authorName, body, eventId, origin, sentAt }) => ({
-        author,
-        authorName: authorName ?? author,
-        body,
-        eventId,
-        origin,
-        sentAt,
-      }),
-    );
-  },
-});
-
-export const send = mutation({
-  args: {
-    body: v.string(),
-    eventId: v.string(),
-    roomId: v.string(),
-    sentAt: v.number(),
-  },
-  handler: async (ctx, args) => {
-    const body = args.body.trim();
-    if (body.length === 0 || body.length > 4_000) {
-      throw new Error("Messages must contain between 1 and 4,000 characters");
-    }
-
-    const user = await authComponent.getAuthUser(ctx);
-
-    const existing = await ctx.db
-      .query("messages")
-      .withIndex("by_event", (index) => index.eq("eventId", args.eventId))
-      .unique();
-    if (existing === null) {
-      await ctx.db.insert("messages", {
-        author: actorFromEmail(user.email),
-        authorName: user.name,
-        body,
-        eventId: args.eventId,
-        origin: requireEnvironment("FEDERATION_DOMAIN").toLowerCase(),
-        roomId: args.roomId,
-        sentAt: args.sentAt,
-      });
-    }
-    return { eventId: args.eventId };
-  },
-});
diff --git a/services/backend/convex/pds.ts b/services/backend/convex/pds.ts
new file mode 100644
index 00000000..41d5a0aa
--- /dev/null
+++ b/services/backend/convex/pds.ts
@@ -0,0 +1,10 @@
+import { definePdsRouter } from "@decentralized-convex/server";
+
+import { components } from "./_generated/api";
+import { mutation, query } from "./_generated/server";
+
+export const { dispatchMutation, dispatchQuery } = definePdsRouter({
+  components,
+  mutation,
+  query,
+});
diff --git a/services/backend/convex/schema.ts b/services/backend/convex/schema.ts
index 8b376033..956f9899 100644
--- a/services/backend/convex/schema.ts
+++ b/services/backend/convex/schema.ts
@@ -1,16 +1,3 @@
-import { defineSchema, defineTable } from "convex/server";
-import { v } from "convex/values";
+import { defineSchema } from "convex/server";
 
-export default defineSchema({
-  messages: defineTable({
-    author: v.string(),
-    authorName: v.optional(v.string()),
-    body: v.string(),
-    eventId: v.string(),
-    origin: v.string(),
-    roomId: v.string(),
-    sentAt: v.number(),
-  })
-    .index("by_event", ["eventId"])
-    .index("by_room", ["roomId"]),
-});
+export default defineSchema({});
diff --git a/services/backend/package.json b/services/backend/package.json
index 3aab6e21..82da873a 100644
--- a/services/backend/package.json
+++ b/services/backend/package.json
@@ -17,9 +17,14 @@
   },
   "dependencies": {
     "@convex-dev/better-auth": "0.12.5",
+    "@decentralized-convex/accounts": "workspace:*",
+    "@decentralized-convex/address": "workspace:*",
+    "@decentralized-convex/messages": "workspace:*",
     "@decentralized-convex/server": "workspace:*",
     "better-auth": "~1.6.15",
-    "convex": "catalog:"
+    "convex": "catalog:",
+    "jose": "catalog:",
+    "zod": "catalog:"
   },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",

From dbd1c9478c18c4accc5c1d80f70d49d844f6b440 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 12:47:21 -0400
Subject: [PATCH 05/17] Refine decentralized Convex developer experience

---
 README.md                                     |  95 ++++-
 apps/web/README.md                            |  29 +-
 apps/web/src/auth-client.ts                   |  14 -
 apps/web/src/cloud/AuthenticatedSession.tsx   | 106 ------
 apps/web/src/cloud/ChatRoom.tsx               |  37 --
 apps/web/src/cloud/ChatSidebar.tsx            |  54 ---
 apps/web/src/cloud/ConnectionDiagnostics.tsx  |  44 ---
 apps/web/src/cloud/ConversationHeader.tsx     |  43 ---
 apps/web/src/cloud/HomeServerSession.tsx      |  41 ---
 apps/web/src/cloud/Message.tsx                |  30 --
 apps/web/src/cloud/MessageComposer.tsx        |  46 ---
 apps/web/src/cloud/MessageList.tsx            |  50 ---
 apps/web/src/cloud/ServerLoading.tsx          |  12 -
 apps/web/src/cloud/SessionGate.tsx            |  22 --
 apps/web/src/cloud/actor.tsx                  |  11 -
 apps/web/src/cloud/use-chat-room.ts           |  51 ---
 .../account/AccountEntry.tsx}                 |  84 ++---
 .../src/features/account/AccountSession.tsx   | 172 ++++++++++
 .../account/SignInForm.tsx}                   |  26 +-
 .../features/conversation/Conversation.tsx    | 279 +++++++++++++++
 .../features/conversation/useConversation.ts  |  63 ++++
 .../pds/auth.ts}                              |  41 ++-
 apps/web/src/features/pds/model.ts            |  27 ++
 apps/web/src/live/config.ts                   |  26 --
 apps/web/src/live/queries.ts                  |  35 --
 apps/web/src/routes/index.tsx                 |  18 +-
 docs/architecture.md                          | 124 +++++++
 .../decentralized-convex-accounts/README.md   |  15 +-
 .../_generated/dataModel.ts                   |   3 +-
 .../_generated/server.ts                      |  15 +-
 .../convex.config.ts                          |   6 +-
 .../decentralized-convex-accounts/protocol.ts |   1 +
 .../decentralized-convex-client/README.md     |  23 ++
 .../decentralized-convex-client/src/api.ts    | 158 +++++++++
 .../src/client.test.ts                        |   3 +-
 .../src/pds.test.ts                           |  15 +-
 .../decentralized-convex-client/src/pds.ts    | 159 +--------
 .../src/pds.type-test.ts                      |   7 +-
 .../decentralized-convex-messages/README.md   |  14 +-
 .../_generated/dataModel.ts                   |   3 +-
 .../_generated/server.ts                      |  15 +-
 .../convex.config.ts                          |   6 +-
 .../decentralized-convex-messages/protocol.ts |   1 +
 .../decentralized-convex-plugin/README.md     | 101 ++----
 .../src/capability.ts                         |  46 ---
 .../src/compose.ts                            | 185 ----------
 .../decentralized-convex-plugin/src/graph.ts  | 263 --------------
 .../decentralized-convex-plugin/src/index.ts  |  37 +-
 .../src/operations.test.ts                    |  27 ++
 .../src/operations.ts                         |  39 ++-
 .../src/plugin.test.ts                        | 270 ---------------
 .../decentralized-convex-plugin/src/plugin.ts |  66 ----
 .../src/plugin.type-test.ts                   |  68 ----
 .../src/protocol-graph.test.ts                |  81 +++++
 .../src/protocol-graph.ts                     | 252 ++++++++++++++
 .../src/protocol-graph.type-test.ts           |  20 ++
 .../decentralized-convex-server/README.md     |  50 +++
 .../src/app.test.ts                           |  55 +++
 .../decentralized-convex-server/src/app.ts    | 160 +++++++++
 .../src/app.type-test.ts                      |  59 ++++
 .../src/dispatcher.ts                         |  10 +-
 .../decentralized-convex-server/src/index.ts  |  17 +
 .../README.md                                 |  43 +++
 .../package.json                              |   3 +-
 .../src/index.ts                              |  19 +-
 .../src/options.ts                            |  20 --
 .../src/pds.test.ts                           | 165 +++++++++
 .../src/pds.ts                                | 324 ++++++++++++++++++
 .../src/useFederatedPdsQuery.ts               | 100 ------
 .../tsconfig.json                             |   3 +-
 pnpm-lock.yaml                                |   9 +-
 services/backend/README.md                    |  31 +-
 .../backend/convex/_generated/dataModel.d.ts  |   3 +-
 .../backend/convex/_generated/server.d.ts     |  11 +-
 services/backend/convex/convex.config.ts      |  12 +-
 services/backend/convex/http.ts               |  11 +-
 services/backend/package.json                 |   6 +-
 services/backend/pds.ts                       |   8 +
 services/backend/tsconfig.json                |   5 +
 79 files changed, 2541 insertions(+), 2062 deletions(-)
 delete mode 100644 apps/web/src/auth-client.ts
 delete mode 100644 apps/web/src/cloud/AuthenticatedSession.tsx
 delete mode 100644 apps/web/src/cloud/ChatRoom.tsx
 delete mode 100644 apps/web/src/cloud/ChatSidebar.tsx
 delete mode 100644 apps/web/src/cloud/ConnectionDiagnostics.tsx
 delete mode 100644 apps/web/src/cloud/ConversationHeader.tsx
 delete mode 100644 apps/web/src/cloud/HomeServerSession.tsx
 delete mode 100644 apps/web/src/cloud/Message.tsx
 delete mode 100644 apps/web/src/cloud/MessageComposer.tsx
 delete mode 100644 apps/web/src/cloud/MessageList.tsx
 delete mode 100644 apps/web/src/cloud/ServerLoading.tsx
 delete mode 100644 apps/web/src/cloud/SessionGate.tsx
 delete mode 100644 apps/web/src/cloud/actor.tsx
 delete mode 100644 apps/web/src/cloud/use-chat-room.ts
 rename apps/web/src/{server-picker/ServerPicker.tsx => features/account/AccountEntry.tsx} (64%)
 create mode 100644 apps/web/src/features/account/AccountSession.tsx
 rename apps/web/src/{cloud/AuthForm.tsx => features/account/SignInForm.tsx} (85%)
 create mode 100644 apps/web/src/features/conversation/Conversation.tsx
 create mode 100644 apps/web/src/features/conversation/useConversation.ts
 rename apps/web/src/{federation-auth.ts => features/pds/auth.ts} (81%)
 create mode 100644 apps/web/src/features/pds/model.ts
 delete mode 100644 apps/web/src/live/config.ts
 delete mode 100644 apps/web/src/live/queries.ts
 create mode 100644 docs/architecture.md
 create mode 100644 packages/decentralized-convex-client/README.md
 create mode 100644 packages/decentralized-convex-client/src/api.ts
 delete mode 100644 packages/decentralized-convex-plugin/src/capability.ts
 delete mode 100644 packages/decentralized-convex-plugin/src/compose.ts
 delete mode 100644 packages/decentralized-convex-plugin/src/graph.ts
 delete mode 100644 packages/decentralized-convex-plugin/src/plugin.test.ts
 delete mode 100644 packages/decentralized-convex-plugin/src/plugin.ts
 delete mode 100644 packages/decentralized-convex-plugin/src/plugin.type-test.ts
 create mode 100644 packages/decentralized-convex-plugin/src/protocol-graph.test.ts
 create mode 100644 packages/decentralized-convex-plugin/src/protocol-graph.ts
 create mode 100644 packages/decentralized-convex-plugin/src/protocol-graph.type-test.ts
 create mode 100644 packages/decentralized-convex-server/README.md
 create mode 100644 packages/decentralized-convex-server/src/app.test.ts
 create mode 100644 packages/decentralized-convex-server/src/app.ts
 create mode 100644 packages/decentralized-convex-server/src/app.type-test.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/README.md
 create mode 100644 packages/decentralized-convex-tanstack-query/src/pds.test.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/src/pds.ts
 delete mode 100644 packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts
 create mode 100644 services/backend/pds.ts
 create mode 100644 services/backend/tsconfig.json

diff --git a/README.md b/README.md
index a4f2119d..9c7f8437 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,90 @@
 # Vera
 
-Vera is a decentralized messaging application built on independently hosted
-Convex deployments. The active application also serves as the real-world
-incubator for the decentralized Convex toolkit while its API is still changing
-quickly.
+Vera is the reference application and current incubator for decentralized
+Convex: a small toolkit for building applications whose data and realtime
+subscriptions span independently hosted Convex deployments.
+
+The current branch proves one private, reactive conversation across two PDSs.
+It is intentionally a vertical slice, not a production messaging product yet.
+
+## Start here
+
+Read these files in order to follow one request end to end:
+
+1. `packages/decentralized-convex-messages/protocol.ts` defines the typed
+   Messages API and its dependency on Accounts.
+2. `services/backend/convex/convex.config.ts` installs Better Auth, Accounts,
+   and Messages in one validated PDS app.
+3. `services/backend/convex/pds.ts` exposes the canonical public dispatcher.
+4. `packages/decentralized-convex-messages/dispatcher.ts` implements the
+   Messages operations inside its Component.
+5. `apps/web/src/features/conversation/useConversation.ts` shows the complete
+   client API used for reactive reads and writes.
+
+The longer explanation is in [docs/architecture.md](docs/architecture.md).
+
+## The default setup
+
+A PDS installs ordinary third-party Components and decentralized-convex
+plugins declaratively:
+
+```ts
+import betterAuth from "@convex-dev/better-auth/convex.config";
+import accounts from "@decentralized-convex/accounts/convex.config";
+import messages from "@decentralized-convex/messages/convex.config";
+import { definePdsApp } from "@decentralized-convex/server";
+
+export default definePdsApp({
+  components: [betterAuth],
+  plugins: [accounts, messages],
+});
+```
+
+Messages declares `requires: { accounts: "1" }`. Removing Accounts or
+installing an incompatible version fails type-checking. The normal
+`convex dev`, `convex deploy`, and `convex codegen` commands remain unchanged.
+
+The common client path is similarly small:
+
+```ts
+import { pds } from "@vera/backend/pds";
+
+const messages = usePdsQuery({
+  request: pds.messages.list({ conversationId }),
+  targets,
+});
+```
+
+The backend's `pds` export derives its plugin names, versions, operations, and
+types from the same `definePdsApp` declaration. The web app never repeats the
+installed plugin list, and the discovery manifest derives its capabilities
+from the same protocol tuple.
+
+`usePdsQuery` supplies a stable query key, connection reuse, realtime
+subscriptions, array merging, and per-PDS status by default. `combine`,
+`queryKey`, `enabled`, connection factories, and destination-aware auth remain
+available when an application needs control.
 
 ## Workspace
 
-- `apps/web` — the TanStack Start Vera client
-- `services/backend` — the Convex backend deployed to each Vera server
-- `packages/decentralized-convex-accounts` — reusable PDS account profiles
-- `packages/decentralized-convex-messages` — reusable authenticated messaging
-- `packages/decentralized-convex-*` — shared protocols, routing, and clients
-- `shared` — private code shared by Vera workspace projects
-- `deps` — source dependencies that Vera may need to maintain directly
+- `packages/decentralized-convex-plugin` — operation protocols and dependency
+  graph validation
+- `packages/decentralized-convex-server` — PDS installation, root dispatch,
+  Component dispatch, and discovery descriptors
+- `packages/decentralized-convex-client` — discovery, connections, typed calls,
+  federation, and subscriptions
+- `packages/decentralized-convex-react` — client provider
+- `packages/decentralized-convex-tanstack-query` — reactive query hooks
+- `packages/decentralized-convex-accounts` and `-messages` — first-party plugins
+- `services/backend` — Vera's thin Better Auth PDS host
+- `apps/web` — the Vera reference client
 - `legacy` — the archived centralized Vera application
 
-The active backend consumes the reusable Components through their workspace
-package exports exactly as an external PDS would. Vera-specific code remains in
-the app and service folders; the Components do not import Vera.
-
 ## Development
 
-Install dependencies and start the active app:
-
 ```sh
 pnpm install
 pnpm --filter @vera/web dev
 ```
 
-The web app runs at `https://www.vera.localhost`. Copy the checked-in environment
-examples before connecting different Convex deployments.
+The web app runs at `https://www.vera.localhost`.
diff --git a/apps/web/README.md b/apps/web/README.md
index bfdbb703..84c9c055 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -3,6 +3,16 @@
 A TanStack Start messaging client that reads one private conversation across
 independent Convex PDS deployments.
 
+## Code tour
+
+- `features/account/AccountEntry.tsx` discovers a PDS from `username@domain`.
+- `features/account/AccountSession.tsx` owns the local auth session and creates
+  the decentralized client.
+- `features/pds/auth.ts` is the replaceable Better Auth federation adapter.
+- `features/pds/model.ts` contains the explicitly temporary two-home fixture.
+- `features/conversation/useConversation.ts` is the complete data path.
+- `features/conversation/Conversation.tsx` is presentation only.
+
 ```sh
 pnpm --filter @vera/web dev
 ```
@@ -31,6 +41,19 @@ the same `convex/` backend to each target and set `SITE_URL` and
 record described in the backend README. Free and Pro Convex deployments use the
 same discovery flow; Convex custom domains are optional.
 
-The web app imports only the product-agnostic Messages protocol. It does not
-import either deployment's generated message API; both homes expose the same
-canonical `pds:dispatchQuery` and `pds:dispatchMutation` functions.
+The web app imports the typed `pds` API derived from Vera's backend app
+definition. It does not declare a second plugin list or import either
+deployment's generated message API; both homes expose the same canonical
+`pds:dispatchQuery` and `pds:dispatchMutation` functions.
+
+The common read and write paths use the application's own TanStack hooks:
+
+```ts
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
+import { pds } from "@vera/backend/pds";
+
+const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
+
+const sendMessage = useMutation(pdsMutation(pds.messages.send));
+```
diff --git a/apps/web/src/auth-client.ts b/apps/web/src/auth-client.ts
deleted file mode 100644
index 3f6fb0ad..00000000
--- a/apps/web/src/auth-client.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import {
-  convexClient,
-  crossDomainClient,
-} from "@convex-dev/better-auth/client/plugins";
-import { createAuthClient } from "better-auth/react";
-
-export function createHomeAuthClient(siteUrl: string, storagePrefix: string) {
-  return createAuthClient({
-    baseURL: siteUrl,
-    plugins: [convexClient(), crossDomainClient({ storagePrefix })],
-  });
-}
-
-export type HomeAuthClient = ReturnType<typeof createHomeAuthClient>;
diff --git a/apps/web/src/cloud/AuthenticatedSession.tsx b/apps/web/src/cloud/AuthenticatedSession.tsx
deleted file mode 100644
index 693d9c15..00000000
--- a/apps/web/src/cloud/AuthenticatedSession.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { useEffect, useState } from "react";
-import {
-  DecentralizedConvexClient,
-  discoverPds,
-} from "@decentralized-convex/client";
-import {
-  DecentralizedConvexProvider,
-  useQuery,
-} from "@decentralized-convex/react";
-import { api } from "@vera/backend/api";
-
-import type { HomeAuthClient } from "../auth-client.ts";
-import type { HomeServer } from "../live/config.ts";
-import { createFederationAuthTokenFetcher } from "../federation-auth.ts";
-import { conversation, homeFromDiscovery } from "../live/config.ts";
-import { ChatRoom } from "./ChatRoom.tsx";
-import { ServerLoading } from "./ServerLoading.tsx";
-
-interface AuthenticatedSessionProps {
-  authClient: HomeAuthClient;
-  home: HomeServer;
-  onChooseServer: () => void;
-}
-
-export function AuthenticatedSession(props: AuthenticatedSessionProps) {
-  const user = useQuery(api.auth.currentUser);
-  const federation = useFederationClient(props.authClient, props.home);
-
-  if (federation !== undefined && "error" in federation) {
-    return (
-      <main className="account-shell">
-        <section className="account-panel auth-panel">
-          <h1>Could not connect to the conversation</h1>
-          <p className="auth-error">{federation.error.message}</p>
-          <button
-            className="primary-button"
-            onClick={props.onChooseServer}
-            type="button"
-          >
-            Back
-          </button>
-        </section>
-      </main>
-    );
-  }
-
-  if (user === undefined || user === null || federation === undefined) {
-    return <ServerLoading home={props.home} />;
-  }
-
-  return (
-    <DecentralizedConvexProvider client={federation.client}>
-      <ChatRoom
-        conversationHomes={federation.homes}
-        home={props.home}
-        onChooseServer={props.onChooseServer}
-        onSignOut={() => props.authClient.signOut()}
-        user={user}
-      />
-    </DecentralizedConvexProvider>
-  );
-}
-
-function useFederationClient(authClient: HomeAuthClient, home: HomeServer) {
-  const [federation, setFederation] = useState<
-    | { client: DecentralizedConvexClient; homes: readonly HomeServer[] }
-    | { error: Error }
-  >();
-
-  useEffect(() => {
-    let active = true;
-    let nextClient: DecentralizedConvexClient | undefined;
-    void Promise.all(
-      conversation.participantDomains.map(async (domain) =>
-        domain === home.domain
-          ? home
-          : homeFromDiscovery(await discoverPds(domain)),
-      ),
-    )
-      .then((homes) => {
-        if (!active) return;
-        const client = new DecentralizedConvexClient({
-          getAuthToken: createFederationAuthTokenFetcher({
-            authClient,
-            home,
-            homes,
-          }),
-        });
-        nextClient = client;
-        setFederation({ client, homes });
-      })
-      .catch((cause: unknown) => {
-        if (!active) return;
-        setFederation({
-          error:
-            cause instanceof Error ? cause : new Error("PDS discovery failed"),
-        });
-      });
-    return () => {
-      active = false;
-      if (nextClient !== undefined) void nextClient.close();
-    };
-  }, [authClient, home]);
-
-  return federation;
-}
diff --git a/apps/web/src/cloud/ChatRoom.tsx b/apps/web/src/cloud/ChatRoom.tsx
deleted file mode 100644
index a05eb08c..00000000
--- a/apps/web/src/cloud/ChatRoom.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { HomeServer } from "../live/config.ts";
-import { ChatSidebar } from "./ChatSidebar.tsx";
-import { ConversationHeader } from "./ConversationHeader.tsx";
-import { MessageComposer } from "./MessageComposer.tsx";
-import { MessageList } from "./MessageList.tsx";
-import { useChatRoom } from "./use-chat-room.ts";
-
-interface CurrentUser {
-  actor: string;
-}
-
-interface ChatRoomProps {
-  conversationHomes: readonly HomeServer[];
-  home: HomeServer;
-  onChooseServer: () => void;
-  onSignOut: () => Promise<unknown>;
-  user: CurrentUser;
-}
-
-export function ChatRoom(props: ChatRoomProps) {
-  const chat = useChatRoom({
-    homes: props.conversationHomes,
-    home: props.home,
-    user: props.user,
-  });
-
-  return (
-    <main className="chat-app">
-      <ChatSidebar {...props} />
-      <section className="conversation-panel">
-        <ConversationHeader home={props.home} messages={chat.messages} />
-        <MessageList home={props.home} messages={chat.messages} />
-        <MessageComposer {...chat.composer} />
-      </section>
-    </main>
-  );
-}
diff --git a/apps/web/src/cloud/ChatSidebar.tsx b/apps/web/src/cloud/ChatSidebar.tsx
deleted file mode 100644
index c67b6b38..00000000
--- a/apps/web/src/cloud/ChatSidebar.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import type { HomeServer } from "../live/config.ts";
-import { ActorAvatar, actorUsername } from "./actor.tsx";
-
-interface ChatSidebarProps {
-  home: HomeServer;
-  onChooseServer: () => void;
-  onSignOut: () => Promise<unknown>;
-  user: { actor: string };
-}
-
-export function ChatSidebar({
-  home,
-  onChooseServer,
-  onSignOut,
-  user,
-}: ChatSidebarProps) {
-  return (
-    <aside className="sidebar">
-      <div className="sidebar-title">
-        <span className="app-icon" aria-hidden="true">
-          V
-        </span>
-        <div>
-          <strong>Vera</strong>
-          <small>Federated messaging</small>
-        </div>
-      </div>
-      <nav className="room-list" aria-label="Conversations">
-        <span>Conversations</span>
-        <button aria-current="page" type="button">
-          <span>↔</span> Test conversation
-        </button>
-      </nav>
-      <div className="sidebar-account">
-        <ActorAvatar actor={user.actor} />
-        <div className="account-address">
-          <strong>{actorUsername(user.actor)}</strong>
-          <small>@{home.domain}</small>
-        </div>
-        <details className="account-menu">
-          <summary aria-label="Account options">•••</summary>
-          <div>
-            <button onClick={onChooseServer} type="button">
-              Change account
-            </button>
-            <button onClick={() => void onSignOut()} type="button">
-              Sign out
-            </button>
-          </div>
-        </details>
-      </div>
-    </aside>
-  );
-}
diff --git a/apps/web/src/cloud/ConnectionDiagnostics.tsx b/apps/web/src/cloud/ConnectionDiagnostics.tsx
deleted file mode 100644
index 3c6c194a..00000000
--- a/apps/web/src/cloud/ConnectionDiagnostics.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { HomeServer } from "../live/config.ts";
-import type { FederationSource } from "./ConversationHeader.tsx";
-
-interface ConnectionDiagnosticsProps {
-  home: HomeServer;
-  sources: readonly FederationSource[];
-}
-
-export function ConnectionDiagnostics({
-  home,
-  sources,
-}: ConnectionDiagnosticsProps) {
-  return (
-    <details className="diagnostics">
-      <summary>Debug</summary>
-      <div className="diagnostics-panel">
-        <strong>Connections</strong>
-        <div className="diagnostic-sources">
-          {sources.map((source) => (
-            <div key={source.target.url}>
-              <span data-status={source.status} />
-              <code>{new URL(source.target.url).hostname}</code>
-              <small>{source.status}</small>
-            </div>
-          ))}
-        </div>
-        <dl>
-          <div>
-            <dt>Write target</dt>
-            <dd>{home.domain}</dd>
-          </div>
-          <div>
-            <dt>Local auth</dt>
-            <dd>Better Auth</dd>
-          </div>
-          <div>
-            <dt>Remote reads</dt>
-            <dd>Authenticated per home server</dd>
-          </div>
-        </dl>
-      </div>
-    </details>
-  );
-}
diff --git a/apps/web/src/cloud/ConversationHeader.tsx b/apps/web/src/cloud/ConversationHeader.tsx
deleted file mode 100644
index 67c3c730..00000000
--- a/apps/web/src/cloud/ConversationHeader.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { HomeServer } from "../live/config.ts";
-import { ConnectionDiagnostics } from "./ConnectionDiagnostics.tsx";
-
-export interface FederationSource {
-  status: string;
-  target: { ids: readonly string[]; url: string };
-}
-
-interface ConversationHeaderProps {
-  home: HomeServer;
-  messages: {
-    federation: { sources: readonly FederationSource[]; status: string };
-  };
-}
-
-export function ConversationHeader({
-  home,
-  messages,
-}: ConversationHeaderProps) {
-  const { sources, status } = messages.federation;
-  const live = sources.filter((source) => source.status === "live").length;
-  const complete = live === sources.length;
-
-  return (
-    <header className="channel-header">
-      <div>
-        <h1>Test conversation</h1>
-        <p>
-          {complete
-            ? "Messages from every participant's home server"
-            : `Incomplete history — ${live} of ${sources.length} homes connected`}
-        </p>
-      </div>
-      <div className="channel-actions">
-        <span className="connection-summary" data-status={status}>
-          <span />
-          {live}/{sources.length} connected
-        </span>
-        <ConnectionDiagnostics home={home} sources={sources} />
-      </div>
-    </header>
-  );
-}
diff --git a/apps/web/src/cloud/HomeServerSession.tsx b/apps/web/src/cloud/HomeServerSession.tsx
deleted file mode 100644
index a46b30fa..00000000
--- a/apps/web/src/cloud/HomeServerSession.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { AuthClient } from "@convex-dev/better-auth/react";
-import { useState } from "react";
-import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
-import { ConvexReactClient } from "convex/react";
-
-import type { HomeServer } from "../live/config.ts";
-import { createHomeAuthClient } from "../auth-client.ts";
-import { SessionGate } from "./SessionGate.tsx";
-
-interface HomeServerSessionProps {
-  home: HomeServer;
-  initialUsername: string;
-  onChooseServer: () => void;
-}
-
-export function HomeServerSession({
-  home,
-  initialUsername,
-  onChooseServer,
-}: HomeServerSessionProps) {
-  const [authClient] = useState(() =>
-    createHomeAuthClient(home.siteUrl, `vera-${home.id}`),
-  );
-  const [convex] = useState(
-    () => new ConvexReactClient(home.convexUrl, { expectAuth: true }),
-  );
-  // The provider's exported union loses the concrete plugin inference from createAuthClient.
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  const providerAuthClient = authClient as unknown as AuthClient;
-
-  return (
-    <ConvexBetterAuthProvider authClient={providerAuthClient} client={convex}>
-      <SessionGate
-        authClient={authClient}
-        home={home}
-        initialUsername={initialUsername}
-        onChooseServer={onChooseServer}
-      />
-    </ConvexBetterAuthProvider>
-  );
-}
diff --git a/apps/web/src/cloud/Message.tsx b/apps/web/src/cloud/Message.tsx
deleted file mode 100644
index 7e1c09bf..00000000
--- a/apps/web/src/cloud/Message.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { ChatMessage } from "../live/queries.ts";
-import { ActorAvatar, actorUsername } from "./actor.tsx";
-
-export function Message({ message }: { message: ChatMessage }) {
-  const domain = message.authorId.split("@")[1] ?? message.authorId;
-  return (
-    <article className="message">
-      <ActorAvatar actor={message.authorId} />
-      <div>
-        <header>
-          <strong>
-            {message.authorName || actorUsername(message.authorId)}
-          </strong>
-          <span>@{domain}</span>
-          <time dateTime={new Date(message.sentAt).toISOString()}>
-            {formatTime(message.sentAt)}
-          </time>
-        </header>
-        <p>{message.body}</p>
-      </div>
-    </article>
-  );
-}
-
-function formatTime(timestamp: number) {
-  return new Intl.DateTimeFormat("en", {
-    hour: "numeric",
-    minute: "2-digit",
-  }).format(timestamp);
-}
diff --git a/apps/web/src/cloud/MessageComposer.tsx b/apps/web/src/cloud/MessageComposer.tsx
deleted file mode 100644
index eb57e58b..00000000
--- a/apps/web/src/cloud/MessageComposer.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { FormEvent } from "react";
-
-interface MessageComposerProps {
-  draft: string;
-  error?: string;
-  sending: boolean;
-  setDraft: (draft: string) => void;
-  submit: (event: FormEvent<HTMLFormElement>) => Promise<void>;
-}
-
-export function MessageComposer({
-  draft,
-  error,
-  sending,
-  setDraft,
-  submit,
-}: MessageComposerProps) {
-  return (
-    <form className="composer" onSubmit={(event) => void submit(event)}>
-      <label>
-        <span className="sr-only">Message conversation</span>
-        <textarea
-          maxLength={4_000}
-          onChange={(event) => setDraft(event.target.value)}
-          onKeyDown={(event) => {
-            if (event.key === "Enter" && !event.shiftKey) {
-              event.preventDefault();
-              event.currentTarget.form?.requestSubmit();
-            }
-          }}
-          placeholder="Write a message"
-          rows={1}
-          value={draft}
-        />
-      </label>
-      <button
-        aria-label="Send message"
-        disabled={draft.trim().length === 0 || sending}
-        type="submit"
-      >
-        Send
-      </button>
-      {error === undefined ? null : <p className="composer-error">{error}</p>}
-    </form>
-  );
-}
diff --git a/apps/web/src/cloud/MessageList.tsx b/apps/web/src/cloud/MessageList.tsx
deleted file mode 100644
index 10a4b569..00000000
--- a/apps/web/src/cloud/MessageList.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { HomeServer } from "../live/config.ts";
-import type { ChatMessage } from "../live/queries.ts";
-import { Message } from "./Message.tsx";
-
-interface MessageListProps {
-  home: HomeServer;
-  messages: {
-    data?: readonly ChatMessage[];
-    federation: {
-      sources: readonly { status: string }[];
-      status: string;
-    };
-    isPending: boolean;
-  };
-}
-
-export function MessageList({ home, messages }: MessageListProps) {
-  const live = messages.federation.sources.filter(
-    (source) => source.status === "live",
-  ).length;
-  const total = messages.federation.sources.length;
-  const incomplete = live < total;
-
-  return (
-    <div className="message-list" aria-live="polite">
-      {incomplete ? (
-        <aside className="federation-warning" role="status">
-          <strong>Showing partial history</strong>
-          <p>
-            This browser is authenticated with {live} of {total} PDS homes.
-            Portable cross-PDS authentication is not connected yet.
-          </p>
-        </aside>
-      ) : null}
-      {messages.isPending ? (
-        <p className="empty-state">Connecting to participant servers…</p>
-      ) : null}
-      {messages.data?.length === 0 ? (
-        <div className="empty-state">
-          <span>#</span>
-          <strong>No messages yet</strong>
-          <p>Start the conversation from {home.domain}.</p>
-        </div>
-      ) : null}
-      {messages.data?.map((message) => (
-        <Message key={message.messageId} message={message} />
-      ))}
-    </div>
-  );
-}
diff --git a/apps/web/src/cloud/ServerLoading.tsx b/apps/web/src/cloud/ServerLoading.tsx
deleted file mode 100644
index 0716aa64..00000000
--- a/apps/web/src/cloud/ServerLoading.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { HomeServer } from "../live/config.ts";
-
-export function ServerLoading({ home }: { home: HomeServer }) {
-  return (
-    <main className="account-shell">
-      <section className="account-panel loading-panel">
-        <span className="loading-dot" />
-        <p>Connecting to {home.domain}</p>
-      </section>
-    </main>
-  );
-}
diff --git a/apps/web/src/cloud/SessionGate.tsx b/apps/web/src/cloud/SessionGate.tsx
deleted file mode 100644
index 3072461c..00000000
--- a/apps/web/src/cloud/SessionGate.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useConvexAuth } from "convex/react";
-
-import type { HomeAuthClient } from "../auth-client.ts";
-import type { HomeServer } from "../live/config.ts";
-import { AuthenticatedSession } from "./AuthenticatedSession.tsx";
-import { AuthForm } from "./AuthForm.tsx";
-import { ServerLoading } from "./ServerLoading.tsx";
-
-interface SessionGateProps {
-  authClient: HomeAuthClient;
-  home: HomeServer;
-  initialUsername: string;
-  onChooseServer: () => void;
-}
-
-export function SessionGate(props: SessionGateProps) {
-  const { isAuthenticated, isLoading } = useConvexAuth();
-
-  if (isLoading) return <ServerLoading home={props.home} />;
-  if (!isAuthenticated) return <AuthForm {...props} />;
-  return <AuthenticatedSession {...props} />;
-}
diff --git a/apps/web/src/cloud/actor.tsx b/apps/web/src/cloud/actor.tsx
deleted file mode 100644
index 0410c160..00000000
--- a/apps/web/src/cloud/actor.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-export function ActorAvatar({ actor }: { actor: string }) {
-  return (
-    <span className="avatar" aria-hidden="true">
-      {actorUsername(actor).slice(0, 2).toUpperCase()}
-    </span>
-  );
-}
-
-export function actorUsername(actor: string) {
-  return actor.split("@")[0] ?? actor;
-}
diff --git a/apps/web/src/cloud/use-chat-room.ts b/apps/web/src/cloud/use-chat-room.ts
deleted file mode 100644
index 9aedb5e3..00000000
--- a/apps/web/src/cloud/use-chat-room.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import type { FormEvent } from "react";
-import { useState } from "react";
-import { useDecentralizedConvex } from "@decentralized-convex/react";
-import { useFederatedPdsQuery } from "@decentralized-convex/tanstack-query";
-
-import type { HomeServer } from "../live/config.ts";
-import { conversation } from "../live/config.ts";
-import { messagesQueryOptions, pdsApi } from "../live/queries.ts";
-
-interface UseChatRoomOptions {
-  home: HomeServer;
-  homes: readonly HomeServer[];
-  user: { actor: string };
-}
-
-export function useChatRoom({ home, homes, user }: UseChatRoomOptions) {
-  const client = useDecentralizedConvex();
-  const messages = useFederatedPdsQuery(messagesQueryOptions(homes));
-  const [draft, setDraft] = useState("");
-  const [error, setError] = useState<string>();
-  const [sending, setSending] = useState(false);
-
-  async function send(event: FormEvent<HTMLFormElement>) {
-    event.preventDefault();
-    const body = draft.trim();
-    if (body.length === 0 || sending) return;
-
-    setError(undefined);
-    setSending(true);
-    try {
-      await client.pdsMutation(
-        { id: user.actor, url: home.convexUrl },
-        pdsApi.messages.mutations.send({
-          body,
-          conversationId: conversation.id,
-          messageId: crypto.randomUUID(),
-        }),
-      );
-      setDraft("");
-    } catch (cause) {
-      setError(cause instanceof Error ? cause.message : "Message failed");
-    } finally {
-      setSending(false);
-    }
-  }
-
-  return {
-    composer: { draft, error, sending, setDraft, submit: send },
-    messages,
-  };
-}
diff --git a/apps/web/src/server-picker/ServerPicker.tsx b/apps/web/src/features/account/AccountEntry.tsx
similarity index 64%
rename from apps/web/src/server-picker/ServerPicker.tsx
rename to apps/web/src/features/account/AccountEntry.tsx
index 8ea2d317..013ac5e5 100644
--- a/apps/web/src/server-picker/ServerPicker.tsx
+++ b/apps/web/src/features/account/AccountEntry.tsx
@@ -2,15 +2,39 @@ import type { FormEvent } from "react";
 import { useState } from "react";
 import { discoverPds } from "@decentralized-convex/client";
 
-import type { HomeServer } from "../live/config.ts";
-import { homeFromDiscovery } from "../live/config.ts";
+import type { PdsHome } from "../pds/model.ts";
+import { pdsHomeFromDiscovery } from "../pds/model.ts";
 
-interface ServerPickerProps {
-  onChoose: (home: HomeServer, username: string) => void;
+interface AccountEntryProps {
+  onSelect: (selection: { home: PdsHome; username: string }) => void;
 }
 
-export function ServerPicker({ onChoose }: ServerPickerProps) {
-  const form = useAddressDiscovery(onChoose);
+export function AccountEntry({ onSelect }: AccountEntryProps) {
+  const [address, setAddress] = useState("");
+  const [error, setError] = useState<string>();
+  const [loading, setLoading] = useState(false);
+
+  async function submit(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    setError(undefined);
+    const normalized = address.trim().toLowerCase();
+    const separator = normalized.lastIndexOf("@");
+    const username = normalized.slice(0, separator);
+    if (separator <= 0 || !/^[a-z0-9][a-z0-9._-]{1,31}$/.test(username)) {
+      setError("Enter a valid username@domain address.");
+      return;
+    }
+
+    setLoading(true);
+    try {
+      const discovery = await discoverPds(normalized);
+      onSelect({ home: pdsHomeFromDiscovery(discovery), username });
+    } catch (cause) {
+      setError(cause instanceof Error ? cause.message : "PDS discovery failed");
+    } finally {
+      setLoading(false);
+    }
+  }
 
   return (
     <main className="account-shell">
@@ -24,63 +48,27 @@ export function ServerPicker({ onChoose }: ServerPickerProps) {
             <p>Sign in with your address on any compatible PDS.</p>
           </div>
         </header>
-        <form onSubmit={(event) => void form.submit(event)}>
+        <form onSubmit={(event) => void submit(event)}>
           <label>
             Vera address
             <input
               autoCapitalize="none"
               autoComplete="username"
               autoCorrect="off"
-              onChange={(event) => form.setAddress(event.target.value)}
+              onChange={(event) => setAddress(event.target.value)}
               placeholder="username@example.com"
               required
               spellCheck={false}
               type="email"
-              value={form.address}
+              value={address}
             />
           </label>
-          {form.error === undefined ? null : (
-            <p className="auth-error">{form.error}</p>
-          )}
-          <button
-            className="primary-button"
-            disabled={form.loading}
-            type="submit"
-          >
-            {form.loading ? "Finding your PDS…" : "Continue"}
+          {error === undefined ? null : <p className="auth-error">{error}</p>}
+          <button className="primary-button" disabled={loading} type="submit">
+            {loading ? "Finding your PDS…" : "Continue"}
           </button>
         </form>
       </section>
     </main>
   );
 }
-
-function useAddressDiscovery(onChoose: ServerPickerProps["onChoose"]) {
-  const [address, setAddress] = useState("");
-  const [error, setError] = useState<string>();
-  const [loading, setLoading] = useState(false);
-
-  async function submit(event: FormEvent<HTMLFormElement>) {
-    event.preventDefault();
-    setError(undefined);
-    const normalized = address.trim().toLowerCase();
-    const separator = normalized.lastIndexOf("@");
-    const username = normalized.slice(0, separator);
-    if (separator <= 0 || !/^[a-z0-9][a-z0-9._-]{1,31}$/.test(username)) {
-      setError("Enter a valid username@domain address.");
-      return;
-    }
-
-    setLoading(true);
-    try {
-      const discovery = await discoverPds(normalized);
-      onChoose(homeFromDiscovery(discovery), username);
-    } catch (cause) {
-      setError(cause instanceof Error ? cause.message : "PDS discovery failed");
-    } finally {
-      setLoading(false);
-    }
-  }
-
-  return { address, error, loading, setAddress, submit };
-}
diff --git a/apps/web/src/features/account/AccountSession.tsx b/apps/web/src/features/account/AccountSession.tsx
new file mode 100644
index 00000000..5350ae4b
--- /dev/null
+++ b/apps/web/src/features/account/AccountSession.tsx
@@ -0,0 +1,172 @@
+import type { AuthClient } from "@convex-dev/better-auth/react";
+import { useEffect, useState } from "react";
+import { useQueryClient } from "@tanstack/react-query";
+import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
+import {
+  DecentralizedConvexClient,
+  discoverPds,
+} from "@decentralized-convex/client";
+import {
+  DecentralizedConvexProvider,
+  useQuery,
+} from "@decentralized-convex/react";
+import { PdsQueryClient } from "@decentralized-convex/tanstack-query";
+import { api } from "@vera/backend/api";
+import { ConvexReactClient, useConvexAuth } from "convex/react";
+
+import type { HomeAuthClient } from "../pds/auth.ts";
+import type { PdsHome } from "../pds/model.ts";
+import { Conversation } from "../conversation/Conversation.tsx";
+import {
+  createFederationAuthTokenFetcher,
+  createHomeAuthClient,
+} from "../pds/auth.ts";
+import { pdsHomeFromDiscovery, prototypeConversation } from "../pds/model.ts";
+import { SignInForm } from "./SignInForm.tsx";
+
+interface AccountSessionProps {
+  home: PdsHome;
+  initialUsername: string;
+  onBack: () => void;
+}
+
+export function AccountSession(props: AccountSessionProps) {
+  const [authClient] = useState(() => createHomeAuthClient(props.home));
+  const [convex] = useState(
+    () => new ConvexReactClient(props.home.convexUrl, { expectAuth: true }),
+  );
+  // Better Auth's provider erases the concrete plugins returned by createAuthClient.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const providerAuthClient = authClient as unknown as AuthClient;
+
+  return (
+    <ConvexBetterAuthProvider authClient={providerAuthClient} client={convex}>
+      <SessionContent {...props} authClient={authClient} />
+    </ConvexBetterAuthProvider>
+  );
+}
+
+function SessionContent(
+  props: AccountSessionProps & { authClient: HomeAuthClient },
+) {
+  const { isAuthenticated, isLoading } = useConvexAuth();
+  if (isLoading) return <Connecting home={props.home} />;
+  if (!isAuthenticated) {
+    return (
+      <SignInForm
+        authClient={props.authClient}
+        home={props.home}
+        initialUsername={props.initialUsername}
+        onBack={props.onBack}
+      />
+    );
+  }
+  return <AuthenticatedAccount {...props} />;
+}
+
+function AuthenticatedAccount({
+  authClient,
+  home,
+  onBack,
+}: AccountSessionProps & { authClient: HomeAuthClient }) {
+  const user = useQuery(api.auth.currentUser);
+  const federation = useConversationFederation(authClient, home);
+
+  if (federation !== undefined && "error" in federation) {
+    return (
+      <main className="account-shell">
+        <section className="account-panel auth-panel">
+          <h1>Could not connect to the conversation</h1>
+          <p className="auth-error">{federation.error.message}</p>
+          <button className="primary-button" onClick={onBack} type="button">
+            Back
+          </button>
+        </section>
+      </main>
+    );
+  }
+
+  if (user === undefined || user === null || federation === undefined) {
+    return <Connecting home={home} />;
+  }
+
+  return (
+    <DecentralizedConvexProvider client={federation.client}>
+      <Conversation
+        home={home}
+        homes={federation.homes}
+        onChangeAccount={onBack}
+        onSignOut={() => authClient.signOut()}
+        user={user}
+      />
+    </DecentralizedConvexProvider>
+  );
+}
+
+function useConversationFederation(authClient: HomeAuthClient, home: PdsHome) {
+  const queryClient = useQueryClient();
+  const [federation, setFederation] = useState<
+    | { client: DecentralizedConvexClient; homes: readonly PdsHome[] }
+    | { error: Error }
+  >();
+
+  useEffect(() => {
+    let active = true;
+    let nextClient: DecentralizedConvexClient | undefined;
+    let nextDisconnect: (() => void) | undefined;
+    void Promise.all(
+      prototypeConversation.participantDomains.map(async (domain) =>
+        domain === home.domain
+          ? home
+          : pdsHomeFromDiscovery(await discoverPds(domain)),
+      ),
+    )
+      .then((homes) => {
+        if (!active) return;
+        const client = new DecentralizedConvexClient({
+          getAuthToken: createFederationAuthTokenFetcher({
+            authClient,
+            home,
+            homes,
+          }),
+        });
+        nextClient = client;
+        const pdsQueryClient = new PdsQueryClient({
+          client,
+          mutationTarget: { id: home.domain, url: home.convexUrl },
+          queryTargets: homes.map((server) => ({
+            id: `member@${server.domain}`,
+            url: server.convexUrl,
+          })),
+        });
+        const disconnect = pdsQueryClient.connect(queryClient);
+        nextDisconnect = disconnect;
+        setFederation({ client, homes });
+      })
+      .catch((cause: unknown) => {
+        if (!active) return;
+        setFederation({
+          error:
+            cause instanceof Error ? cause : new Error("PDS discovery failed"),
+        });
+      });
+    return () => {
+      active = false;
+      nextDisconnect?.();
+      if (nextClient !== undefined) void nextClient.close();
+    };
+  }, [authClient, home, queryClient]);
+
+  return federation;
+}
+
+function Connecting({ home }: { home: PdsHome }) {
+  return (
+    <main className="account-shell">
+      <section className="account-panel loading-panel">
+        <span className="loading-dot" />
+        <p>Connecting to {home.domain}</p>
+      </section>
+    </main>
+  );
+}
diff --git a/apps/web/src/cloud/AuthForm.tsx b/apps/web/src/features/account/SignInForm.tsx
similarity index 85%
rename from apps/web/src/cloud/AuthForm.tsx
rename to apps/web/src/features/account/SignInForm.tsx
index 944ba54f..25dcf372 100644
--- a/apps/web/src/cloud/AuthForm.tsx
+++ b/apps/web/src/features/account/SignInForm.tsx
@@ -1,18 +1,18 @@
 import type { FormEvent } from "react";
 import { useState } from "react";
 
-import type { HomeAuthClient } from "../auth-client.ts";
-import type { HomeServer } from "../live/config.ts";
+import type { HomeAuthClient } from "../pds/auth.ts";
+import type { PdsHome } from "../pds/model.ts";
 
-interface AuthFormProps {
+interface SignInFormProps {
   authClient: HomeAuthClient;
-  home: HomeServer;
+  home: PdsHome;
   initialUsername: string;
-  onChooseServer: () => void;
+  onBack: () => void;
 }
 
-export function AuthForm(props: AuthFormProps) {
-  const form = useAuthForm(props);
+export function SignInForm(props: SignInFormProps) {
+  const form = useSignInForm(props);
   const isSignUp = form.mode === "sign-up";
 
   return (
@@ -20,7 +20,7 @@ export function AuthForm(props: AuthFormProps) {
       <section className="account-panel auth-panel">
         <button
           className="text-button back-button"
-          onClick={props.onChooseServer}
+          onClick={props.onBack}
           type="button"
         >
           ← Back
@@ -92,7 +92,7 @@ export function AuthForm(props: AuthFormProps) {
   );
 }
 
-function useAuthForm({ authClient, home, initialUsername }: AuthFormProps) {
+function useSignInForm({ authClient, home, initialUsername }: SignInFormProps) {
   const [error, setError] = useState<string>();
   const [mode, setMode] = useState<"sign-in" | "sign-up">("sign-up");
   const [password, setPassword] = useState("");
@@ -115,7 +115,11 @@ function useAuthForm({ authClient, home, initialUsername }: AuthFormProps) {
       const email = `${normalized}@${home.domain}`;
       const result =
         mode === "sign-up"
-          ? await authClient.signUp.email({ email, name: normalized, password })
+          ? await authClient.signUp.email({
+              email,
+              name: normalized,
+              password,
+            })
           : await authClient.signIn.email({ email, password });
       if (result.error !== null) {
         setError(result.error.message ?? "Authentication failed");
@@ -133,7 +137,7 @@ function useAuthForm({ authClient, home, initialUsername }: AuthFormProps) {
     setUsername,
     submit,
     submitting,
-    toggleMode: () => setMode(mode === "sign-in" ? "sign-up" : "sign-in"),
+    toggleMode: () => setMode(mode === "sign-up" ? "sign-in" : "sign-up"),
     username,
   };
 }
diff --git a/apps/web/src/features/conversation/Conversation.tsx b/apps/web/src/features/conversation/Conversation.tsx
new file mode 100644
index 00000000..392ef718
--- /dev/null
+++ b/apps/web/src/features/conversation/Conversation.tsx
@@ -0,0 +1,279 @@
+import type {
+  FederatedQueryStatus,
+  FederationSourceSnapshot,
+} from "@decentralized-convex/client";
+import type { Message as ChatMessage } from "@decentralized-convex/messages";
+import type { FormEvent } from "react";
+
+import type { PdsHome } from "../pds/model.ts";
+import { useConversation } from "./useConversation.ts";
+
+interface ConversationProps {
+  home: PdsHome;
+  homes: readonly PdsHome[];
+  onChangeAccount: () => void;
+  onSignOut: () => Promise<unknown>;
+  user: { actor: string };
+}
+
+type ConversationMessages = ReturnType<typeof useConversation>["messages"];
+
+export function Conversation(props: ConversationProps) {
+  const conversation = useConversation();
+  return (
+    <main className="chat-app">
+      <Sidebar {...props} />
+      <section className="conversation-panel">
+        <ConversationHeader
+          home={props.home}
+          messages={conversation.messages}
+        />
+        <MessageList home={props.home} messages={conversation.messages} />
+        <MessageComposer {...conversation.composer} />
+      </section>
+    </main>
+  );
+}
+
+function Sidebar({
+  home,
+  onChangeAccount,
+  onSignOut,
+  user,
+}: ConversationProps) {
+  return (
+    <aside className="sidebar">
+      <div className="sidebar-title">
+        <span className="app-icon" aria-hidden="true">
+          V
+        </span>
+        <div>
+          <strong>Vera</strong>
+          <small>Federated messaging</small>
+        </div>
+      </div>
+      <nav className="room-list" aria-label="Conversations">
+        <span>Conversations</span>
+        <button aria-current="page" type="button">
+          <span>↔</span> Prototype conversation
+        </button>
+      </nav>
+      <div className="sidebar-account">
+        <ActorAvatar actor={user.actor} />
+        <div className="account-address">
+          <strong>{actorUsername(user.actor)}</strong>
+          <small>@{home.domain}</small>
+        </div>
+        <details className="account-menu">
+          <summary aria-label="Account options">•••</summary>
+          <div>
+            <button onClick={onChangeAccount} type="button">
+              Change account
+            </button>
+            <button onClick={() => void onSignOut()} type="button">
+              Sign out
+            </button>
+          </div>
+        </details>
+      </div>
+    </aside>
+  );
+}
+
+function ConversationHeader({
+  home,
+  messages,
+}: {
+  home: PdsHome;
+  messages: ConversationMessages;
+}) {
+  const { sources, status } = messages.federation;
+  const live = sources.filter((source) => source.status === "live").length;
+  const complete = live === sources.length;
+
+  return (
+    <header className="channel-header">
+      <div>
+        <h1>Prototype conversation</h1>
+        <p>
+          {complete
+            ? "Messages from every participant's home server"
+            : `Incomplete history — ${live} of ${sources.length} homes connected`}
+        </p>
+      </div>
+      <div className="channel-actions">
+        <span className="connection-summary" data-status={status}>
+          <span />
+          {live}/{sources.length} connected
+        </span>
+        <ConnectionDiagnostics home={home} sources={sources} />
+      </div>
+    </header>
+  );
+}
+
+function ConnectionDiagnostics({
+  home,
+  sources,
+}: {
+  home: PdsHome;
+  sources: readonly FederationSourceSnapshot<ChatMessage[]>[];
+}) {
+  return (
+    <details className="diagnostics">
+      <summary>Debug</summary>
+      <div className="diagnostics-panel">
+        <strong>Connections</strong>
+        <div className="diagnostic-sources">
+          {sources.map((source) => (
+            <div key={source.target.url}>
+              <span data-status={source.status} />
+              <code>{new URL(source.target.url).hostname}</code>
+              <small>{source.status}</small>
+            </div>
+          ))}
+        </div>
+        <dl>
+          <div>
+            <dt>Write target</dt>
+            <dd>{home.domain}</dd>
+          </div>
+          <div>
+            <dt>Local auth</dt>
+            <dd>Better Auth</dd>
+          </div>
+          <div>
+            <dt>Remote reads</dt>
+            <dd>Authenticated per home server</dd>
+          </div>
+        </dl>
+      </div>
+    </details>
+  );
+}
+
+function MessageList({
+  home,
+  messages,
+}: {
+  home: PdsHome;
+  messages: {
+    data?: readonly ChatMessage[];
+    federation: {
+      sources: readonly FederationSourceSnapshot<ChatMessage[]>[];
+      status: FederatedQueryStatus;
+    };
+    isPending: boolean;
+  };
+}) {
+  const live = messages.federation.sources.filter(
+    (source) => source.status === "live",
+  ).length;
+  const total = messages.federation.sources.length;
+
+  return (
+    <div className="message-list" aria-live="polite">
+      {live < total ? (
+        <aside className="federation-warning" role="status">
+          <strong>Showing partial history</strong>
+          <p>
+            {live} of {total} participant homes are available. An unavailable
+            home may be offline or may have rejected authentication.
+          </p>
+        </aside>
+      ) : null}
+      {messages.isPending ? (
+        <p className="empty-state">Connecting to participant servers…</p>
+      ) : null}
+      {messages.data?.length === 0 ? (
+        <div className="empty-state">
+          <span>#</span>
+          <strong>No messages yet</strong>
+          <p>Start the conversation from {home.domain}.</p>
+        </div>
+      ) : null}
+      {messages.data?.map((message) => (
+        <Message key={message.messageId} message={message} />
+      ))}
+    </div>
+  );
+}
+
+function Message({ message }: { message: ChatMessage }) {
+  const domain = message.authorId.split("@")[1] ?? message.authorId;
+  return (
+    <article className="message">
+      <ActorAvatar actor={message.authorId} />
+      <div>
+        <header>
+          <strong>
+            {message.authorName || actorUsername(message.authorId)}
+          </strong>
+          <span>@{domain}</span>
+          <time dateTime={new Date(message.sentAt).toISOString()}>
+            {new Intl.DateTimeFormat("en", {
+              hour: "numeric",
+              minute: "2-digit",
+            }).format(message.sentAt)}
+          </time>
+        </header>
+        <p>{message.body}</p>
+      </div>
+    </article>
+  );
+}
+
+function MessageComposer({
+  draft,
+  error,
+  sending,
+  setDraft,
+  submit,
+}: {
+  draft: string;
+  error?: string;
+  sending: boolean;
+  setDraft: (draft: string) => void;
+  submit: (event: FormEvent<HTMLFormElement>) => Promise<void>;
+}) {
+  return (
+    <form className="composer" onSubmit={(event) => void submit(event)}>
+      <label>
+        <span className="sr-only">Message conversation</span>
+        <textarea
+          maxLength={4_000}
+          onChange={(event) => setDraft(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === "Enter" && !event.shiftKey) {
+              event.preventDefault();
+              event.currentTarget.form?.requestSubmit();
+            }
+          }}
+          placeholder="Write a message"
+          rows={1}
+          value={draft}
+        />
+      </label>
+      <button
+        aria-label="Send message"
+        disabled={draft.trim().length === 0 || sending}
+        type="submit"
+      >
+        Send
+      </button>
+      {error === undefined ? null : <p className="composer-error">{error}</p>}
+    </form>
+  );
+}
+
+function ActorAvatar({ actor }: { actor: string }) {
+  return (
+    <span className="avatar" aria-hidden="true">
+      {actorUsername(actor).slice(0, 2).toUpperCase()}
+    </span>
+  );
+}
+
+function actorUsername(actor: string) {
+  return actor.split("@")[0] ?? actor;
+}
diff --git a/apps/web/src/features/conversation/useConversation.ts b/apps/web/src/features/conversation/useConversation.ts
new file mode 100644
index 00000000..6ae27c08
--- /dev/null
+++ b/apps/web/src/features/conversation/useConversation.ts
@@ -0,0 +1,63 @@
+import type { Message } from "@decentralized-convex/messages";
+import type { FormEvent } from "react";
+import { useState } from "react";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import {
+  pdsMutation,
+  pdsQuery,
+  usePdsQueryState,
+} from "@decentralized-convex/tanstack-query";
+import { pds } from "@vera/backend/pds";
+
+import { prototypeConversation } from "../pds/model.ts";
+
+export function useConversation() {
+  const messageOptions = pdsQuery(pds.messages.list, {
+    conversationId: prototypeConversation.id,
+  });
+  const query = useQuery({
+    ...messageOptions,
+    select: combineMessages,
+  });
+  const federation = usePdsQueryState(messageOptions);
+  const sendMessage = useMutation(pdsMutation(pds.messages.send));
+  const [draft, setDraft] = useState("");
+
+  async function send(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    const body = draft.trim();
+    if (body.length === 0 || sendMessage.isPending) return;
+
+    sendMessage.reset();
+    try {
+      await sendMessage.mutateAsync({
+        body,
+        conversationId: prototypeConversation.id,
+        messageId: crypto.randomUUID(),
+      });
+      setDraft("");
+    } catch {
+      // TanStack Query exposes the mutation error to the composer below.
+    }
+  }
+
+  return {
+    composer: {
+      draft,
+      error: sendMessage.error?.message,
+      sending: sendMessage.isPending,
+      setDraft,
+      submit: send,
+    },
+    messages: { ...query, federation },
+  };
+}
+
+function combineMessages(messages: readonly Message[]) {
+  const byId = new Map(messages.map((message) => [message.messageId, message]));
+  return [...byId.values()].sort(
+    (left, right) =>
+      left.sentAt - right.sentAt ||
+      left.messageId.localeCompare(right.messageId),
+  );
+}
diff --git a/apps/web/src/federation-auth.ts b/apps/web/src/features/pds/auth.ts
similarity index 81%
rename from apps/web/src/federation-auth.ts
rename to apps/web/src/features/pds/auth.ts
index cede56f1..50cfb30c 100644
--- a/apps/web/src/federation-auth.ts
+++ b/apps/web/src/features/pds/auth.ts
@@ -1,12 +1,28 @@
 import type { FederationAuthTokenFetcher } from "@decentralized-convex/client";
+import {
+  convexClient,
+  crossDomainClient,
+} from "@convex-dev/better-auth/client/plugins";
+import { createAuthClient } from "better-auth/react";
 
-import type { HomeAuthClient } from "./auth-client.ts";
-import type { HomeServer } from "./live/config.ts";
+import type { PdsHome } from "./model.ts";
+
+export function createHomeAuthClient(home: PdsHome) {
+  return createAuthClient({
+    baseURL: home.siteUrl,
+    plugins: [
+      convexClient(),
+      crossDomainClient({ storagePrefix: `vera-${home.domain}` }),
+    ],
+  });
+}
+
+export type HomeAuthClient = ReturnType<typeof createHomeAuthClient>;
 
 interface FederationAuthOptions {
   authClient: HomeAuthClient;
-  home: HomeServer;
-  homes: readonly HomeServer[];
+  home: PdsHome;
+  homes: readonly PdsHome[];
 }
 
 interface CachedToken {
@@ -14,6 +30,10 @@ interface CachedToken {
   token: string;
 }
 
+/**
+ * Uses the local Better Auth session for the account's home and exchanges a
+ * short-lived home assertion for credentials scoped to every remote PDS.
+ */
 export function createFederationAuthTokenFetcher({
   authClient,
   home,
@@ -23,10 +43,7 @@ export function createFederationAuthTokenFetcher({
   const homesByUrl = new Map(homes.map((server) => [server.convexUrl, server]));
 
   return async ({ forceRefreshToken, url }) => {
-    if (url === home.convexUrl) {
-      return getHomeToken(authClient);
-    }
-
+    if (url === home.convexUrl) return getHomeToken(authClient);
     const target = homesByUrl.get(url);
     if (target === undefined) return null;
     return getRemoteToken({
@@ -58,8 +75,8 @@ async function getRemoteToken({
   authClient: HomeAuthClient;
   cache: Map<string, CachedToken>;
   forceRefreshToken: boolean;
-  home: HomeServer;
-  target: HomeServer;
+  home: PdsHome;
+  target: PdsHome;
   url: string;
 }) {
   const cached = cache.get(url);
@@ -74,6 +91,7 @@ async function getRemoteToken({
   const session = await authClient.getSession();
   const sessionToken = session.data?.session.token;
   if (sessionToken === undefined) return null;
+
   const assertionResponse = await postJson(
     `${home.siteUrl}/api/auth/federation/assertion`,
     { audience: target.domain },
@@ -84,6 +102,7 @@ async function getRemoteToken({
       `Home PDS could not create an identity proof (${assertionResponse.status})`,
     );
   }
+
   const assertionPayload = await readJson(assertionResponse);
   const assertion = requireString(
     readProperty(assertionPayload, "assertion"),
@@ -98,6 +117,7 @@ async function getRemoteToken({
       `Remote PDS rejected the identity proof (${exchangeResponse.status})`,
     );
   }
+
   const exchange = await readJson(exchangeResponse);
   const result = {
     expiresAt: requireNumber(readProperty(exchange, "expiresAt"), "expiresAt"),
@@ -120,7 +140,6 @@ function postJson(
 }
 
 async function readJson(response: Response): Promise<unknown> {
-  // The DOM library types Response.json() as `any`; treat the untrusted payload as unknown.
   return response.json();
 }
 
diff --git a/apps/web/src/features/pds/model.ts b/apps/web/src/features/pds/model.ts
new file mode 100644
index 00000000..0c40f1ab
--- /dev/null
+++ b/apps/web/src/features/pds/model.ts
@@ -0,0 +1,27 @@
+import type { DiscoveredPds } from "@decentralized-convex/client";
+
+/** Everything the client learns about one account's home PDS. */
+export interface PdsHome {
+  convexUrl: string;
+  domain: string;
+  manifestUrl: string;
+  siteUrl: string;
+}
+
+/**
+ * The proven two-home conversation. Real conversation discovery will replace
+ * this single explicit prototype fixture.
+ */
+export const prototypeConversation = {
+  id: "conversation:direct:a.vera.chat:b.vera.chat",
+  participantDomains: ["a.vera.chat", "b.vera.chat"],
+} as const;
+
+export function pdsHomeFromDiscovery(discovery: DiscoveredPds): PdsHome {
+  return {
+    convexUrl: discovery.manifest.deploymentUrl,
+    domain: discovery.domain,
+    manifestUrl: discovery.manifestUrl,
+    siteUrl: discovery.manifest.httpUrl,
+  };
+}
diff --git a/apps/web/src/live/config.ts b/apps/web/src/live/config.ts
deleted file mode 100644
index 3c163ca5..00000000
--- a/apps/web/src/live/config.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { DiscoveredPds } from "@decentralized-convex/client";
-
-export interface HomeServer {
-  convexUrl: string;
-  domain: string;
-  id: string;
-  manifestUrl: string;
-  siteUrl: string;
-}
-
-export const testHomeDomains = ["a.vera.chat", "b.vera.chat"] as const;
-
-export const conversation = {
-  id: "conversation:direct:a.vera.chat:b.vera.chat",
-  participantDomains: testHomeDomains,
-};
-
-export function homeFromDiscovery(discovery: DiscoveredPds): HomeServer {
-  return {
-    convexUrl: discovery.manifest.deploymentUrl,
-    domain: discovery.domain,
-    id: discovery.domain,
-    manifestUrl: discovery.manifestUrl,
-    siteUrl: discovery.manifest.httpUrl,
-  };
-}
diff --git a/apps/web/src/live/queries.ts b/apps/web/src/live/queries.ts
deleted file mode 100644
index 9f261a02..00000000
--- a/apps/web/src/live/queries.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { Message } from "@decentralized-convex/messages";
-import { definePdsApi } from "@decentralized-convex/client";
-import { messagesProtocol } from "@decentralized-convex/messages";
-import { federatedPdsQueryOptions } from "@decentralized-convex/tanstack-query";
-
-import type { HomeServer } from "./config.ts";
-import { conversation } from "./config.ts";
-
-export type ChatMessage = Message;
-
-export const pdsApi = definePdsApi({ messages: messagesProtocol });
-
-export function messagesQueryOptions(homes: readonly HomeServer[]) {
-  return federatedPdsQueryOptions({
-    combine: (sources) =>
-      combineMessages(sources.flatMap((source) => source.data)),
-    queryKey: ["messages", conversation.id],
-    request: pdsApi.messages.queries.list({
-      conversationId: conversation.id,
-    }),
-    targets: homes.map((home) => ({
-      id: `member@${home.domain}`,
-      url: home.convexUrl,
-    })),
-  });
-}
-
-function combineMessages(messages: readonly ChatMessage[]) {
-  const byId = new Map(messages.map((message) => [message.messageId, message]));
-  return [...byId.values()].sort(
-    (left, right) =>
-      left.sentAt - right.sentAt ||
-      left.messageId.localeCompare(right.messageId),
-  );
-}
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
index ea5c1b1a..66a9f79d 100644
--- a/apps/web/src/routes/index.tsx
+++ b/apps/web/src/routes/index.tsx
@@ -1,30 +1,26 @@
 import { useState } from "react";
 import { createFileRoute } from "@tanstack/react-router";
 
-import type { HomeServer } from "../live/config.ts";
-import { HomeServerSession } from "../cloud/HomeServerSession.tsx";
-import { ServerPicker } from "../server-picker/ServerPicker.tsx";
+import type { PdsHome } from "../features/pds/model.ts";
+import { AccountEntry } from "../features/account/AccountEntry.tsx";
+import { AccountSession } from "../features/account/AccountSession.tsx";
 
 export const Route = createFileRoute("/")({ component: Home });
 
 function Home() {
   const [selection, setSelection] = useState<{
-    home: HomeServer;
+    home: PdsHome;
     username: string;
   }>();
   if (selection !== undefined) {
     return (
-      <HomeServerSession
+      <AccountSession
         home={selection.home}
         initialUsername={selection.username}
-        onChooseServer={() => setSelection(undefined)}
+        onBack={() => setSelection(undefined)}
       />
     );
   }
 
-  return (
-    <ServerPicker
-      onChoose={(home, username) => setSelection({ home, username })}
-    />
-  );
+  return <AccountEntry onSelect={setSelection} />;
 }
diff --git a/docs/architecture.md b/docs/architecture.md
new file mode 100644
index 00000000..ba8a5132
--- /dev/null
+++ b/docs/architecture.md
@@ -0,0 +1,124 @@
+# Decentralized Convex architecture
+
+## One concept from package to wire
+
+A plugin protocol is the source of truth for four things:
+
+```ts
+export const messagesProtocol = definePluginProtocol({
+  name: "messages",
+  version: "1",
+  requires: { accounts: "1" },
+  queries: { list: defineOperation(/* validators */) },
+  mutations: { send: defineOperation(/* validators */) },
+});
+```
+
+- `name` is the Convex Component install name and wire plugin discriminator.
+- `version` is checked by the client, root router, Component, and manifest.
+- `requires` is validated against the complete deployment at type-check and
+  Convex config evaluation time.
+- operation validators produce client argument/result types and enforce the
+  same contract inside the Component.
+
+There is no separate in-memory plugin model or manually maintained router
+registry.
+
+## Server setup
+
+Each plugin exports a normal Convex Component whose TypeScript type carries its
+protocol. The host imports that single value through the `convex.config` path
+required by Convex and never manually pairs a Component with its protocol.
+
+The host calls `definePdsApp({ plugins, components })`. It:
+
+1. checks duplicate names, missing plugins, and incompatible exact versions
+   through the plugin tuple's TypeScript type;
+2. installs each plugin as a normal Convex Component;
+3. installs unrelated Components such as Better Auth without treating them as
+   PDS protocols.
+
+The protocol marker is deliberately type-only. Convex replaces imported
+Component definitions while evaluating `convex.config.ts`, so runtime metadata
+attached to the original object would be lost. This design keeps the standard
+Convex commands and bundling behavior intact.
+
+Outside Convex's config evaluator, the plugin packages also register their
+protocol objects in a private local map. The backend's stable `pds` module reads
+that map from the same app declaration to build the browser API and discovery
+capability list. No second plugin registry is maintained.
+
+Convex code generation then discovers the public exports in
+`services/backend/convex/pds.ts`. The web client addresses them by their stable
+wire names, `pds:dispatchQuery` and `pds:dispatchMutation`, so it does not need
+the generated API of any particular independently hosted backend.
+
+## Request path
+
+A Messages read follows this path:
+
+```text
+usePdsQuery
+  -> DecentralizedConvexClient connection for each target
+  -> pds:dispatchQuery on each deployment
+  -> root authentication and plugin selection
+  -> messages.dispatcher.dispatchQuery
+  -> exact operation/version/argument validation
+  -> list handler and Component database
+  -> per-source results merged in the client
+```
+
+A write follows the same path through `pds:dispatchMutation`, targeting only the
+author's home PDS. The root router resolves identity once and passes the small
+identity value across one Component boundary.
+
+## Package boundaries
+
+`@decentralized-convex/plugin` knows about contracts, not React, authentication,
+Vera, or deployment routing.
+
+`@decentralized-convex/server` knows how to install and dispatch protocols, but
+not Vera's messaging policy or Better Auth.
+
+`@decentralized-convex/client` knows deployments, connections, authentication
+token callbacks, subscriptions, and typed protocol requests. React and
+TanStack Query integrations remain optional packages.
+
+Accounts and Messages own their schemas and operation implementations. Vera's
+backend supplies authentication and federation credential exchange. Vera's web
+app supplies product-specific conversation selection and presentation.
+
+## Defaults and extension points
+
+The default path intentionally needs only:
+
+- `definePdsApp` on the server;
+- one stable backend `pds` export inferred from that app definition;
+- `usePdsQuery({ request, targets })` for reactive reads;
+- `client.pdsMutation(target, request)` for writes.
+
+Applications may override:
+
+- ordinary Component install names and HTTP prefixes;
+- the root app HTTP prefix;
+- connection creation and destination-aware token fetching;
+- target-specific requests;
+- result combination and deduplication;
+- TanStack query keys and enablement;
+- the canonical root query and mutation references through `PdsClient`.
+
+## Proven and not yet proven
+
+The two deployed Vera development PDSs have proven address discovery,
+destination-bound authentication, private reads and writes, reactive remote
+updates, root dispatch, exact Component validation, and author-home storage.
+
+Still prototype-only:
+
+- the web app uses one explicit two-domain conversation fixture;
+- conversation membership and routing are not discovered from product data;
+- the UI holds one active account rather than concurrent accounts;
+- auth lacks scopes, revocation, replay limits, and resource-specific policy;
+- plugin version ranges, migrations, upgrades, and large plugin graphs need a
+  production design;
+- packages are private workspace packages and self-hosting is not productized.
diff --git a/packages/decentralized-convex-accounts/README.md b/packages/decentralized-convex-accounts/README.md
index 3a4d301d..609cc609 100644
--- a/packages/decentralized-convex-accounts/README.md
+++ b/packages/decentralized-convex-accounts/README.md
@@ -1,11 +1,16 @@
 # `@decentralized-convex/accounts`
 
-The product-agnostic account profile Component for a decentralized Convex PDS.
-The authenticated identity comes from the host PDS; this package stores only
-the shared account profile that other products can build on.
+First-party Accounts protocol and Convex Component. It owns canonical account
+profiles and has no PDS plugin dependencies.
+
+Install the default Component with:
 
 ```ts
 import accounts from "@decentralized-convex/accounts/convex.config";
-
-app.use(accounts);
 ```
+
+The default export is a normal Convex Component whose TypeScript type also
+carries the Accounts protocol and dependency metadata.
+
+The host supplies authenticated `accountId` identity through the generic PDS
+router; Accounts does not choose or depend on an authentication provider.
diff --git a/packages/decentralized-convex-accounts/_generated/dataModel.ts b/packages/decentralized-convex-accounts/_generated/dataModel.ts
index f97fd194..b3ac5131 100644
--- a/packages/decentralized-convex-accounts/_generated/dataModel.ts
+++ b/packages/decentralized-convex-accounts/_generated/dataModel.ts
@@ -11,10 +11,11 @@
 import type {
   DataModelFromSchemaDefinition,
   DocumentByName,
-  TableNamesInDataModel,
   SystemTableNames,
+  TableNamesInDataModel,
 } from "convex/server";
 import type { GenericId } from "convex/values";
+
 import schema from "../schema.js";
 
 /**
diff --git a/packages/decentralized-convex-accounts/_generated/server.ts b/packages/decentralized-convex-accounts/_generated/server.ts
index 739b02f7..40b544cf 100644
--- a/packages/decentralized-convex-accounts/_generated/server.ts
+++ b/packages/decentralized-convex-accounts/_generated/server.ts
@@ -10,24 +10,25 @@
 
 import type {
   ActionBuilder,
-  HttpActionBuilder,
-  MutationBuilder,
-  QueryBuilder,
   GenericActionCtx,
-  GenericMutationCtx,
-  GenericQueryCtx,
   GenericDatabaseReader,
   GenericDatabaseWriter,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  HttpActionBuilder,
+  MutationBuilder,
+  QueryBuilder,
 } from "convex/server";
 import {
   actionGeneric,
   httpActionGeneric,
-  queryGeneric,
-  mutationGeneric,
   internalActionGeneric,
   internalMutationGeneric,
   internalQueryGeneric,
+  mutationGeneric,
+  queryGeneric,
 } from "convex/server";
+
 import type { DataModel } from "./dataModel.js";
 
 /**
diff --git a/packages/decentralized-convex-accounts/convex.config.ts b/packages/decentralized-convex-accounts/convex.config.ts
index f52017bb..08afa34d 100644
--- a/packages/decentralized-convex-accounts/convex.config.ts
+++ b/packages/decentralized-convex-accounts/convex.config.ts
@@ -1,5 +1,9 @@
+import { definePdsPluginComponent } from "@decentralized-convex/server";
 import { defineComponent } from "convex/server";
 
 import { accountsProtocol } from "./protocol.ts";
 
-export default defineComponent(accountsProtocol.name);
+export default definePdsPluginComponent(
+  defineComponent(accountsProtocol.name),
+  accountsProtocol,
+);
diff --git a/packages/decentralized-convex-accounts/protocol.ts b/packages/decentralized-convex-accounts/protocol.ts
index 3492a4c2..9ecefd48 100644
--- a/packages/decentralized-convex-accounts/protocol.ts
+++ b/packages/decentralized-convex-accounts/protocol.ts
@@ -34,5 +34,6 @@ export const accountsProtocol = definePluginProtocol({
       returns: v.union(v.null(), accountProfile),
     }),
   },
+  requires: {},
   version: "1",
 });
diff --git a/packages/decentralized-convex-client/README.md b/packages/decentralized-convex-client/README.md
new file mode 100644
index 00000000..02ffb006
--- /dev/null
+++ b/packages/decentralized-convex-client/README.md
@@ -0,0 +1,23 @@
+# `@decentralized-convex/client`
+
+Framework-independent discovery, connection, and federation client.
+
+```ts
+const pds = definePdsApi(accountsProtocol, messagesProtocol);
+
+await client.pdsMutation(
+  { id: accountId, url: homeUrl },
+  pds.messages.send(input),
+);
+```
+
+`definePdsApi` uses each protocol's own name. Query and mutation builders are
+available directly on each plugin; the nested namespaces remain available to
+the lower-level binding API. `DecentralizedConvexClient` lazily reuses one
+Convex connection per normalized deployment URL, groups duplicate targets,
+supports point queries and realtime observers, and reports every source
+independently.
+
+The default function references are `pds:dispatchQuery` and
+`pds:dispatchMutation`. Advanced consumers may construct `PdsClient` with
+different references or a custom connection.
diff --git a/packages/decentralized-convex-client/src/api.ts b/packages/decentralized-convex-client/src/api.ts
new file mode 100644
index 00000000..732e665b
--- /dev/null
+++ b/packages/decentralized-convex-client/src/api.ts
@@ -0,0 +1,158 @@
+import type {
+  AnyPluginProtocol,
+  OperationArgs,
+  OperationMap,
+  OperationResult,
+} from "@decentralized-convex/plugin";
+
+import type {
+  FederationTarget,
+  FederationTargetGroup,
+  SuccessfulFederationSource,
+} from "./types.ts";
+
+declare const PdsResultType: unique symbol;
+
+export interface SerializedPdsRequest {
+  readonly [key: string]: unknown;
+  readonly operation: {
+    readonly args: Record<string, unknown>;
+    readonly type: string;
+  };
+  readonly plugin: string;
+  readonly version: string;
+}
+
+export interface PdsRequest<
+  Result,
+  Kind extends "mutation" | "query",
+> extends SerializedPdsRequest {
+  readonly [PdsResultType]?: {
+    readonly kind: Kind;
+    readonly result: Result;
+  };
+}
+
+export type AnyPdsQueryRequest = PdsRequest<unknown, "query">;
+export type AnyPdsMutationRequest = PdsRequest<unknown, "mutation">;
+
+export type PdsRequestResult<Request> =
+  Request extends PdsRequest<infer Result, "mutation" | "query">
+    ? Result
+    : never;
+
+export type DefaultCombinedPdsResult<Request extends AnyPdsQueryRequest> =
+  PdsRequestResult<Request> extends readonly (infer Item)[]
+    ? Item[]
+    : PdsRequestResult<Request>[];
+
+export interface FederatedPdsQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Combined = DefaultCombinedPdsResult<Request>,
+> {
+  combine?: (
+    sources: readonly SuccessfulFederationSource<PdsRequestResult<Request>>[],
+  ) => Combined;
+  request: Request | ((target: FederationTargetGroup) => Request);
+  targets: readonly FederationTarget[];
+}
+
+type OperationRequestBuilders<
+  PluginName extends string,
+  PluginVersion extends string,
+  Operations extends OperationMap,
+  Kind extends "mutation" | "query",
+> = {
+  readonly [Name in keyof Operations]: (
+    args: OperationArgs<Operations[Name]>,
+  ) => PdsRequest<OperationResult<Operations[Name]>, Kind> & {
+    readonly operation: {
+      readonly args: OperationArgs<Operations[Name]>;
+      readonly type: Name;
+    };
+    readonly plugin: PluginName;
+    readonly version: PluginVersion;
+  };
+};
+
+export type PdsPluginApi<Protocol extends AnyPluginProtocol> = {
+  readonly mutations: OperationRequestBuilders<
+    Protocol["name"],
+    Protocol["version"],
+    Protocol["mutations"],
+    "mutation"
+  >;
+  readonly queries: OperationRequestBuilders<
+    Protocol["name"],
+    Protocol["version"],
+    Protocol["queries"],
+    "query"
+  >;
+} & OperationRequestBuilders<
+  Protocol["name"],
+  Protocol["version"],
+  Protocol["queries"],
+  "query"
+> &
+  OperationRequestBuilders<
+    Protocol["name"],
+    Protocol["version"],
+    Protocol["mutations"],
+    "mutation"
+  >;
+
+export type PdsApi<
+  Protocols extends Readonly<Record<string, AnyPluginProtocol>>,
+> = {
+  readonly [Name in keyof Protocols]: PdsPluginApi<Protocols[Name]>;
+};
+
+type ProtocolsByName<Protocols extends readonly AnyPluginProtocol[]> = {
+  readonly [Protocol in Protocols[number] as Protocol["name"]]: Protocol;
+};
+
+export function definePdsApi<
+  const Protocols extends readonly AnyPluginProtocol[],
+>(...protocols: Protocols): PdsApi<ProtocolsByName<Protocols>> {
+  const api = Object.fromEntries(
+    protocols.map((protocol) => {
+      const mutations = defineRequestBuilders(
+        protocol.name,
+        protocol.version,
+        protocol.mutations,
+      );
+      const queries = defineRequestBuilders(
+        protocol.name,
+        protocol.version,
+        protocol.queries,
+      );
+      return [protocol.name, { ...queries, ...mutations, mutations, queries }];
+    }),
+  );
+
+  // The runtime object is constructed from the exact protocol map supplied by the caller.
+  const erased: unknown = api;
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return erased as PdsApi<ProtocolsByName<Protocols>>;
+}
+
+function defineRequestBuilders(
+  plugin: string,
+  version: string,
+  operations: OperationMap,
+): Readonly<
+  Record<string, (args: Record<string, unknown>) => SerializedPdsRequest>
+> {
+  return Object.freeze(
+    Object.fromEntries(
+      Object.keys(operations).map((type) => [
+        type,
+        (args: Record<string, unknown>) => ({
+          operation: { args, type },
+          plugin,
+          version,
+        }),
+      ]),
+    ),
+  );
+}
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
index ffe2317d..3a6de8bc 100644
--- a/packages/decentralized-convex-client/src/client.test.ts
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -67,9 +67,10 @@ void test("federates typed PDS requests without a generated backend API", async
         returns: v.array(v.object({ body: v.string() })),
       }),
     },
+    requires: {},
     version: "1",
   });
-  const api = definePdsApi({ notes });
+  const api = definePdsApi(notes);
   const client = new DecentralizedConvexClient({
     connectionFactory: (url) => new MemoryConnection(url),
   });
diff --git a/packages/decentralized-convex-client/src/pds.test.ts b/packages/decentralized-convex-client/src/pds.test.ts
index efedd685..864ef7e9 100644
--- a/packages/decentralized-convex-client/src/pds.test.ts
+++ b/packages/decentralized-convex-client/src/pds.test.ts
@@ -24,11 +24,12 @@ const notes = definePluginProtocol({
       returns: v.array(v.object({ body: v.string(), id: v.string() })),
     }),
   },
+  requires: {},
   version: "1",
 });
 
 void test("builds serializable PDS dispatcher requests", () => {
-  const api = definePdsApi({ notes });
+  const api = definePdsApi(notes);
 
   assert.deepEqual(api.notes.queries.list({ owner: "shawn" }), {
     operation: { args: { owner: "shawn" }, type: "list" },
@@ -40,6 +41,16 @@ void test("builds serializable PDS dispatcher requests", () => {
     plugin: "notes",
     version: "1",
   });
+  assert.deepEqual(api.notes.list({ owner: "shawn" }), {
+    operation: { args: { owner: "shawn" }, type: "list" },
+    plugin: "notes",
+    version: "1",
+  });
+  assert.deepEqual(api.notes.create({ body: "hello" }), {
+    operation: { args: { body: "hello" }, type: "create" },
+    plugin: "notes",
+    version: "1",
+  });
 });
 
 void test("binds protocols to canonical typed PDS calls", async () => {
@@ -61,7 +72,7 @@ void test("binds protocols to canonical typed PDS calls", async () => {
     },
   };
   const client = new PdsClient({ connection });
-  const api = client.bind(definePdsApi({ notes }));
+  const api = client.bind(definePdsApi(notes));
 
   assert.equal(getFunctionName(pdsFunctions.query), "pds:dispatchQuery");
   assert.equal(getFunctionName(pdsFunctions.mutation), "pds:dispatchMutation");
diff --git a/packages/decentralized-convex-client/src/pds.ts b/packages/decentralized-convex-client/src/pds.ts
index d40760d8..7e321004 100644
--- a/packages/decentralized-convex-client/src/pds.ts
+++ b/packages/decentralized-convex-client/src/pds.ts
@@ -1,128 +1,24 @@
-import type {
-  AnyPluginProtocol,
-  OperationArgs,
-  OperationMap,
-  OperationResult,
-} from "@decentralized-convex/plugin";
 import type { FunctionReference, FunctionReturnType } from "convex/server";
 import { makeFunctionReference } from "convex/server";
 
 import type {
-  FederationTarget,
-  FederationTargetGroup,
-  SuccessfulFederationSource,
-} from "./types.ts";
-
-declare const PdsResultType: unique symbol;
-
-interface SerializedPdsRequest {
-  readonly [key: string]: unknown;
-  readonly operation: {
-    readonly args: Record<string, unknown>;
-    readonly type: string;
-  };
-  readonly plugin: string;
-  readonly version: string;
-}
-
-export interface PdsRequest<
-  Result,
-  Kind extends "mutation" | "query",
-> extends SerializedPdsRequest {
-  readonly [PdsResultType]?: {
-    readonly kind: Kind;
-    readonly result: Result;
-  };
-}
-
-export type AnyPdsQueryRequest = PdsRequest<unknown, "query">;
-export type AnyPdsMutationRequest = PdsRequest<unknown, "mutation">;
-
-export type PdsRequestResult<Request> =
-  Request extends PdsRequest<infer Result, "mutation" | "query">
-    ? Result
-    : never;
-
-export type DefaultCombinedPdsResult<Request extends AnyPdsQueryRequest> =
-  PdsRequestResult<Request> extends readonly (infer Item)[]
-    ? Item[]
-    : PdsRequestResult<Request>[];
-
-export interface FederatedPdsQueryOptions<
-  Request extends AnyPdsQueryRequest,
-  Combined = DefaultCombinedPdsResult<Request>,
-> {
-  combine?: (
-    sources: readonly SuccessfulFederationSource<PdsRequestResult<Request>>[],
-  ) => Combined;
-  request: Request | ((target: FederationTargetGroup) => Request);
-  targets: readonly FederationTarget[];
-}
-
-type OperationRequestBuilders<
-  PluginName extends string,
-  PluginVersion extends string,
-  Operations extends OperationMap,
-  Kind extends "mutation" | "query",
-> = {
-  readonly [Name in keyof Operations]: (
-    args: OperationArgs<Operations[Name]>,
-  ) => PdsRequest<OperationResult<Operations[Name]>, Kind> & {
-    readonly operation: {
-      readonly args: OperationArgs<Operations[Name]>;
-      readonly type: Name;
-    };
-    readonly plugin: PluginName;
-    readonly version: PluginVersion;
-  };
-};
-
-export interface PdsPluginApi<Protocol extends AnyPluginProtocol> {
-  readonly mutations: OperationRequestBuilders<
-    Protocol["name"],
-    Protocol["version"],
-    Protocol["mutations"],
-    "mutation"
-  >;
-  readonly queries: OperationRequestBuilders<
-    Protocol["name"],
-    Protocol["version"],
-    Protocol["queries"],
-    "query"
-  >;
-}
-
-export type PdsApi<
-  Protocols extends Readonly<Record<string, AnyPluginProtocol>>,
-> = {
-  readonly [Name in keyof Protocols]: PdsPluginApi<Protocols[Name]>;
-};
-
-export function definePdsApi<
-  const Protocols extends Readonly<Record<string, AnyPluginProtocol>>,
->(protocols: Protocols): PdsApi<Protocols> {
-  const api = Object.fromEntries(
-    Object.entries(protocols).map(([name, protocol]) => [
-      name,
-      {
-        mutations: defineRequestBuilders(
-          protocol.name,
-          protocol.version,
-          protocol.mutations,
-        ),
-        queries: defineRequestBuilders(
-          protocol.name,
-          protocol.version,
-          protocol.queries,
-        ),
-      },
-    ]),
-  );
-
-  // The runtime object is constructed from the exact protocol map supplied by the caller.
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return api as PdsApi<Protocols>;
-}
+  AnyPdsMutationRequest,
+  AnyPdsQueryRequest,
+  PdsRequestResult,
+  SerializedPdsRequest,
+} from "./api.ts";
+
+export { definePdsApi } from "./api.ts";
+export type {
+  AnyPdsMutationRequest,
+  AnyPdsQueryRequest,
+  DefaultCombinedPdsResult,
+  FederatedPdsQueryOptions,
+  PdsApi,
+  PdsPluginApi,
+  PdsRequest,
+  PdsRequestResult,
+} from "./api.ts";
 
 type RootQuery = FunctionReference<
   "query",
@@ -236,27 +132,6 @@ export class PdsClient {
   }
 }
 
-function defineRequestBuilders(
-  plugin: string,
-  version: string,
-  operations: OperationMap,
-): Readonly<
-  Record<string, (args: Record<string, unknown>) => SerializedPdsRequest>
-> {
-  return Object.freeze(
-    Object.fromEntries(
-      Object.keys(operations).map((type) => [
-        type,
-        (args: Record<string, unknown>) => ({
-          operation: { args, type },
-          plugin,
-          version,
-        }),
-      ]),
-    ),
-  );
-}
-
 type MutationRequestBuilder = (...args: never[]) => AnyPdsMutationRequest;
 type QueryRequestBuilder = (...args: never[]) => AnyPdsQueryRequest;
 
diff --git a/packages/decentralized-convex-client/src/pds.type-test.ts b/packages/decentralized-convex-client/src/pds.type-test.ts
index 74679313..16ec474c 100644
--- a/packages/decentralized-convex-client/src/pds.type-test.ts
+++ b/packages/decentralized-convex-client/src/pds.type-test.ts
@@ -23,16 +23,21 @@ const messaging = definePluginProtocol({
       returns: v.array(v.object({ body: v.string() })),
     }),
   },
+  requires: {},
   version: "1",
 });
 
-const api = definePdsApi({ messaging });
+const api = definePdsApi(messaging);
 declare const client: PdsClient;
 const bound = client.bind(api);
 const send = api.messaging.mutations.sendMessage({ body: "hello" });
 const list = api.messaging.queries.listMessages({ conversationId: "general" });
+const conciseSend = api.messaging.sendMessage({ body: "hello" });
+const conciseList = api.messaging.listMessages({ conversationId: "general" });
 void send;
 void list;
+void conciseSend;
+void conciseList;
 
 const boundSendResult: Promise<{ messageId: string }> =
   bound.messaging.mutation.sendMessage({ body: "hello" });
diff --git a/packages/decentralized-convex-messages/README.md b/packages/decentralized-convex-messages/README.md
index cc12ed0a..cc3a6706 100644
--- a/packages/decentralized-convex-messages/README.md
+++ b/packages/decentralized-convex-messages/README.md
@@ -1,11 +1,15 @@
 # `@decentralized-convex/messages`
 
-The product-agnostic messaging Component used by Vera and any other compatible
-decentralized Convex client. The host PDS owns authentication; the Component
-owns message storage and derives authorship from the forwarded identity.
+First-party authenticated Messages protocol and Convex Component.
+
+The protocol explicitly requires `accounts@1`, so a host cannot install
+Messages without a compatible Accounts plugin. Messages receives canonical
+identity from the root PDS router and keeps its hot read/write path inside one
+Component boundary.
 
 ```ts
 import messages from "@decentralized-convex/messages/convex.config";
-
-app.use(messages);
 ```
+
+The default export is a normal Convex Component whose TypeScript type also
+carries the Messages protocol and its `accounts@1` requirement.
diff --git a/packages/decentralized-convex-messages/_generated/dataModel.ts b/packages/decentralized-convex-messages/_generated/dataModel.ts
index f97fd194..b3ac5131 100644
--- a/packages/decentralized-convex-messages/_generated/dataModel.ts
+++ b/packages/decentralized-convex-messages/_generated/dataModel.ts
@@ -11,10 +11,11 @@
 import type {
   DataModelFromSchemaDefinition,
   DocumentByName,
-  TableNamesInDataModel,
   SystemTableNames,
+  TableNamesInDataModel,
 } from "convex/server";
 import type { GenericId } from "convex/values";
+
 import schema from "../schema.js";
 
 /**
diff --git a/packages/decentralized-convex-messages/_generated/server.ts b/packages/decentralized-convex-messages/_generated/server.ts
index 739b02f7..40b544cf 100644
--- a/packages/decentralized-convex-messages/_generated/server.ts
+++ b/packages/decentralized-convex-messages/_generated/server.ts
@@ -10,24 +10,25 @@
 
 import type {
   ActionBuilder,
-  HttpActionBuilder,
-  MutationBuilder,
-  QueryBuilder,
   GenericActionCtx,
-  GenericMutationCtx,
-  GenericQueryCtx,
   GenericDatabaseReader,
   GenericDatabaseWriter,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  HttpActionBuilder,
+  MutationBuilder,
+  QueryBuilder,
 } from "convex/server";
 import {
   actionGeneric,
   httpActionGeneric,
-  queryGeneric,
-  mutationGeneric,
   internalActionGeneric,
   internalMutationGeneric,
   internalQueryGeneric,
+  mutationGeneric,
+  queryGeneric,
 } from "convex/server";
+
 import type { DataModel } from "./dataModel.js";
 
 /**
diff --git a/packages/decentralized-convex-messages/convex.config.ts b/packages/decentralized-convex-messages/convex.config.ts
index 348fe775..7bf81c9c 100644
--- a/packages/decentralized-convex-messages/convex.config.ts
+++ b/packages/decentralized-convex-messages/convex.config.ts
@@ -1,5 +1,9 @@
+import { definePdsPluginComponent } from "@decentralized-convex/server";
 import { defineComponent } from "convex/server";
 
 import { messagesProtocol } from "./protocol.ts";
 
-export default defineComponent(messagesProtocol.name);
+export default definePdsPluginComponent(
+  defineComponent(messagesProtocol.name),
+  messagesProtocol,
+);
diff --git a/packages/decentralized-convex-messages/protocol.ts b/packages/decentralized-convex-messages/protocol.ts
index 3a372958..98b9d0fb 100644
--- a/packages/decentralized-convex-messages/protocol.ts
+++ b/packages/decentralized-convex-messages/protocol.ts
@@ -34,5 +34,6 @@ export const messagesProtocol = definePluginProtocol({
       returns: v.array(message),
     }),
   },
+  requires: { accounts: "1" },
   version: "1",
 });
diff --git a/packages/decentralized-convex-plugin/README.md b/packages/decentralized-convex-plugin/README.md
index c60a4972..3938ec13 100644
--- a/packages/decentralized-convex-plugin/README.md
+++ b/packages/decentralized-convex-plugin/README.md
@@ -1,104 +1,43 @@
 # `@decentralized-convex/plugin`
 
-Shared plugin composition and operation protocols for decentralized Convex
-applications.
-
-Plugins provide versioned capability contracts and may require contracts from
-other plugins. The final composition boundary reports missing or incompatible
-providers at type-check time and validates the complete dependency graph before
-running plugin setup.
+Defines the contract shared by plugin authors, PDS hosts, and clients.
 
 ```ts
-interface AccountsService {
-  getAccount(address: string): { address: string; displayName: string };
-}
-
-const Accounts = defineCapability<AccountsService>()({
-  id: "org.decentralized-convex.accounts",
-  version: "1",
-});
-
-const accountsPlugin = definePlugin({
-  name: "accounts",
-  provides: [Accounts],
-  requires: [],
-  setup: () => [accountsService],
-});
-
-const messagesPlugin = definePlugin({
-  name: "messages",
-  provides: [Messaging],
-  requires: [Accounts],
-  setup: ({ get }) => {
-    const accounts = get(Accounts);
-    return [createMessagingService(accounts)];
-  },
-});
-
-const app = composePlugins(messagesPlugin, accountsPlugin);
-const messaging = app.get(Messaging);
-```
-
-Plugin order does not matter. Dependencies determine setup order. Omitting the
-accounts provider produces a TypeScript error at `composePlugins`.
-
-A product profile is another dependent capability rather than a mutation of the
-accounts contract. For example, a `VeraProfiles` plugin can require `Accounts`,
-inherit the account display name and avatar, and provide Vera-specific overrides.
-Ruby or Sync can install separate profile capabilities over the same account.
-
-## Component operation protocols
-
-A Component can define all of its client-facing behavior as typed operations.
-Each operation owns its argument and return validators, and a plugin protocol
-groups them into query and mutation maps:
-
-```ts
-const messages = definePluginProtocol({
+export const messagesProtocol = definePluginProtocol({
   name: "messages",
   version: "1",
+  requires: { accounts: "1" },
   queries: {
-    listMessages: defineOperation({
+    list: defineOperation({
       args: v.object({ conversationId: v.string() }),
       returns: v.array(message),
     }),
   },
   mutations: {
-    sendMessage: defineOperation({
-      args: message,
+    send: defineOperation({
+      args: v.object({
+        body: v.string(),
+        conversationId: v.string(),
+        messageId: v.string(),
+      }),
       returns: message,
     }),
   },
 });
 ```
 
-`defineComponentDispatchers` from `@decentralized-convex/server` turns those
-maps into one real Convex query and one real mutation. `definePdsRouter` exposes
-one root query and mutation for every installed Component. The client SDK uses
-the same protocol to restore operation-specific argument and return types even
-though the root Convex functions are intentionally generic.
-
-The Component uses its protocol name as its Convex name:
+`requires` maps plugin names to exact protocol versions. A complete protocol
+set rejects missing dependencies, incompatible versions, duplicate names, and
+cycles both statically and at runtime:
 
 ```ts
-export default defineComponent(messages.name);
+defineProtocolSet(accountsProtocol, messagesProtocol);
 ```
 
-Installing it into a PDS is one line:
+The same operation definitions generate discriminated request/response
+validators and preserve operation-specific argument and result types through
+the intentionally generic PDS dispatcher.
 
-```ts
-app.use(messagesComponent);
-```
-
-The shared root router resolves that install name dynamically, so installing a
-plugin does not require adding wrapper functions or a second router registry.
-
-Once bound, client calls stay small and contain only application arguments:
-
-```ts
-const client = new PdsClient({ connection });
-const pds = client.bind(definePdsApi({ messages }));
-
-const result = await pds.messages.query.listMessages({ conversationId });
-await pds.messages.mutation.sendMessage(message);
-```
+Version ranges, optional dependencies, and migration policy are deliberately
+not hidden behind premature abstractions. Version `1` currently means exact
+compatibility.
diff --git a/packages/decentralized-convex-plugin/src/capability.ts b/packages/decentralized-convex-plugin/src/capability.ts
deleted file mode 100644
index 8ea3a916..00000000
--- a/packages/decentralized-convex-plugin/src/capability.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-export const CapabilityTypeId = Symbol("decentralized-convex/capability");
-
-export interface Capability<
-  Id extends string,
-  Version extends string,
-  Service,
-> {
-  readonly id: Id;
-  readonly version: Version;
-  readonly [CapabilityTypeId]: (value: unknown) => Service;
-}
-
-export type AnyCapability = Capability<string, string, unknown>;
-
-export type CapabilityService<Value extends AnyCapability> = ReturnType<
-  Value[typeof CapabilityTypeId]
->;
-
-export type CapabilityKey<Value extends AnyCapability> =
-  `${Value["id"]}@${Value["version"]}`;
-
-export function defineCapability<Service>() {
-  return <const Id extends string, const Version extends string>({
-    id,
-    version,
-  }: {
-    readonly id: Id;
-    readonly version: Version;
-  }): Capability<Id, Version, Service> =>
-    Object.freeze({
-      id,
-      version,
-      // Capability identity and graph validation make this the package's one trusted erasure boundary.
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      [CapabilityTypeId]: (value: unknown) => value as Service,
-    });
-}
-
-export function readCapabilityService<Capability extends AnyCapability>(
-  capability: Capability,
-  value: unknown,
-): CapabilityService<Capability> {
-  // The capability token is the runtime witness for its erased service type.
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return capability[CapabilityTypeId](value) as CapabilityService<Capability>;
-}
diff --git a/packages/decentralized-convex-plugin/src/compose.ts b/packages/decentralized-convex-plugin/src/compose.ts
deleted file mode 100644
index 464f4085..00000000
--- a/packages/decentralized-convex-plugin/src/compose.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import type {
-  AnyCapability,
-  CapabilityKey,
-  CapabilityService,
-} from "./capability.ts";
-import type {
-  AnyPlugin,
-  PluginContext,
-  PluginProvisions,
-  PluginRequirements,
-} from "./plugin.ts";
-import { readCapabilityService } from "./capability.ts";
-import { assertPluginGraph } from "./graph.ts";
-
-type PluginsRequirements<Plugins extends readonly AnyPlugin[]> =
-  PluginRequirements<Plugins[number]>;
-
-type PluginsProvisions<Plugins extends readonly AnyPlugin[]> = PluginProvisions<
-  Plugins[number]
->;
-
-type MatchingProvision<
-  Requirement extends AnyCapability,
-  Provisions extends AnyCapability,
-> = Provisions extends AnyCapability
-  ? Provisions["id"] extends Requirement["id"]
-    ? Provisions["version"] extends Requirement["version"]
-      ? Provisions
-      : never
-    : never
-  : never;
-
-type UnsatisfiedRequirements<
-  Requirements extends AnyCapability,
-  Provisions extends AnyCapability,
-> = Requirements extends AnyCapability
-  ? [MatchingProvision<Requirements, Provisions>] extends [never]
-    ? Requirements
-    : never
-  : never;
-
-type MissingRequirements<Plugins extends readonly AnyPlugin[]> =
-  UnsatisfiedRequirements<
-    PluginsRequirements<Plugins>,
-    PluginsProvisions<Plugins>
-  >;
-
-type SameIdProvision<
-  Requirement extends AnyCapability,
-  Provisions extends AnyCapability,
-> = Provisions extends AnyCapability
-  ? Provisions["id"] extends Requirement["id"]
-    ? Provisions
-    : never
-  : never;
-
-type IncompatibleRequirements<Plugins extends readonly AnyPlugin[]> =
-  MissingRequirements<Plugins> extends infer Requirement extends AnyCapability
-    ? [SameIdProvision<Requirement, PluginsProvisions<Plugins>>] extends [never]
-      ? never
-      : Requirement
-    : never;
-
-type AbsentRequirements<Plugins extends readonly AnyPlugin[]> = Exclude<
-  MissingRequirements<Plugins>,
-  IncompatibleRequirements<Plugins>
->;
-
-type ProviderIds<Value extends AnyPlugin> = PluginProvisions<Value>["id"];
-
-type DuplicateProviderIds<
-  Plugins extends readonly AnyPlugin[],
-  Seen extends string = never,
-> = Plugins extends readonly [
-  infer Head extends AnyPlugin,
-  ...infer Tail extends readonly AnyPlugin[],
-]
-  ?
-      | Extract<ProviderIds<Head>, Seen>
-      | DuplicateProviderIds<Tail, Seen | ProviderIds<Head>>
-  : never;
-
-type PluginGraphConstraint<Plugins extends readonly AnyPlugin[]> = Plugins &
-  ([AbsentRequirements<Plugins>] extends [never]
-    ? unknown
-    : {
-        readonly __missingPluginRequirements: CapabilityKey<
-          AbsentRequirements<Plugins>
-        >;
-      }) &
-  ([IncompatibleRequirements<Plugins>] extends [never]
-    ? unknown
-    : {
-        readonly __incompatiblePluginRequirements: CapabilityKey<
-          IncompatibleRequirements<Plugins>
-        >;
-      }) &
-  ([DuplicateProviderIds<Plugins>] extends [never]
-    ? unknown
-    : {
-        readonly __duplicatePluginProviders: DuplicateProviderIds<Plugins>;
-      });
-
-export interface PluginManifestCapability {
-  readonly id: string;
-  readonly version: string;
-}
-
-export interface PluginManifestEntry {
-  readonly name: string;
-  readonly provides: readonly PluginManifestCapability[];
-  readonly requires: readonly PluginManifestCapability[];
-}
-
-export interface PluginApp<Provisions extends AnyCapability> {
-  readonly get: <Capability extends Provisions>(
-    capability: Capability,
-  ) => CapabilityService<Capability>;
-  readonly manifest: () => readonly PluginManifestEntry[];
-}
-
-export function composePlugins<const Plugins extends readonly AnyPlugin[]>(
-  ...plugins: PluginGraphConstraint<Plugins>
-): PluginApp<PluginsProvisions<Plugins>> {
-  const order = assertPluginGraph(plugins);
-  const services = new Map<
-    string,
-    { readonly service: unknown; readonly version: string }
-  >();
-
-  const context: PluginContext<readonly AnyCapability[]> = {
-    get: (capability) => {
-      const provided = services.get(capability.id);
-      if (provided?.version !== capability.version) {
-        throw new Error(
-          `Capability ${capability.id}@${capability.version} is not available during plugin setup.`,
-        );
-      }
-      return readCapabilityService(capability, provided.service);
-    },
-  };
-
-  for (const plugin of order) {
-    const implementations = plugin.setup(context);
-    if (implementations.length !== plugin.provides.length) {
-      throw new Error(
-        `Plugin ${plugin.name} declared ${plugin.provides.length} capabilities but returned ${implementations.length} implementations.`,
-      );
-    }
-    plugin.provides.forEach((capability, index) => {
-      services.set(capability.id, {
-        service: implementations[index],
-        version: capability.version,
-      });
-    });
-  }
-
-  return Object.freeze({
-    get: <Capability extends PluginsProvisions<Plugins>>(
-      capability: Capability,
-    ) => {
-      const provided = services.get(capability.id);
-      if (provided?.version !== capability.version) {
-        throw new Error(
-          `Capability ${capability.id}@${capability.version} is not installed.`,
-        );
-      }
-      return readCapabilityService(capability, provided.service);
-    },
-    manifest: () =>
-      Object.freeze(
-        order.map((plugin) =>
-          Object.freeze({
-            name: plugin.name,
-            provides: plugin.provides.map(capabilityManifestEntry),
-            requires: plugin.requires.map(capabilityManifestEntry),
-          }),
-        ),
-      ),
-  });
-}
-
-function capabilityManifestEntry(capability: AnyCapability) {
-  return Object.freeze({ id: capability.id, version: capability.version });
-}
diff --git a/packages/decentralized-convex-plugin/src/graph.ts b/packages/decentralized-convex-plugin/src/graph.ts
deleted file mode 100644
index b396ab56..00000000
--- a/packages/decentralized-convex-plugin/src/graph.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-import type { AnyCapability } from "./capability.ts";
-import type { AnyPlugin } from "./plugin.ts";
-
-export type PluginGraphIssue =
-  | {
-      readonly capabilityId: string;
-      readonly code: "duplicate-provider";
-      readonly plugins: readonly string[];
-    }
-  | {
-      readonly capabilityId: string;
-      readonly code: "incompatible-version";
-      readonly plugin: string;
-      readonly providedVersions: readonly string[];
-      readonly requiredVersion: string;
-    }
-  | {
-      readonly capabilityId: string;
-      readonly code: "missing-provider";
-      readonly plugin: string;
-      readonly requiredVersion: string;
-    }
-  | {
-      readonly code: "dependency-cycle";
-      readonly plugins: readonly string[];
-    }
-  | {
-      readonly code: "duplicate-plugin-name";
-      readonly name: string;
-    };
-
-interface ProviderCandidate {
-  readonly capability: AnyCapability;
-  readonly plugin: AnyPlugin;
-}
-
-type ProviderMap = ReadonlyMap<string, readonly ProviderCandidate[]>;
-type PluginDependencies = ReadonlyMap<AnyPlugin, ReadonlySet<AnyPlugin>>;
-
-interface GraphTraversal {
-  readonly complete: Set<AnyPlugin>;
-  readonly issues: PluginGraphIssue[];
-  readonly order: AnyPlugin[];
-  readonly reportedCycles: Set<string>;
-  readonly stack: AnyPlugin[];
-  readonly visiting: Set<AnyPlugin>;
-}
-
-export class PluginGraphError extends Error {
-  readonly issues: readonly PluginGraphIssue[];
-
-  constructor(issues: readonly PluginGraphIssue[]) {
-    super(formatPluginGraphIssues(issues));
-    this.name = "PluginGraphError";
-    this.issues = issues;
-  }
-}
-
-export function inspectPluginGraph(plugins: readonly AnyPlugin[]) {
-  return analyzePluginGraph(plugins).issues;
-}
-
-export function assertPluginGraph(plugins: readonly AnyPlugin[]) {
-  const analysis = analyzePluginGraph(plugins);
-  if (analysis.issues.length > 0) {
-    throw new PluginGraphError(analysis.issues);
-  }
-  return analysis.order;
-}
-
-function analyzePluginGraph(plugins: readonly AnyPlugin[]) {
-  const issues = inspectDuplicatePluginNames(plugins);
-  const providers = collectProviders(plugins);
-  issues.push(...inspectDuplicateProviders(providers));
-  const dependencies = collectDependencies({ issues, plugins, providers });
-  const order = resolvePluginOrder({ dependencies, issues, plugins });
-  return { issues, order };
-}
-
-function inspectDuplicatePluginNames(plugins: readonly AnyPlugin[]) {
-  const issues = Array<PluginGraphIssue>();
-  const pluginNames = new Set<string>();
-  for (const plugin of plugins) {
-    if (pluginNames.has(plugin.name)) {
-      issues.push({ code: "duplicate-plugin-name", name: plugin.name });
-    }
-    pluginNames.add(plugin.name);
-  }
-  return issues;
-}
-
-function collectProviders(plugins: readonly AnyPlugin[]) {
-  const providers = new Map<string, ProviderCandidate[]>();
-  for (const plugin of plugins) {
-    for (const capability of plugin.provides) {
-      const candidates = providers.get(capability.id) ?? [];
-      candidates.push({ capability, plugin });
-      providers.set(capability.id, candidates);
-    }
-  }
-  return providers;
-}
-
-function inspectDuplicateProviders(providers: ProviderMap) {
-  const issues = Array<PluginGraphIssue>();
-  for (const [capabilityId, candidates] of providers) {
-    if (candidates.length > 1) {
-      issues.push({
-        capabilityId,
-        code: "duplicate-provider",
-        plugins: candidates.map(({ plugin }) => plugin.name),
-      });
-    }
-  }
-  return issues;
-}
-
-function collectDependencies({
-  issues,
-  plugins,
-  providers,
-}: {
-  readonly issues: PluginGraphIssue[];
-  readonly plugins: readonly AnyPlugin[];
-  readonly providers: ProviderMap;
-}) {
-  const dependencies = new Map<AnyPlugin, Set<AnyPlugin>>(
-    plugins.map((plugin) => [plugin, new Set()]),
-  );
-
-  for (const plugin of plugins) {
-    for (const requirement of plugin.requires) {
-      const provider = resolveProvider({
-        issues,
-        plugin,
-        providers,
-        requirement,
-      });
-      if (provider) {
-        dependencies.get(plugin)?.add(provider);
-      }
-    }
-  }
-  return dependencies;
-}
-
-function resolveProvider({
-  issues,
-  plugin,
-  providers,
-  requirement,
-}: {
-  readonly issues: PluginGraphIssue[];
-  readonly plugin: AnyPlugin;
-  readonly providers: ProviderMap;
-  readonly requirement: AnyCapability;
-}) {
-  const candidates = providers.get(requirement.id) ?? [];
-  if (candidates.length === 0) {
-    issues.push({
-      capabilityId: requirement.id,
-      code: "missing-provider",
-      plugin: plugin.name,
-      requiredVersion: requirement.version,
-    });
-    return undefined;
-  }
-
-  const matching = candidates.find(
-    ({ capability }) => capability.version === requirement.version,
-  );
-  if (!matching) {
-    issues.push({
-      capabilityId: requirement.id,
-      code: "incompatible-version",
-      plugin: plugin.name,
-      providedVersions: candidates.map(({ capability }) => capability.version),
-      requiredVersion: requirement.version,
-    });
-  }
-  return matching?.plugin;
-}
-
-function resolvePluginOrder({
-  dependencies,
-  issues,
-  plugins,
-}: {
-  readonly dependencies: PluginDependencies;
-  readonly issues: PluginGraphIssue[];
-  readonly plugins: readonly AnyPlugin[];
-}) {
-  const traversal: GraphTraversal = {
-    complete: new Set(),
-    issues,
-    order: [],
-    reportedCycles: new Set(),
-    stack: [],
-    visiting: new Set(),
-  };
-  for (const plugin of plugins) {
-    visitPlugin({ dependencies, plugin, traversal });
-  }
-  return traversal.order;
-}
-
-function visitPlugin({
-  dependencies,
-  plugin,
-  traversal,
-}: {
-  readonly dependencies: PluginDependencies;
-  readonly plugin: AnyPlugin;
-  readonly traversal: GraphTraversal;
-}) {
-  if (traversal.complete.has(plugin)) {
-    return;
-  }
-  if (traversal.visiting.has(plugin)) {
-    reportDependencyCycle(plugin, traversal);
-    return;
-  }
-
-  traversal.visiting.add(plugin);
-  traversal.stack.push(plugin);
-  for (const dependency of dependencies.get(plugin) ?? []) {
-    visitPlugin({ dependencies, plugin: dependency, traversal });
-  }
-  traversal.stack.pop();
-  traversal.visiting.delete(plugin);
-  traversal.complete.add(plugin);
-  traversal.order.push(plugin);
-}
-
-function reportDependencyCycle(plugin: AnyPlugin, traversal: GraphTraversal) {
-  const cycleStart = traversal.stack.indexOf(plugin);
-  const cycle = [...traversal.stack.slice(cycleStart), plugin].map(
-    ({ name }) => name,
-  );
-  const key = [...new Set(cycle)].sort().join("|");
-  if (!traversal.reportedCycles.has(key)) {
-    traversal.issues.push({ code: "dependency-cycle", plugins: cycle });
-    traversal.reportedCycles.add(key);
-  }
-}
-
-function formatPluginGraphIssues(issues: readonly PluginGraphIssue[]) {
-  const details = issues.map((issue) => {
-    switch (issue.code) {
-      case "dependency-cycle":
-        return `dependency cycle: ${issue.plugins.join(" -> ")}`;
-      case "duplicate-plugin-name":
-        return `duplicate plugin name: ${issue.name}`;
-      case "duplicate-provider":
-        return `multiple plugins provide ${issue.capabilityId}: ${issue.plugins.join(", ")}`;
-      case "incompatible-version":
-        return `${issue.plugin} requires ${issue.capabilityId}@${issue.requiredVersion}, available: ${issue.providedVersions.join(", ")}`;
-      case "missing-provider":
-        return `${issue.plugin} requires missing ${issue.capabilityId}@${issue.requiredVersion}`;
-    }
-  });
-  return `Invalid plugin graph:\n- ${details.join("\n- ")}`;
-}
diff --git a/packages/decentralized-convex-plugin/src/index.ts b/packages/decentralized-convex-plugin/src/index.ts
index 20ca2271..5c0624b8 100644
--- a/packages/decentralized-convex-plugin/src/index.ts
+++ b/packages/decentralized-convex-plugin/src/index.ts
@@ -1,31 +1,14 @@
-export { defineCapability } from "./capability.ts";
-export type {
-  AnyCapability,
-  Capability,
-  CapabilityKey,
-  CapabilityService,
-} from "./capability.ts";
-export { composePlugins } from "./compose.ts";
-export type {
-  PluginApp,
-  PluginManifestCapability,
-  PluginManifestEntry,
-} from "./compose.ts";
 export {
-  assertPluginGraph,
-  inspectPluginGraph,
-  PluginGraphError,
-} from "./graph.ts";
-export type { PluginGraphIssue } from "./graph.ts";
-export { definePlugin } from "./plugin.ts";
+  assertProtocolGraph,
+  defineProtocolSet,
+  inspectProtocolGraph,
+  ProtocolGraphError,
+} from "./protocol-graph.ts";
 export type {
-  AnyPlugin,
-  CapabilityServices,
-  Plugin,
-  PluginContext,
-  PluginProvisions,
-  PluginRequirements,
-} from "./plugin.ts";
+  ProtocolGraphConstraint,
+  ProtocolGraphIssue,
+  ProtocolGraphNode,
+} from "./protocol-graph.ts";
 export {
   defineOperation,
   definePluginProtocol,
@@ -43,4 +26,6 @@ export type {
   OperationResult,
   OperationReturn,
   PluginProtocol,
+  PluginRequirements,
+  ProtocolRequirements,
 } from "./operations.ts";
diff --git a/packages/decentralized-convex-plugin/src/operations.test.ts b/packages/decentralized-convex-plugin/src/operations.test.ts
index b88b2fc0..fa04ef1a 100644
--- a/packages/decentralized-convex-plugin/src/operations.test.ts
+++ b/packages/decentralized-convex-plugin/src/operations.test.ts
@@ -4,6 +4,7 @@ import { v } from "convex/values";
 
 import {
   defineOperation,
+  definePluginProtocol,
   operationResponseValidator,
   operationValidator,
 } from "./operations.ts";
@@ -45,3 +46,29 @@ void test("builds discriminated request and response validators", () => {
     ["literal", "literal"],
   );
 });
+
+void test("rejects operation names that cannot be flattened safely", () => {
+  assert.throws(
+    () =>
+      definePluginProtocol({
+        name: "notes",
+        mutations: { create: operations.create },
+        queries: { create: operations.create },
+        requires: {},
+        version: "1",
+      }),
+    /cannot define create as both a query and mutation/,
+  );
+
+  assert.throws(
+    () =>
+      definePluginProtocol({
+        name: "notes",
+        mutations: { create: operations.create },
+        queries: { queries: operations.remove },
+        requires: {},
+        version: "1",
+      }),
+    /cannot use reserved operation name queries/,
+  );
+});
diff --git a/packages/decentralized-convex-plugin/src/operations.ts b/packages/decentralized-convex-plugin/src/operations.ts
index 736a44bf..96685aec 100644
--- a/packages/decentralized-convex-plugin/src/operations.ts
+++ b/packages/decentralized-convex-plugin/src/operations.ts
@@ -16,15 +16,19 @@ export type AnyOperation = Operation<
 
 export type OperationMap = Readonly<Record<string, AnyOperation>>;
 
+export type PluginRequirements = Readonly<Record<string, string>>;
+
 export interface PluginProtocol<
   Name extends string,
   Version extends string,
   Queries extends OperationMap,
   Mutations extends OperationMap,
+  Requirements extends PluginRequirements,
 > {
   readonly name: Name;
   readonly mutations: Mutations;
   readonly queries: Queries;
+  readonly requires: Requirements;
   readonly version: Version;
 }
 
@@ -32,9 +36,13 @@ export type AnyPluginProtocol = PluginProtocol<
   string,
   string,
   OperationMap,
-  OperationMap
+  OperationMap,
+  PluginRequirements
 >;
 
+export type ProtocolRequirements<Value extends AnyPluginProtocol> =
+  Value["requires"];
+
 export type OperationArgs<Value extends AnyOperation> = Infer<Value["args"]>;
 export type OperationResult<Value extends AnyOperation> = Infer<
   Value["returns"]
@@ -73,9 +81,14 @@ export function definePluginProtocol<
   const Version extends string,
   const Queries extends OperationMap,
   const Mutations extends OperationMap,
->(protocol: PluginProtocol<Name, Version, Queries, Mutations>) {
+  const Requirements extends PluginRequirements,
+>(protocol: PluginProtocol<Name, Version, Queries, Mutations, Requirements>) {
   assertOperations(protocol.name, "query", protocol.queries);
   assertOperations(protocol.name, "mutation", protocol.mutations);
+  assertDistinctOperationNames(protocol);
+  if (Object.hasOwn(protocol.requires, protocol.name)) {
+    throw new Error(`Plugin ${protocol.name} cannot require itself.`);
+  }
   return Object.freeze(protocol);
 }
 
@@ -120,6 +133,28 @@ export function operationResponseValidator<
   >;
 }
 
+function assertDistinctOperationNames(protocol: AnyPluginProtocol) {
+  const reserved = ["mutations", "queries"];
+  for (const name of reserved) {
+    if (
+      Object.hasOwn(protocol.queries, name) ||
+      Object.hasOwn(protocol.mutations, name)
+    ) {
+      throw new Error(
+        `Plugin ${protocol.name} cannot use reserved operation name ${name}.`,
+      );
+    }
+  }
+
+  for (const name of Object.keys(protocol.queries)) {
+    if (Object.hasOwn(protocol.mutations, name)) {
+      throw new Error(
+        `Plugin ${protocol.name} cannot define ${name} as both a query and mutation.`,
+      );
+    }
+  }
+}
+
 function assertOperations(
   pluginName: string,
   kind: "mutation" | "query",
diff --git a/packages/decentralized-convex-plugin/src/plugin.test.ts b/packages/decentralized-convex-plugin/src/plugin.test.ts
deleted file mode 100644
index 47ce4b76..00000000
--- a/packages/decentralized-convex-plugin/src/plugin.test.ts
+++ /dev/null
@@ -1,270 +0,0 @@
-import assert from "node:assert/strict";
-import test from "node:test";
-
-import {
-  composePlugins,
-  defineCapability,
-  definePlugin,
-  inspectPluginGraph,
-  PluginGraphError,
-} from "./index.ts";
-
-interface AccountProfile {
-  readonly address: string;
-  readonly avatarUrl: string;
-  readonly displayName: string;
-}
-
-interface AccountsService {
-  getProfile(address: string): AccountProfile;
-  resolveProfile(
-    address: string,
-    override?: Partial<Pick<AccountProfile, "avatarUrl" | "displayName">>,
-  ): AccountProfile;
-}
-
-interface Message {
-  readonly author: AccountProfile;
-  readonly body: string;
-}
-
-interface MessagingService {
-  createMessage(input: {
-    readonly author: string;
-    readonly body: string;
-    readonly profile?: Partial<
-      Pick<AccountProfile, "avatarUrl" | "displayName">
-    >;
-  }): Message;
-}
-
-interface GifMessagingService {
-  createGifMessage(input: {
-    readonly author: string;
-    readonly gifUrl: string;
-  }): Message;
-}
-
-interface ProductProfilesService {
-  getProfile(address: string): AccountProfile;
-}
-
-const Accounts = defineCapability<AccountsService>()({
-  id: "org.decentralized-convex.accounts",
-  version: "1",
-});
-
-const Messaging = defineCapability<MessagingService>()({
-  id: "org.decentralized-convex.messaging",
-  version: "1",
-});
-
-const GifMessaging = defineCapability<GifMessagingService>()({
-  id: "org.decentralized-convex.messaging.gifs",
-  version: "1",
-});
-
-const VeraProfiles = defineCapability<ProductProfilesService>()({
-  id: "chat.vera.profiles",
-  version: "1",
-});
-
-const accountProfiles = new Map<string, AccountProfile>([
-  [
-    "shawn@rogers.dev",
-    {
-      address: "shawn@rogers.dev",
-      avatarUrl: "https://rogers.dev/shawn.png",
-      displayName: "Shawn Rogers",
-    },
-  ],
-]);
-
-function getAccountProfile(address: string) {
-  const profile = accountProfiles.get(address);
-  if (!profile) {
-    throw new Error(`Unknown account: ${address}`);
-  }
-  return profile;
-}
-
-const accountsService: AccountsService = {
-  getProfile: getAccountProfile,
-  resolveProfile: (address, override) => ({
-    ...getAccountProfile(address),
-    ...override,
-  }),
-};
-
-const accountsPlugin = definePlugin({
-  name: "accounts",
-  provides: [Accounts],
-  requires: [],
-  setup: () => [accountsService],
-});
-
-const messagingPlugin = definePlugin({
-  name: "messaging",
-  provides: [Messaging],
-  requires: [Accounts],
-  setup: ({ get }) => {
-    const accounts = get(Accounts);
-    return [
-      {
-        createMessage: ({ author, body, profile }) => ({
-          author: accounts.resolveProfile(author, profile),
-          body,
-        }),
-      },
-    ];
-  },
-});
-
-const gifMessagingPlugin = definePlugin({
-  name: "messaging-gifs",
-  provides: [GifMessaging],
-  requires: [Messaging],
-  setup: ({ get }) => {
-    const messaging = get(Messaging);
-    return [
-      {
-        createGifMessage: ({ author, gifUrl }) =>
-          messaging.createMessage({ author, body: `[gif](${gifUrl})` }),
-      },
-    ];
-  },
-});
-
-const veraProfilesPlugin = definePlugin({
-  name: "vera-profiles",
-  provides: [VeraProfiles],
-  requires: [Accounts],
-  setup: ({ get }) => {
-    const accounts = get(Accounts);
-    return [
-      {
-        getProfile: (address) =>
-          accounts.resolveProfile(address, { displayName: "Shawn on Vera" }),
-      },
-    ];
-  },
-});
-
-void test("resolves plugins by dependency and supports profile overrides", () => {
-  const app = composePlugins(
-    gifMessagingPlugin,
-    veraProfilesPlugin,
-    messagingPlugin,
-    accountsPlugin,
-  );
-  const messaging = app.get(Messaging);
-  const gifs = app.get(GifMessaging);
-  const veraProfiles = app.get(VeraProfiles);
-
-  assert.deepEqual(
-    messaging.createMessage({
-      author: "shawn@rogers.dev",
-      body: "hello",
-      profile: veraProfiles.getProfile("shawn@rogers.dev"),
-    }),
-    {
-      author: {
-        address: "shawn@rogers.dev",
-        avatarUrl: "https://rogers.dev/shawn.png",
-        displayName: "Shawn on Vera",
-      },
-      body: "hello",
-    },
-  );
-  assert.equal(
-    gifs.createGifMessage({
-      author: "shawn@rogers.dev",
-      gifUrl: "https://media.example/wave.gif",
-    }).body,
-    "[gif](https://media.example/wave.gif)",
-  );
-  assert.deepEqual(
-    app.manifest().map(({ name }) => name),
-    ["accounts", "messaging", "messaging-gifs", "vera-profiles"],
-  );
-});
-
-void test("reports missing and incompatible dependencies", () => {
-  const AccountsV2 = defineCapability<AccountsService>()({
-    id: "org.decentralized-convex.accounts",
-    version: "2",
-  });
-  const accountsV2Plugin = definePlugin({
-    name: "accounts-v2",
-    provides: [AccountsV2],
-    requires: [],
-    setup: () => [accountsService],
-  });
-
-  assert.deepEqual(inspectPluginGraph([messagingPlugin]), [
-    {
-      capabilityId: "org.decentralized-convex.accounts",
-      code: "missing-provider",
-      plugin: "messaging",
-      requiredVersion: "1",
-    },
-  ]);
-  assert.deepEqual(inspectPluginGraph([accountsV2Plugin, messagingPlugin]), [
-    {
-      capabilityId: "org.decentralized-convex.accounts",
-      code: "incompatible-version",
-      plugin: "messaging",
-      providedVersions: ["2"],
-      requiredVersion: "1",
-    },
-  ]);
-});
-
-void test("reports duplicate providers and dependency cycles", () => {
-  const alternativeAccountsPlugin = definePlugin({
-    name: "alternative-accounts",
-    provides: [Accounts],
-    requires: [],
-    setup: () => [accountsService],
-  });
-  const CapabilityA = defineCapability<{ readonly value: "a" }>()({
-    id: "example.a",
-    version: "1",
-  });
-  const CapabilityB = defineCapability<{ readonly value: "b" }>()({
-    id: "example.b",
-    version: "1",
-  });
-  const pluginA = definePlugin({
-    name: "a",
-    provides: [CapabilityA],
-    requires: [CapabilityB],
-    setup: () => [{ value: "a" }],
-  });
-  const pluginB = definePlugin({
-    name: "b",
-    provides: [CapabilityB],
-    requires: [CapabilityA],
-    setup: () => [{ value: "b" }],
-  });
-
-  assert.deepEqual(
-    inspectPluginGraph([accountsPlugin, alternativeAccountsPlugin]),
-    [
-      {
-        capabilityId: "org.decentralized-convex.accounts",
-        code: "duplicate-provider",
-        plugins: ["accounts", "alternative-accounts"],
-      },
-    ],
-  );
-  assert.deepEqual(inspectPluginGraph([pluginA, pluginB]), [
-    { code: "dependency-cycle", plugins: ["a", "b", "a"] },
-  ]);
-  assert.throws(
-    () => composePlugins(pluginA, pluginB),
-    (error: unknown) =>
-      error instanceof PluginGraphError &&
-      error.issues[0]?.code === "dependency-cycle",
-  );
-});
diff --git a/packages/decentralized-convex-plugin/src/plugin.ts b/packages/decentralized-convex-plugin/src/plugin.ts
deleted file mode 100644
index 698007ed..00000000
--- a/packages/decentralized-convex-plugin/src/plugin.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import type { AnyCapability, CapabilityService } from "./capability.ts";
-
-export interface PluginContext<Requirements extends readonly AnyCapability[]> {
-  readonly get: <Capability extends Requirements[number]>(
-    capability: Capability,
-  ) => CapabilityService<Capability>;
-}
-
-export type CapabilityServices<Capabilities extends readonly AnyCapability[]> =
-  {
-    readonly [Index in keyof Capabilities]: Capabilities[Index] extends AnyCapability
-      ? CapabilityService<Capabilities[Index]>
-      : never;
-  };
-
-export interface Plugin<
-  Name extends string,
-  Requirements extends readonly AnyCapability[],
-  Provisions extends readonly AnyCapability[],
-> {
-  readonly name: Name;
-  readonly provides: readonly [...Provisions];
-  readonly requires: readonly [...Requirements];
-  setup(context: PluginContext<Requirements>): CapabilityServices<Provisions>;
-}
-
-export type AnyPlugin = Plugin<
-  string,
-  readonly AnyCapability[],
-  readonly AnyCapability[]
->;
-
-export type PluginRequirements<Value extends AnyPlugin> =
-  Value extends Plugin<string, infer Requirements, readonly AnyCapability[]>
-    ? Requirements[number]
-    : never;
-
-export type PluginProvisions<Value extends AnyPlugin> =
-  Value extends Plugin<string, readonly AnyCapability[], infer Provisions>
-    ? Provisions[number]
-    : never;
-
-export function definePlugin<
-  const Name extends string,
-  const Requirements extends readonly AnyCapability[],
-  const Provisions extends readonly AnyCapability[],
->({
-  name,
-  provides,
-  requires,
-  setup,
-}: {
-  readonly name: Name;
-  readonly provides: readonly [...Provisions];
-  readonly requires: readonly [...Requirements];
-  readonly setup: (
-    context: PluginContext<Requirements>,
-  ) => CapabilityServices<Provisions>;
-}): Plugin<Name, Requirements, Provisions> {
-  return Object.freeze({
-    name,
-    provides,
-    requires,
-    setup,
-  });
-}
diff --git a/packages/decentralized-convex-plugin/src/plugin.type-test.ts b/packages/decentralized-convex-plugin/src/plugin.type-test.ts
deleted file mode 100644
index fde745b7..00000000
--- a/packages/decentralized-convex-plugin/src/plugin.type-test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { composePlugins, defineCapability, definePlugin } from "./index.ts";
-
-interface AccountsService {
-  readonly kind: "accounts";
-}
-
-interface MessagingService {
-  readonly kind: "messaging";
-}
-
-const AccountsV1 = defineCapability<AccountsService>()({
-  id: "accounts",
-  version: "1",
-});
-const AccountsV2 = defineCapability<AccountsService>()({
-  id: "accounts",
-  version: "2",
-});
-const Messaging = defineCapability<MessagingService>()({
-  id: "messaging",
-  version: "1",
-});
-
-const accountsV1Plugin = definePlugin({
-  name: "accounts-v1",
-  provides: [AccountsV1],
-  requires: [],
-  setup: () => [{ kind: "accounts" }],
-});
-const accountsV2Plugin = definePlugin({
-  name: "accounts-v2",
-  provides: [AccountsV2],
-  requires: [],
-  setup: () => [{ kind: "accounts" }],
-});
-const alternativeAccountsV1Plugin = definePlugin({
-  name: "alternative-accounts-v1",
-  provides: [AccountsV1],
-  requires: [],
-  setup: () => [{ kind: "accounts" }],
-});
-const messagingPlugin = definePlugin({
-  name: "messaging",
-  provides: [Messaging],
-  requires: [AccountsV1],
-  setup: ({ get }) => {
-    get(AccountsV1);
-    return [{ kind: "messaging" }];
-  },
-});
-
-const app = composePlugins(messagingPlugin, accountsV1Plugin);
-const accounts: AccountsService = app.get(AccountsV1);
-const messaging: MessagingService = app.get(Messaging);
-void accounts;
-void messaging;
-
-// @ts-expect-error -- the messaging dependency is absent.
-composePlugins(messagingPlugin);
-
-// @ts-expect-error -- accounts@2 does not satisfy the accounts@1 requirement.
-composePlugins(accountsV2Plugin, messagingPlugin);
-
-// @ts-expect-error -- only one plugin may provide a capability ID.
-composePlugins(accountsV1Plugin, alternativeAccountsV1Plugin);
-
-// @ts-expect-error -- the application did not install accounts@2.
-app.get(AccountsV2);
diff --git a/packages/decentralized-convex-plugin/src/protocol-graph.test.ts b/packages/decentralized-convex-plugin/src/protocol-graph.test.ts
new file mode 100644
index 00000000..af687d43
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/protocol-graph.test.ts
@@ -0,0 +1,81 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { v } from "convex/values";
+
+import {
+  defineOperation,
+  definePluginProtocol,
+  defineProtocolSet,
+  inspectProtocolGraph,
+  ProtocolGraphError,
+} from "./index.ts";
+
+function protocol<const Name extends string, const Version extends string>(
+  name: Name,
+  version: Version,
+  requires: Readonly<Record<string, string>> = {},
+) {
+  return definePluginProtocol({
+    name,
+    mutations: {
+      write: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    queries: {
+      read: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    requires,
+    version,
+  });
+}
+
+void test("accepts a valid protocol set with explicit dependencies", () => {
+  const accounts = protocol("accounts", "1");
+  const messages = protocol("messages", "1", { accounts: "1" });
+  const reactions = protocol("reactions", "1", { messages: "1" });
+
+  assert.deepEqual(
+    defineProtocolSet(reactions, messages, accounts).map(({ name }) => name),
+    ["reactions", "messages", "accounts"],
+  );
+  assert.deepEqual(inspectProtocolGraph([reactions, messages, accounts]), []);
+});
+
+void test("reports missing and incompatible plugin versions", () => {
+  const accountsV2 = protocol("accounts", "2");
+  const messages = protocol("messages", "1", { accounts: "1" });
+
+  assert.deepEqual(inspectProtocolGraph([messages]), [
+    {
+      code: "missing-plugin",
+      plugin: "messages",
+      requiredPlugin: "accounts",
+      requiredVersion: "1",
+    },
+  ]);
+  assert.deepEqual(inspectProtocolGraph([messages, accountsV2]), [
+    {
+      code: "incompatible-version",
+      plugin: "messages",
+      providedVersion: "2",
+      requiredPlugin: "accounts",
+      requiredVersion: "1",
+    },
+  ]);
+});
+
+void test("reports duplicate names and dependency cycles", () => {
+  const duplicateA = protocol("duplicate", "1");
+  const duplicateB = protocol("duplicate", "1");
+  const first = protocol("first", "1", { second: "1" });
+  const second = protocol("second", "1", { first: "1" });
+
+  assert.deepEqual(inspectProtocolGraph([duplicateA, duplicateB]), [
+    { code: "duplicate-plugin-name", name: "duplicate" },
+  ]);
+  assert.throws(
+    () => defineProtocolSet(first, second),
+    (error: unknown) =>
+      error instanceof ProtocolGraphError &&
+      error.issues[0]?.code === "dependency-cycle",
+  );
+});
diff --git a/packages/decentralized-convex-plugin/src/protocol-graph.ts b/packages/decentralized-convex-plugin/src/protocol-graph.ts
new file mode 100644
index 00000000..86cc9baf
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/protocol-graph.ts
@@ -0,0 +1,252 @@
+export interface ProtocolGraphNode {
+  readonly name: string;
+  readonly requires: Readonly<Record<string, string>>;
+  readonly version: string;
+}
+
+type RequirementEntries<Protocol extends ProtocolGraphNode> = {
+  readonly [Name in keyof Protocol["requires"] & string]: {
+    readonly name: Name;
+    readonly plugin: Protocol["name"];
+    readonly version: Protocol["requires"][Name];
+  };
+}[keyof Protocol["requires"] & string];
+
+type RequirementsFromUnion<Protocol extends ProtocolGraphNode> =
+  Protocol extends ProtocolGraphNode ? RequirementEntries<Protocol> : never;
+
+type AllRequirements<Protocols extends readonly ProtocolGraphNode[]> =
+  RequirementsFromUnion<Protocols[number]>;
+
+type MatchingProtocolFromUnion<
+  Protocol extends ProtocolGraphNode,
+  Requirement extends { readonly name: string; readonly version: string },
+> = Protocol extends ProtocolGraphNode
+  ? Protocol["name"] extends Requirement["name"]
+    ? Protocol["version"] extends Requirement["version"]
+      ? Protocol
+      : never
+    : never
+  : never;
+
+type MatchingProtocol<
+  Requirement extends { readonly name: string; readonly version: string },
+  Protocols extends readonly ProtocolGraphNode[],
+> = MatchingProtocolFromUnion<Protocols[number], Requirement>;
+
+type SameNameProtocolFromUnion<
+  Protocol extends ProtocolGraphNode,
+  Requirement extends { readonly name: string },
+> = Protocol extends ProtocolGraphNode
+  ? Protocol["name"] extends Requirement["name"]
+    ? Protocol
+    : never
+  : never;
+
+type SameNameProtocol<
+  Requirement extends { readonly name: string },
+  Protocols extends readonly ProtocolGraphNode[],
+> = SameNameProtocolFromUnion<Protocols[number], Requirement>;
+
+type MissingRequirements<Protocols extends readonly ProtocolGraphNode[]> =
+  AllRequirements<Protocols> extends infer Requirement extends {
+    readonly name: string;
+    readonly plugin: string;
+    readonly version: string;
+  }
+    ? [MatchingProtocol<Requirement, Protocols>] extends [never]
+      ? [SameNameProtocol<Requirement, Protocols>] extends [never]
+        ? `${Requirement["plugin"]} requires ${Requirement["name"]}@${Requirement["version"]}`
+        : never
+      : never
+    : never;
+
+type IncompatibleRequirements<Protocols extends readonly ProtocolGraphNode[]> =
+  AllRequirements<Protocols> extends infer Requirement extends {
+    readonly name: string;
+    readonly plugin: string;
+    readonly version: string;
+  }
+    ? [MatchingProtocol<Requirement, Protocols>] extends [never]
+      ? [SameNameProtocol<Requirement, Protocols>] extends [never]
+        ? never
+        : `${Requirement["plugin"]} requires ${Requirement["name"]}@${Requirement["version"]}`
+      : never
+    : never;
+
+type DuplicateProtocolNames<
+  Protocols extends readonly ProtocolGraphNode[],
+  Seen extends string = never,
+> = Protocols extends readonly [
+  infer Head extends ProtocolGraphNode,
+  ...infer Tail extends readonly ProtocolGraphNode[],
+]
+  ? Head["name"] extends Seen
+    ? Head["name"] | DuplicateProtocolNames<Tail, Seen>
+    : DuplicateProtocolNames<Tail, Seen | Head["name"]>
+  : never;
+
+export type ProtocolGraphConstraint<
+  Protocols extends readonly ProtocolGraphNode[],
+> = Protocols &
+  ([MissingRequirements<Protocols>] extends [never]
+    ? unknown
+    : {
+        readonly __missingPluginRequirements: MissingRequirements<Protocols>;
+      }) &
+  ([IncompatibleRequirements<Protocols>] extends [never]
+    ? unknown
+    : {
+        readonly __incompatiblePluginRequirements: IncompatibleRequirements<Protocols>;
+      }) &
+  ([DuplicateProtocolNames<Protocols>] extends [never]
+    ? unknown
+    : {
+        readonly __duplicatePluginNames: DuplicateProtocolNames<Protocols>;
+      });
+
+export type ProtocolGraphIssue =
+  | {
+      readonly code: "dependency-cycle";
+      readonly plugins: readonly string[];
+    }
+  | {
+      readonly code: "duplicate-plugin-name";
+      readonly name: string;
+    }
+  | {
+      readonly code: "incompatible-version";
+      readonly plugin: string;
+      readonly providedVersion: string;
+      readonly requiredPlugin: string;
+      readonly requiredVersion: string;
+    }
+  | {
+      readonly code: "missing-plugin";
+      readonly plugin: string;
+      readonly requiredPlugin: string;
+      readonly requiredVersion: string;
+    };
+
+export class ProtocolGraphError extends Error {
+  readonly issues: readonly ProtocolGraphIssue[];
+
+  constructor(issues: readonly ProtocolGraphIssue[]) {
+    super(formatIssues(issues));
+    this.name = "ProtocolGraphError";
+    this.issues = issues;
+  }
+}
+
+export function defineProtocolSet<
+  const Protocols extends readonly ProtocolGraphNode[],
+>(...protocols: ProtocolGraphConstraint<Protocols>): Protocols {
+  assertProtocolGraph(protocols);
+  Object.freeze(protocols);
+  return protocols;
+}
+
+export function inspectProtocolGraph(
+  protocols: readonly ProtocolGraphNode[],
+): readonly ProtocolGraphIssue[] {
+  return analyze(protocols).issues;
+}
+
+export function assertProtocolGraph<
+  const Protocols extends readonly ProtocolGraphNode[],
+>(protocols: Protocols): readonly Protocols[number][] {
+  const analysis = analyze(protocols);
+  if (analysis.issues.length > 0) {
+    throw new ProtocolGraphError(analysis.issues);
+  }
+  return analysis.order;
+}
+
+function analyze(protocols: readonly ProtocolGraphNode[]) {
+  const issues: ProtocolGraphIssue[] = [];
+  const byName = new Map<string, ProtocolGraphNode>();
+  for (const protocol of protocols) {
+    if (byName.has(protocol.name)) {
+      issues.push({ code: "duplicate-plugin-name", name: protocol.name });
+    } else {
+      byName.set(protocol.name, protocol);
+    }
+  }
+
+  const dependencies = new Map<ProtocolGraphNode, ProtocolGraphNode[]>();
+  for (const protocol of protocols) {
+    const resolved: ProtocolGraphNode[] = [];
+    for (const [requiredPlugin, requiredVersion] of Object.entries(
+      protocol.requires,
+    )) {
+      const dependency = byName.get(requiredPlugin);
+      if (dependency === undefined) {
+        issues.push({
+          code: "missing-plugin",
+          plugin: protocol.name,
+          requiredPlugin,
+          requiredVersion,
+        });
+      } else if (dependency.version !== requiredVersion) {
+        issues.push({
+          code: "incompatible-version",
+          plugin: protocol.name,
+          providedVersion: dependency.version,
+          requiredPlugin,
+          requiredVersion,
+        });
+      } else {
+        resolved.push(dependency);
+      }
+    }
+    dependencies.set(protocol, resolved);
+  }
+
+  const order: ProtocolGraphNode[] = [];
+  const complete = new Set<ProtocolGraphNode>();
+  const visiting = new Set<ProtocolGraphNode>();
+  const stack: ProtocolGraphNode[] = [];
+  const reportedCycles = new Set<string>();
+
+  function visit(protocol: ProtocolGraphNode) {
+    if (complete.has(protocol)) return;
+    if (visiting.has(protocol)) {
+      const start = stack.indexOf(protocol);
+      const cycle = [...stack.slice(start), protocol].map(({ name }) => name);
+      const key = [...new Set(cycle)].sort().join("|");
+      if (!reportedCycles.has(key)) {
+        issues.push({ code: "dependency-cycle", plugins: cycle });
+        reportedCycles.add(key);
+      }
+      return;
+    }
+
+    visiting.add(protocol);
+    stack.push(protocol);
+    for (const dependency of dependencies.get(protocol) ?? [])
+      visit(dependency);
+    stack.pop();
+    visiting.delete(protocol);
+    complete.add(protocol);
+    order.push(protocol);
+  }
+
+  for (const protocol of protocols) visit(protocol);
+  return { issues, order };
+}
+
+function formatIssues(issues: readonly ProtocolGraphIssue[]) {
+  const details = issues.map((issue) => {
+    switch (issue.code) {
+      case "dependency-cycle":
+        return `dependency cycle: ${issue.plugins.join(" -> ")}`;
+      case "duplicate-plugin-name":
+        return `duplicate plugin name: ${issue.name}`;
+      case "incompatible-version":
+        return `${issue.plugin} requires ${issue.requiredPlugin}@${issue.requiredVersion}, installed: ${issue.providedVersion}`;
+      case "missing-plugin":
+        return `${issue.plugin} requires missing ${issue.requiredPlugin}@${issue.requiredVersion}`;
+    }
+  });
+  return `Invalid plugin graph:\n- ${details.join("\n- ")}`;
+}
diff --git a/packages/decentralized-convex-plugin/src/protocol-graph.type-test.ts b/packages/decentralized-convex-plugin/src/protocol-graph.type-test.ts
new file mode 100644
index 00000000..77843aae
--- /dev/null
+++ b/packages/decentralized-convex-plugin/src/protocol-graph.type-test.ts
@@ -0,0 +1,20 @@
+import { defineProtocolSet } from "./index.ts";
+
+const accounts = { name: "accounts", requires: {}, version: "1" } as const;
+const accountsV2 = { name: "accounts", requires: {}, version: "2" } as const;
+const messages = {
+  name: "messages",
+  requires: { accounts: "1" },
+  version: "1",
+} as const;
+
+defineProtocolSet(accounts, messages);
+
+// @ts-expect-error -- messages explicitly requires accounts@1.
+defineProtocolSet(messages);
+
+// @ts-expect-error -- accounts@2 does not satisfy the accounts@1 requirement.
+defineProtocolSet(accountsV2, messages);
+
+// @ts-expect-error -- a deployment cannot install the same plugin twice.
+defineProtocolSet(accounts, accounts);
diff --git a/packages/decentralized-convex-server/README.md b/packages/decentralized-convex-server/README.md
new file mode 100644
index 00000000..28bd2c60
--- /dev/null
+++ b/packages/decentralized-convex-server/README.md
@@ -0,0 +1,50 @@
+# `@decentralized-convex/server`
+
+Server helpers for installing and dispatching decentralized-convex plugins.
+
+## Install a PDS
+
+```ts
+import accounts from "@decentralized-convex/accounts/convex.config";
+import messages from "@decentralized-convex/messages/convex.config";
+import { definePdsApp } from "@decentralized-convex/server";
+
+export default definePdsApp({
+  components: [betterAuth],
+  plugins: [accounts, messages],
+});
+```
+
+Each plugin's default Component export carries its protocol in the TypeScript
+type. `definePdsApp` checks the complete tuple for missing, incompatible, or
+duplicate plugins without requiring a second protocol import. `components`
+accepts normal Convex Components or `{ component, options }` entries for custom
+install names and HTTP prefixes. `app: { httpPrefix }` configures the root app.
+
+Plugin packages apply that type internally while preserving Convex's required
+single default export:
+
+```ts
+export default definePdsPluginComponent(
+  defineComponent(messagesProtocol.name),
+  messagesProtocol,
+);
+```
+
+## Expose the data plane
+
+```ts
+export const { dispatchMutation, dispatchQuery } = definePdsRouter({
+  components,
+  mutation,
+  query,
+});
+```
+
+This is the stable `pds:dispatchMutation` / `pds:dispatchQuery` pair. The router
+authenticates once, selects the installed plugin, and crosses one Component
+boundary. `defineComponentDispatchers` performs exact operation validation and
+invokes the plugin handler.
+
+`protocolCapabilities(...)` derives discovery-manifest capability entries from
+the same protocol definitions rather than duplicating names and versions.
diff --git a/packages/decentralized-convex-server/src/app.test.ts b/packages/decentralized-convex-server/src/app.test.ts
new file mode 100644
index 00000000..30589d8d
--- /dev/null
+++ b/packages/decentralized-convex-server/src/app.test.ts
@@ -0,0 +1,55 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { defineComponent } from "convex/server";
+import { v } from "convex/values";
+
+import {
+  definePdsApp,
+  definePdsPluginComponent,
+  protocolsFromPdsApp,
+} from "./app.ts";
+
+void test("a typed PDS plugin remains the original Convex Component", () => {
+  const component = defineComponent("notes");
+  const protocol = definePluginProtocol({
+    name: "notes",
+    mutations: {
+      create: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    queries: {
+      list: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    requires: {},
+    version: "1",
+  });
+
+  const plugin = definePdsPluginComponent(component, protocol);
+
+  assert.equal(plugin, component);
+  assert.deepEqual(Object.keys(plugin), Object.keys(component));
+});
+
+void test("derives client protocols from the same local app declaration", () => {
+  const accountsProtocol = definePluginProtocol({
+    name: "accounts",
+    mutations: {
+      write: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    queries: {
+      read: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    requires: {},
+    version: "1",
+  });
+  const accounts = definePdsPluginComponent(
+    defineComponent("accounts"),
+    accountsProtocol,
+  );
+  const app = definePdsApp({ plugins: [accounts] });
+
+  assert.deepEqual(protocolsFromPdsApp(app), [accountsProtocol]);
+});
diff --git a/packages/decentralized-convex-server/src/app.ts b/packages/decentralized-convex-server/src/app.ts
new file mode 100644
index 00000000..1941414c
--- /dev/null
+++ b/packages/decentralized-convex-server/src/app.ts
@@ -0,0 +1,160 @@
+import type {
+  AnyPluginProtocol,
+  ProtocolGraphConstraint,
+} from "@decentralized-convex/plugin";
+import type { ComponentDefinition } from "convex/server";
+import { defineProtocolSet } from "@decentralized-convex/plugin";
+import { defineApp } from "convex/server";
+
+type AppDefinition = ReturnType<typeof defineApp>;
+
+declare const pdsPluginProtocol: unique symbol;
+declare const pdsAppPlugins: unique symbol;
+
+const localComponentProtocols = new WeakMap<object, AnyPluginProtocol>();
+const localAppProtocols = new WeakMap<object, readonly AnyPluginProtocol[]>();
+
+/**
+ * A normal Convex Component whose TypeScript type carries its PDS protocol.
+ * The protocol marker is type-only because Convex replaces imported Component
+ * definitions with its own runtime references while evaluating convex.config.
+ */
+export type PdsPluginComponent<
+  Protocol extends AnyPluginProtocol,
+  Definition extends ComponentDefinition = ComponentDefinition,
+> = Definition & {
+  readonly [pdsPluginProtocol]: Protocol;
+};
+
+export type AnyPdsPluginComponent = PdsPluginComponent<AnyPluginProtocol>;
+
+export type PluginProtocolOf<Component> =
+  Component extends PdsPluginComponent<infer Protocol> ? Protocol : never;
+
+export type PluginProtocolsOf<
+  Components extends readonly AnyPdsPluginComponent[],
+> = {
+  readonly [Index in keyof Components]: PluginProtocolOf<Components[Index]>;
+};
+
+type PdsPluginGraphDiagnostics<
+  Components extends readonly AnyPdsPluginComponent[],
+> = Omit<
+  ProtocolGraphConstraint<PluginProtocolsOf<Components>>,
+  keyof PluginProtocolsOf<Components>
+>;
+
+export type PdsAppDefinition<Plugins extends readonly AnyPdsPluginComponent[]> =
+  AppDefinition & {
+    readonly [pdsAppPlugins]: Plugins;
+  };
+
+export type PdsPluginsOf<App> =
+  App extends PdsAppDefinition<infer Plugins> ? Plugins : never;
+
+export type PdsProtocolsOf<App> = PluginProtocolsOf<PdsPluginsOf<App>>;
+
+export interface ComponentInstall {
+  readonly component: ComponentDefinition;
+  readonly options?: {
+    readonly httpPrefix?: string;
+    readonly name?: string;
+  };
+}
+
+export interface PdsAppOptions<
+  Plugins extends readonly AnyPdsPluginComponent[],
+> {
+  readonly app?: { readonly httpPrefix?: string };
+  readonly components?: readonly (ComponentDefinition | ComponentInstall)[];
+  readonly plugins: Plugins & PdsPluginGraphDiagnostics<NoInfer<Plugins>>;
+}
+
+/**
+ * Associates a Component with its protocol in the type system without adding
+ * runtime properties that Convex would strip from imported definitions.
+ */
+export function definePdsPluginComponent<
+  const Protocol extends AnyPluginProtocol,
+  Definition extends ComponentDefinition,
+>(
+  component: Definition,
+  protocol: Protocol,
+): PdsPluginComponent<Protocol, Definition> {
+  localComponentProtocols.set(component, protocol);
+  // The marker is intentionally type-only; the runtime value remains the exact Component.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return component as PdsPluginComponent<Protocol, Definition>;
+}
+
+/**
+ * Reads the runtime protocols collected when an application imports its PDS
+ * config outside Convex, for example from its browser-facing API module.
+ */
+export function protocolsFromPdsApp<
+  App extends PdsAppDefinition<readonly AnyPdsPluginComponent[]>,
+>(app: App): PdsProtocolsOf<App> {
+  const protocols = localAppProtocols.get(app);
+  if (protocols === undefined) {
+    throw new Error(
+      "PDS protocols are unavailable. Import the application's local PDS config before creating its client API.",
+    );
+  }
+  // The app and protocol tuple are registered together by definePdsApp.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return protocols as PdsProtocolsOf<App>;
+}
+
+/**
+ * Creates a normal Convex app and installs typed PDS plugin Components.
+ * Plugin dependency compatibility is checked by TypeScript from the protocol
+ * types carried by each Component's default export.
+ */
+export function definePdsApp<
+  const Plugins extends readonly AnyPdsPluginComponent[],
+>({
+  app: appOptions,
+  components = [],
+  plugins,
+}: PdsAppOptions<Plugins>): PdsAppDefinition<Plugins> {
+  const app = defineApp(appOptions);
+  for (const install of components) {
+    if (isComponentInstall(install)) {
+      if (isImportedComponent(install.component)) {
+        app.use(install.component, install.options);
+      }
+    } else if (isImportedComponent(install)) {
+      app.use(install);
+    }
+  }
+
+  const protocols: AnyPluginProtocol[] = [];
+  for (const plugin of plugins) {
+    const protocol = localComponentProtocols.get(plugin);
+    if (protocol !== undefined) protocols.push(protocol);
+    if (isImportedComponent(plugin)) app.use(plugin);
+  }
+  localAppProtocols.set(app, Object.freeze(protocols));
+  // Installed plugin types are retained for downstream generated/client typing only.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return app as PdsAppDefinition<Plugins>;
+}
+
+export function protocolCapabilities<
+  const Protocols extends readonly AnyPluginProtocol[],
+>(...protocols: ProtocolGraphConstraint<Protocols>) {
+  return defineProtocolSet(...protocols).map(({ name, version }) => ({
+    id: name,
+    versions: [version],
+  }));
+}
+
+function isComponentInstall(
+  value: ComponentDefinition | ComponentInstall,
+): value is ComponentInstall {
+  return "component" in value;
+}
+
+function isImportedComponent(component: ComponentDefinition) {
+  return "componentDefinitionPath" in component;
+}
diff --git a/packages/decentralized-convex-server/src/app.type-test.ts b/packages/decentralized-convex-server/src/app.type-test.ts
new file mode 100644
index 00000000..9b52119d
--- /dev/null
+++ b/packages/decentralized-convex-server/src/app.type-test.ts
@@ -0,0 +1,59 @@
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { defineComponent } from "convex/server";
+import { v } from "convex/values";
+
+import type { PdsProtocolsOf } from "./app.ts";
+import { definePdsApp, definePdsPluginComponent } from "./app.ts";
+
+function protocol<
+  const Name extends string,
+  const Version extends string,
+  const Requirements extends Readonly<Record<string, string>>,
+>(name: Name, version: Version, requires: Requirements) {
+  return definePluginProtocol({
+    name,
+    mutations: {
+      write: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    queries: {
+      read: defineOperation({ args: v.object({}), returns: v.null() }),
+    },
+    requires,
+    version,
+  });
+}
+
+const accounts = definePdsPluginComponent(
+  defineComponent("accounts"),
+  protocol("accounts", "1", {}),
+);
+const accountsV2 = definePdsPluginComponent(
+  defineComponent("accounts_v2"),
+  protocol("accounts", "2", {}),
+);
+const messages = definePdsPluginComponent(
+  defineComponent("messages"),
+  protocol("messages", "1", { accounts: "1" }),
+);
+
+const _app = definePdsApp({ plugins: [accounts, messages] });
+
+type InstalledProtocols = PdsProtocolsOf<typeof _app>;
+const installedName: InstalledProtocols[number]["name"] = "messages";
+void installedName;
+
+// @ts-expect-error -- the app type contains only installed plugin protocols.
+const unknownInstalledName: InstalledProtocols[number]["name"] = "unknown";
+void unknownInstalledName;
+
+// @ts-expect-error -- messages requires the accounts plugin.
+definePdsApp({ plugins: [messages] });
+
+// @ts-expect-error -- accounts@2 does not satisfy messages' requirement.
+definePdsApp({ plugins: [accountsV2, messages] });
+
+// @ts-expect-error -- plugin names must be unique within a PDS.
+definePdsApp({ plugins: [accounts, accounts] });
diff --git a/packages/decentralized-convex-server/src/dispatcher.ts b/packages/decentralized-convex-server/src/dispatcher.ts
index c1f621ba..3612fd04 100644
--- a/packages/decentralized-convex-server/src/dispatcher.ts
+++ b/packages/decentralized-convex-server/src/dispatcher.ts
@@ -5,6 +5,7 @@ import type {
   OperationResponse,
   OperationResult,
   PluginProtocol,
+  PluginRequirements,
 } from "@decentralized-convex/plugin";
 import type {
   Auth,
@@ -66,6 +67,7 @@ export function defineComponentDispatchers<
   const Version extends string,
   const Queries extends OperationMap,
   const Mutations extends OperationMap,
+  const Requirements extends PluginRequirements,
 >({
   handlers,
   mutation,
@@ -80,7 +82,13 @@ export function defineComponentDispatchers<
     readonly queries: OperationHandlers<Queries, GenericQueryCtx<DataModel>>;
   };
   readonly mutation: MutationBuilder<DataModel, "public">;
-  readonly protocol: PluginProtocol<Name, Version, Queries, Mutations>;
+  readonly protocol: PluginProtocol<
+    Name,
+    Version,
+    Queries,
+    Mutations,
+    Requirements
+  >;
   readonly query: QueryBuilder<DataModel, "public">;
 }) {
   const queryOperation = operationValidator(protocol.queries);
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
index ce6e1b26..b48035c9 100644
--- a/packages/decentralized-convex-server/src/index.ts
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -1,3 +1,20 @@
+export {
+  definePdsApp,
+  definePdsPluginComponent,
+  protocolsFromPdsApp,
+  protocolCapabilities,
+} from "./app.ts";
+export type {
+  AnyPdsPluginComponent,
+  ComponentInstall,
+  PdsAppDefinition,
+  PdsAppOptions,
+  PdsPluginComponent,
+  PdsPluginsOf,
+  PdsProtocolsOf,
+  PluginProtocolOf,
+  PluginProtocolsOf,
+} from "./app.ts";
 export {
   FEDERATION_DESCRIPTOR_PATH,
   federationDescriptorResponse,
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
new file mode 100644
index 00000000..dc1f0a6f
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -0,0 +1,43 @@
+# `@decentralized-convex/tanstack-query`
+
+A thin adapter for using typed PDS operations with an application's own
+TanStack Query hooks and version:
+
+```ts
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
+
+const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
+
+const sendMessage = useMutation(pdsMutation(pds.messages.send));
+await sendMessage.mutateAsync({ body, conversationId, messageId });
+```
+
+Both helpers return normal TanStack options, so every TanStack override remains
+available:
+
+```ts
+const messages = useQuery({
+  ...pdsQuery(pds.messages.list, { conversationId }),
+  retry: 3,
+  select: (messages) => messages.filter((message) => message.body.length > 0),
+  staleTime: 30_000,
+});
+```
+
+Connect the decentralized transport once when creating an account session:
+
+```ts
+const pdsQueryClient = new PdsQueryClient({
+  client,
+  mutationTarget: home,
+  queryTargets: conversationHomes,
+});
+
+const disconnect = pdsQueryClient.connect(queryClient);
+```
+
+`PdsQueryClient` updates TanStack's cache from live Convex subscriptions. Static
+targets are sufficient for the current prototype; the resolver forms of
+`queryTargets` and `mutationTarget` are the extension point for automatic
+home-first routing.
diff --git a/packages/decentralized-convex-tanstack-query/package.json b/packages/decentralized-convex-tanstack-query/package.json
index 80159739..22b58feb 100644
--- a/packages/decentralized-convex-tanstack-query/package.json
+++ b/packages/decentralized-convex-tanstack-query/package.json
@@ -17,16 +17,17 @@
   "dependencies": {
     "@decentralized-convex/client": "workspace:*",
     "@decentralized-convex/react": "workspace:*",
-    "@tanstack/react-query": "catalog:",
     "convex": "catalog:"
   },
   "peerDependencies": {
+    "@tanstack/react-query": "catalog:",
     "react": "catalog:react19"
   },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",
     "@acme/prettier-config": "workspace:*",
     "@acme/tsconfig": "workspace:*",
+    "@tanstack/react-query": "catalog:",
     "@types/node": "catalog:",
     "@types/react": "catalog:react19",
     "eslint": "catalog:",
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index 251d08c9..e9e3987f 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -1,9 +1,16 @@
-export { federatedPdsQueryOptions, federatedQueryOptions } from "./options.ts";
+export { federatedQueryOptions } from "./options.ts";
+export type { FederatedTanStackQueryOptions } from "./options.ts";
+export {
+  pdsMutation,
+  pdsQuery,
+  PdsQueryClient,
+  usePdsQueryState,
+} from "./pds.ts";
 export type {
-  FederatedPdsTanStackQueryOptions,
-  FederatedTanStackQueryOptions,
-} from "./options.ts";
-export { useFederatedPdsQuery } from "./useFederatedPdsQuery.ts";
-export type { FederatedPdsTanStackQueryResult } from "./useFederatedPdsQuery.ts";
+  PdsMutationTargetResolver,
+  PdsQueryClientOptions,
+  PdsQueryKey,
+  PdsQueryTargetResolver,
+} from "./pds.ts";
 export { useFederatedQuery } from "./useFederatedQuery.ts";
 export type { FederatedTanStackQueryResult } from "./useFederatedQuery.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/options.ts b/packages/decentralized-convex-tanstack-query/src/options.ts
index caec395e..ceeddd8e 100644
--- a/packages/decentralized-convex-tanstack-query/src/options.ts
+++ b/packages/decentralized-convex-tanstack-query/src/options.ts
@@ -1,8 +1,5 @@
 import type {
-  AnyPdsQueryRequest,
-  DefaultCombinedPdsResult,
   DefaultCombinedResult,
-  FederatedPdsQueryOptions,
   FederatedQueryOptions,
   FederationQueryReference,
 } from "@decentralized-convex/client";
@@ -25,20 +22,3 @@ export function federatedQueryOptions<
 ): FederatedTanStackQueryOptions<Query, Combined> {
   return options;
 }
-
-export interface FederatedPdsTanStackQueryOptions<
-  Request extends AnyPdsQueryRequest,
-  Combined = DefaultCombinedPdsResult<Request>,
-> extends FederatedPdsQueryOptions<Request, Combined> {
-  enabled?: boolean;
-  queryKey: QueryKey;
-}
-
-export function federatedPdsQueryOptions<
-  Request extends AnyPdsQueryRequest,
-  Combined = DefaultCombinedPdsResult<Request>,
->(
-  options: FederatedPdsTanStackQueryOptions<Request, Combined>,
-): FederatedPdsTanStackQueryOptions<Request, Combined> {
-  return options;
-}
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
new file mode 100644
index 00000000..0e38fc8a
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -0,0 +1,165 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type {
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+  PdsRequest,
+} from "@decentralized-convex/client";
+import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import {
+  MutationObserver,
+  QueryClient,
+  QueryObserver,
+} from "@tanstack/react-query";
+import { DecentralizedConvexClient } from "@decentralized-convex/client";
+
+import { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
+
+interface Note {
+  body: string;
+  id: string;
+}
+
+function listNotes(args: {
+  owner: string;
+}): PdsRequest<readonly Note[], "query"> {
+  return {
+    operation: { args, type: "list" },
+    plugin: "notes",
+    version: "1",
+  };
+}
+
+function createNote(args: { body: string }): PdsRequest<Note, "mutation"> {
+  return {
+    operation: { args, type: "create" },
+    plugin: "notes",
+    version: "1",
+  };
+}
+
+void test("produces native TanStack query and mutation options", async () => {
+  const connections = new Map<string, MemoryConnection>();
+  const transport = new DecentralizedConvexClient({
+    connectionFactory: (url) => {
+      const connection = new MemoryConnection(url);
+      connections.set(url, connection);
+      return connection;
+    },
+  });
+  const queryClient = new QueryClient();
+  const adapter = new PdsQueryClient({
+    client: transport,
+    mutationTarget: { id: "alice@a.test", url: "https://a.test" },
+    queryTargets: [
+      { id: "alice@a.test", url: "https://a.test" },
+      { id: "bob@b.test", url: "https://b.test" },
+    ],
+  });
+  const disconnect = adapter.connect(queryClient);
+
+  const query = pdsQuery(listNotes, { owner: "alice" });
+  assert.deepEqual(await queryClient.fetchQuery(query), [
+    { body: "https://a.test", id: "alice" },
+    { body: "https://b.test", id: "alice" },
+  ]);
+
+  const observer = new QueryObserver(queryClient, query);
+  const unsubscribe = observer.subscribe(() => undefined);
+  await nextTask();
+  connections.get("https://a.test")?.emit("updated");
+  await nextTask();
+  assert.deepEqual(queryClient.getQueryData(query.queryKey), [
+    { body: "updated", id: "alice" },
+    { body: "https://b.test", id: "alice" },
+  ]);
+
+  const mutation = new MutationObserver(queryClient, pdsMutation(createNote));
+  assert.deepEqual(await mutation.mutate({ body: "hello" }), {
+    body: "hello",
+    id: "https://a.test",
+  });
+
+  unsubscribe();
+  disconnect();
+  await transport.close();
+});
+
+class MemoryConnection implements FederationConnection {
+  readonly #publishers = new Set<(body: string) => void>();
+  readonly #url;
+
+  constructor(url: string) {
+    this.#url = url;
+  }
+
+  close() {
+    return Promise.resolve();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(
+    _mutation: Mutation,
+    args: FunctionArgs<Mutation>,
+  ): Promise<FunctionReturnType<Mutation>> {
+    const body = operationArgs(args).body;
+    const result = { body, id: this.#url };
+    // The fake connection cannot derive a concrete result from an arbitrary reference.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return Promise.resolve(result) as Promise<FunctionReturnType<Mutation>>;
+  }
+
+  query<Query extends FederationQueryReference>(
+    _query: Query,
+    args: FunctionArgs<Query>,
+  ): Promise<FunctionReturnType<Query>> {
+    const owner = operationArgs(args).owner;
+    const result = [{ body: this.#url, id: owner }];
+    // The fake connection cannot derive a concrete result from an arbitrary reference.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return Promise.resolve(result) as Promise<FunctionReturnType<Query>>;
+  }
+
+  subscribe<Query extends FederationQueryReference>(
+    query: Query,
+    args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+  ) {
+    function publish(body: string) {
+      const owner = operationArgs(args).owner;
+      const result = [{ body, id: owner }];
+      // The fake connection cannot derive a concrete result from an arbitrary reference.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      onResult(result as FunctionReturnType<Query>);
+    }
+    this.#publishers.add(publish);
+    publish(this.#url);
+    return () => this.#publishers.delete(publish);
+  }
+
+  emit(body: string) {
+    for (const publish of this.#publishers) publish(body);
+  }
+}
+
+function nextTask() {
+  return new Promise<void>((resolve) => setTimeout(resolve, 0));
+}
+
+function operationArgs(value: unknown): Record<string, string> {
+  if (
+    typeof value === "object" &&
+    value !== null &&
+    "operation" in value &&
+    typeof value.operation === "object" &&
+    value.operation !== null &&
+    "args" in value.operation &&
+    typeof value.operation.args === "object" &&
+    value.operation.args !== null
+  ) {
+    // The test builders above only create string-valued argument records.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return value.operation.args as Record<string, string>;
+  }
+  throw new Error("Expected a PDS operation request");
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
new file mode 100644
index 00000000..a0cdd251
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -0,0 +1,324 @@
+import type {
+  AnyPdsMutationRequest,
+  AnyPdsQueryRequest,
+  DecentralizedConvexClient,
+  DefaultCombinedPdsResult,
+  FederatedQuerySnapshot,
+  FederationTarget,
+  PdsRequest,
+  PdsRequestResult,
+} from "@decentralized-convex/client";
+import type {
+  Query,
+  QueryClient,
+  QueryKey,
+  QueryMeta,
+} from "@tanstack/react-query";
+import { useSyncExternalStore } from "react";
+import {
+  hashKey,
+  mutationOptions,
+  queryOptions,
+  useQueryClient,
+} from "@tanstack/react-query";
+import { groupFederationTargets } from "@decentralized-convex/client";
+
+const PDS_QUERY_META_KEY = "decentralizedConvexPdsQuery";
+const connectedClients = new WeakMap<QueryClient, PdsQueryClient>();
+
+type MaybePromise<Value> = Promise<Value> | Value;
+
+export type PdsQueryTargetResolver = (
+  request: AnyPdsQueryRequest,
+) => MaybePromise<readonly FederationTarget[]>;
+
+export type PdsMutationTargetResolver = (
+  request: AnyPdsMutationRequest,
+) => MaybePromise<FederationTarget>;
+
+export interface PdsQueryClientOptions {
+  client: DecentralizedConvexClient;
+  mutationTarget: FederationTarget | PdsMutationTargetResolver;
+  queryTargets: readonly FederationTarget[] | PdsQueryTargetResolver;
+}
+
+interface ActiveQuery {
+  cancelled: boolean;
+  close?: () => void;
+}
+
+type UnknownSnapshot = FederatedQuerySnapshot<unknown, unknown>;
+
+/**
+ * Connects decentralized Convex transport to an application-owned TanStack
+ * QueryClient. Application queries still use TanStack's own hooks.
+ */
+export class PdsQueryClient {
+  readonly #activeQueries = new Map<string, ActiveQuery>();
+  readonly #client;
+  readonly #connections = new Map<QueryClient, () => void>();
+  readonly #listeners = new Map<string, Set<() => void>>();
+  readonly #mutationTarget;
+  readonly #queryTargets;
+  readonly #snapshots = new Map<string, UnknownSnapshot>();
+
+  constructor(options: PdsQueryClientOptions) {
+    this.#client = options.client;
+    this.#mutationTarget = options.mutationTarget;
+    this.#queryTargets = options.queryTargets;
+  }
+
+  connect(queryClient: QueryClient) {
+    const connected = connectedClients.get(queryClient);
+    if (connected !== undefined && connected !== this) {
+      throw new Error(
+        "This TanStack QueryClient is already connected to another PdsQueryClient",
+      );
+    }
+    if (this.#connections.has(queryClient)) return () => undefined;
+    if (this.#connections.size > 0) {
+      throw new Error(
+        "A PdsQueryClient can connect to only one TanStack QueryClient",
+      );
+    }
+
+    connectedClients.set(queryClient, this);
+    const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
+      if (
+        (event.type === "observerAdded" ||
+          event.type === "observerOptionsUpdated") &&
+        event.query.isActive()
+      ) {
+        // TanStack's cache event intentionally erases each query's generics.
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        this.#startQuery(queryClient, event.query);
+      }
+      if (
+        ((event.type === "observerRemoved" ||
+          event.type === "observerOptionsUpdated") &&
+          !event.query.isActive()) ||
+        event.type === "removed"
+      ) {
+        this.#stopQuery(event.query.queryHash);
+      }
+    });
+    this.#connections.set(queryClient, unsubscribe);
+
+    for (const query of queryClient.getQueryCache().getAll()) {
+      if (query.isActive()) this.#startQuery(queryClient, query);
+    }
+
+    return () => this.disconnect(queryClient);
+  }
+
+  disconnect(queryClient: QueryClient) {
+    const unsubscribe = this.#connections.get(queryClient);
+    if (unsubscribe === undefined) return;
+    unsubscribe();
+    this.#connections.delete(queryClient);
+    if (connectedClients.get(queryClient) === this) {
+      connectedClients.delete(queryClient);
+    }
+    if (this.#connections.size === 0) {
+      for (const queryHash of this.#activeQueries.keys()) {
+        this.#stopQuery(queryHash);
+      }
+    }
+  }
+
+  async query<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    queryKey: QueryKey,
+  ): Promise<DefaultCombinedPdsResult<Request>> {
+    const targets = await this.#resolveQueryTargets(request);
+    const snapshot = await this.#client.pdsQuery({ request, targets });
+    this.#publish(hashKey(queryKey), snapshot);
+    if (snapshot.status === "error") throw allTargetsFailed(snapshot);
+    return snapshot.data;
+  }
+
+  async mutate<Request extends AnyPdsMutationRequest>(
+    request: Request,
+  ): Promise<PdsRequestResult<Request>> {
+    const target =
+      typeof this.#mutationTarget === "function"
+        ? await this.#mutationTarget(request)
+        : this.#mutationTarget;
+    return this.#client.pdsMutation(target, request);
+  }
+
+  getSnapshot<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    queryKey: QueryKey,
+  ): FederatedQuerySnapshot<
+    DefaultCombinedPdsResult<Request>,
+    PdsRequestResult<Request>
+  > {
+    const queryHash = hashKey(queryKey);
+    let snapshot = this.#snapshots.get(queryHash);
+    if (snapshot === undefined) {
+      const targets = Array.isArray(this.#queryTargets)
+        ? groupFederationTargets(this.#queryTargets)
+        : [];
+      snapshot = {
+        data: [],
+        sources: targets.map((target) => ({
+          status: "pending" as const,
+          target,
+        })),
+        status: "pending",
+      };
+      this.#snapshots.set(queryHash, snapshot);
+    }
+
+    // Snapshots originate from the same typed request stored in this query key.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return snapshot as FederatedQuerySnapshot<
+      DefaultCombinedPdsResult<Request>,
+      PdsRequestResult<Request>
+    >;
+  }
+
+  subscribe(queryKey: QueryKey, listener: () => void) {
+    const queryHash = hashKey(queryKey);
+    const listeners = this.#listeners.get(queryHash) ?? new Set<() => void>();
+    listeners.add(listener);
+    this.#listeners.set(queryHash, listeners);
+    return () => {
+      listeners.delete(listener);
+      if (listeners.size === 0) this.#listeners.delete(queryHash);
+    };
+  }
+
+  async #resolveQueryTargets(request: AnyPdsQueryRequest) {
+    return typeof this.#queryTargets === "function"
+      ? await this.#queryTargets(request)
+      : this.#queryTargets;
+  }
+
+  #publish(queryHash: string, snapshot: UnknownSnapshot) {
+    this.#snapshots.set(queryHash, snapshot);
+    for (const listener of this.#listeners.get(queryHash) ?? []) listener();
+  }
+
+  #startQuery(queryClient: QueryClient, query: Query) {
+    const request = pdsRequestFromMeta(query.meta);
+    if (request === undefined || this.#activeQueries.has(query.queryHash)) {
+      return;
+    }
+
+    const active: ActiveQuery = { cancelled: false };
+    this.#activeQueries.set(query.queryHash, active);
+    void this.#resolveQueryTargets(request)
+      .then((targets) => {
+        if (active.cancelled) return;
+        const observer = this.#client.watchPdsQuery({ request, targets });
+        const publish = () => {
+          const snapshot = observer.getSnapshot();
+          this.#publish(hashKey(query.queryKey), snapshot);
+          if (snapshot.status === "success" || snapshot.status === "partial") {
+            queryClient.setQueryData(query.queryKey, snapshot.data);
+          }
+        };
+        const unsubscribe = observer.subscribe(publish);
+        active.close = () => {
+          unsubscribe();
+          observer.close();
+        };
+        publish();
+      })
+      .catch(() => {
+        // The ordinary TanStack query function owns and exposes routing errors.
+      });
+  }
+
+  #stopQuery(queryHash: string) {
+    const active = this.#activeQueries.get(queryHash);
+    if (active === undefined) return;
+    active.cancelled = true;
+    active.close?.();
+    this.#activeQueries.delete(queryHash);
+  }
+}
+
+export type PdsQueryKey<Request extends AnyPdsQueryRequest> = readonly [
+  "decentralized-convex",
+  "pds",
+  "query",
+  Request,
+];
+
+export function pdsQuery<Args, Result>(
+  operation: (args: Args) => PdsRequest<Result, "query">,
+  args: Args,
+) {
+  const request = operation(args);
+  const queryKey: PdsQueryKey<typeof request> = [
+    "decentralized-convex",
+    "pds",
+    "query",
+    request,
+  ];
+  return queryOptions({
+    meta: { [PDS_QUERY_META_KEY]: request },
+    queryFn: ({ client }) =>
+      connectedPdsClient(client).query(request, queryKey),
+    queryKey,
+    staleTime: Infinity,
+  });
+}
+
+export function pdsMutation<Args, Result>(
+  operation: (args: Args) => PdsRequest<Result, "mutation">,
+) {
+  return mutationOptions({
+    mutationFn: (args: Args, { client }) =>
+      connectedPdsClient(client).mutate(operation(args)),
+  });
+}
+
+export function usePdsQueryState<Request extends AnyPdsQueryRequest>(options: {
+  queryKey: PdsQueryKey<Request>;
+}) {
+  const queryClient = useQueryClient();
+  const client = connectedPdsClient(queryClient);
+  const request = options.queryKey[3];
+  return useSyncExternalStore(
+    (listener) => client.subscribe(options.queryKey, listener),
+    () => client.getSnapshot(request, options.queryKey),
+    () => client.getSnapshot(request, options.queryKey),
+  );
+}
+
+function connectedPdsClient(queryClient: QueryClient) {
+  const client = connectedClients.get(queryClient);
+  if (client === undefined) {
+    throw new Error(
+      "Connect a PdsQueryClient to this TanStack QueryClient before using PDS options",
+    );
+  }
+  return client;
+}
+
+function pdsRequestFromMeta(meta: QueryMeta | undefined) {
+  const request = meta?.[PDS_QUERY_META_KEY];
+  if (
+    typeof request !== "object" ||
+    request === null ||
+    !("plugin" in request) ||
+    !("version" in request) ||
+    !("operation" in request)
+  ) {
+    return undefined;
+  }
+  // Only pdsQuery writes this private metadata entry.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return request as AnyPdsQueryRequest;
+}
+
+function allTargetsFailed(snapshot: UnknownSnapshot) {
+  return new AggregateError(
+    snapshot.sources.flatMap((source) => source.error ?? []),
+    "Every PDS query target failed",
+  );
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts b/packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts
deleted file mode 100644
index c5f9f1c1..00000000
--- a/packages/decentralized-convex-tanstack-query/src/useFederatedPdsQuery.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import type {
-  AnyPdsQueryRequest,
-  FederatedQueryStatus,
-  FederationSourceSnapshot,
-  PdsRequestResult,
-} from "@decentralized-convex/client";
-import type { DefaultError, UseQueryResult } from "@tanstack/react-query";
-import { useEffect, useEffectEvent, useState } from "react";
-import { hashKey, useQuery, useQueryClient } from "@tanstack/react-query";
-import { groupFederationTargets } from "@decentralized-convex/client";
-import { useDecentralizedConvex } from "@decentralized-convex/react";
-
-import type { FederatedPdsTanStackQueryOptions } from "./options.ts";
-
-export type FederatedPdsTanStackQueryResult<Data, SourceResult> =
-  UseQueryResult<Data, DefaultError> & {
-    federation: {
-      sources: readonly FederationSourceSnapshot<SourceResult>[];
-      status: FederatedQueryStatus;
-    };
-  };
-
-interface FederationState<SourceResult> {
-  sources: readonly FederationSourceSnapshot<SourceResult>[];
-  status: FederatedQueryStatus;
-}
-
-export function useFederatedPdsQuery<
-  Request extends AnyPdsQueryRequest,
-  Combined,
->(
-  options: FederatedPdsTanStackQueryOptions<Request, Combined>,
-): FederatedPdsTanStackQueryResult<Combined, PdsRequestResult<Request>> {
-  const client = useDecentralizedConvex();
-  const queryClient = useQueryClient();
-  const queryHash = hashKey(options.queryKey);
-  const [federation, setFederation] = useState<
-    FederationState<PdsRequestResult<Request>>
-  >(() => emptyFederation(options));
-  const startObserver = useEffectEvent(() => client.watchPdsQuery(options));
-  const publish = useEffectEvent(
-    (snapshot: ReturnType<ReturnType<typeof startObserver>["getSnapshot"]>) => {
-      setFederation({ sources: snapshot.sources, status: snapshot.status });
-      if (snapshot.status === "success" || snapshot.status === "partial") {
-        queryClient.setQueryData(options.queryKey, snapshot.data);
-      }
-    },
-  );
-
-  const query = useQuery({
-    enabled: options.enabled,
-    queryFn: async () => {
-      const snapshot = await client.pdsQuery(options);
-      if (snapshot.status === "error") {
-        throw new AggregateError(
-          snapshot.sources.flatMap((source) => source.error ?? []),
-          "Every PDS query target failed",
-        );
-      }
-      return snapshot.data;
-    },
-    queryKey: options.queryKey,
-    staleTime: Infinity,
-  });
-
-  useEffect(() => {
-    if (options.enabled === false) return;
-    const observer = startObserver();
-    function publishCurrent() {
-      publish(observer.getSnapshot());
-    }
-    publishCurrent();
-    const unsubscribe = observer.subscribe(publishCurrent);
-    return () => {
-      unsubscribe();
-      observer.close();
-    };
-  }, [options.enabled, queryHash]);
-
-  return {
-    ...query,
-    federation: {
-      sources: federation.sources,
-      status: federation.status,
-    },
-  };
-}
-
-function emptyFederation<Request extends AnyPdsQueryRequest, Combined>(
-  options: FederatedPdsTanStackQueryOptions<Request, Combined>,
-): FederationState<PdsRequestResult<Request>> {
-  const sources = groupFederationTargets(options.targets).map((target) => ({
-    status: "pending" as const,
-    target,
-  }));
-  return {
-    sources,
-    status: sources.length === 0 ? "success" : "pending",
-  };
-}
diff --git a/packages/decentralized-convex-tanstack-query/tsconfig.json b/packages/decentralized-convex-tanstack-query/tsconfig.json
index ea4432e2..7de130bc 100644
--- a/packages/decentralized-convex-tanstack-query/tsconfig.json
+++ b/packages/decentralized-convex-tanstack-query/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "allowImportingTsExtensions": true,
     "jsx": "react-jsx",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"]
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "types": ["node"]
   },
   "include": ["src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 75a05145..4d0bcdb6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -429,9 +429,6 @@ importers:
       '@decentralized-convex/react':
         specifier: workspace:*
         version: link:../decentralized-convex-react
-      '@tanstack/react-query':
-        specifier: 'catalog:'
-        version: 5.101.4(react@19.2.5)
       convex:
         specifier: 'catalog:'
         version: 1.38.0(react@19.2.5)
@@ -445,6 +442,9 @@ importers:
       '@acme/tsconfig':
         specifier: workspace:*
         version: link:../../tooling/typescript
+      '@tanstack/react-query':
+        specifier: 'catalog:'
+        version: 5.101.4(react@19.2.5)
       '@types/node':
         specifier: 'catalog:'
         version: 24.12.2
@@ -475,6 +475,9 @@ importers:
       '@decentralized-convex/address':
         specifier: workspace:*
         version: link:../../packages/decentralized-convex-address
+      '@decentralized-convex/client':
+        specifier: workspace:*
+        version: link:../../packages/decentralized-convex-client
       '@decentralized-convex/messages':
         specifier: workspace:*
         version: link:../../packages/decentralized-convex-messages
diff --git a/services/backend/README.md b/services/backend/README.md
index 393fd6aa..e291a150 100644
--- a/services/backend/README.md
+++ b/services/backend/README.md
@@ -1,13 +1,36 @@
 # Vera backend
 
-This is the thin PDS host used by Vera. It installs reusable Components from the
-workspace packages instead of owning product data in its root database:
+This is the thin PDS host used by Vera. Its complete plugin installation is the
+single declaration in `convex/convex.config.ts`:
 
 ```ts
-app.use(accounts);
-app.use(messages);
+export default definePdsApp({
+  components: [betterAuth],
+  plugins: [accounts, messages],
+});
 ```
 
+Messages explicitly requires Accounts. The app definition fails type-checking
+if that dependency is absent or incompatible. No custom development or deploy
+command is required; this is a normal Convex app definition.
+
+The browser-facing API is derived from that same app declaration:
+
+```ts
+import { definePdsApi } from "@decentralized-convex/client";
+import { protocolsFromPdsApp } from "@decentralized-convex/server";
+
+import app from "./convex/convex.config";
+
+export const protocols = protocolsFromPdsApp(app);
+export const pds = definePdsApi(...protocols);
+```
+
+Applications consume it through `@vera/backend/pds`; adding or removing a
+plugin changes the client API without editing this stable module. The public
+discovery manifest derives its capability list from this same `protocols`
+tuple, so it cannot drift from the installed app.
+
 The root exposes Better Auth plus one generic PDS query and mutation. Message
 schema and behavior live entirely in `@decentralized-convex/messages`; account
 profiles live in `@decentralized-convex/accounts`.
diff --git a/services/backend/convex/_generated/dataModel.d.ts b/services/backend/convex/_generated/dataModel.d.ts
index f97fd194..b3ac5131 100644
--- a/services/backend/convex/_generated/dataModel.d.ts
+++ b/services/backend/convex/_generated/dataModel.d.ts
@@ -11,10 +11,11 @@
 import type {
   DataModelFromSchemaDefinition,
   DocumentByName,
-  TableNamesInDataModel,
   SystemTableNames,
+  TableNamesInDataModel,
 } from "convex/server";
 import type { GenericId } from "convex/values";
+
 import schema from "../schema.js";
 
 /**
diff --git a/services/backend/convex/_generated/server.d.ts b/services/backend/convex/_generated/server.d.ts
index bec05e68..f2c6ad31 100644
--- a/services/backend/convex/_generated/server.d.ts
+++ b/services/backend/convex/_generated/server.d.ts
@@ -10,15 +10,16 @@
 
 import {
   ActionBuilder,
-  HttpActionBuilder,
-  MutationBuilder,
-  QueryBuilder,
   GenericActionCtx,
-  GenericMutationCtx,
-  GenericQueryCtx,
   GenericDatabaseReader,
   GenericDatabaseWriter,
+  GenericMutationCtx,
+  GenericQueryCtx,
+  HttpActionBuilder,
+  MutationBuilder,
+  QueryBuilder,
 } from "convex/server";
+
 import type { DataModel } from "./dataModel.js";
 
 /**
diff --git a/services/backend/convex/convex.config.ts b/services/backend/convex/convex.config.ts
index 6400869d..49b913dd 100644
--- a/services/backend/convex/convex.config.ts
+++ b/services/backend/convex/convex.config.ts
@@ -1,11 +1,9 @@
 import betterAuth from "@convex-dev/better-auth/convex.config";
 import accounts from "@decentralized-convex/accounts/convex.config";
 import messages from "@decentralized-convex/messages/convex.config";
-import { defineApp } from "convex/server";
+import { definePdsApp } from "@decentralized-convex/server";
 
-const app = defineApp();
-app.use(betterAuth);
-app.use(accounts);
-app.use(messages);
-
-export default app;
+export default definePdsApp({
+  components: [betterAuth],
+  plugins: [accounts, messages],
+});
diff --git a/services/backend/convex/http.ts b/services/backend/convex/http.ts
index 62791299..8dc69ec1 100644
--- a/services/backend/convex/http.ts
+++ b/services/backend/convex/http.ts
@@ -1,6 +1,10 @@
-import { registerFederationRoutes } from "@decentralized-convex/server";
+import {
+  protocolCapabilities,
+  registerFederationRoutes,
+} from "@decentralized-convex/server";
 import { httpRouter } from "convex/server";
 
+import { protocols } from "../pds";
 import { httpAction } from "./_generated/server";
 import { authComponent, createAuth } from "./auth";
 import { requireEnvironment } from "./lib";
@@ -15,10 +19,7 @@ registerFederationRoutes(http, httpAction, {
       issuer: requireEnvironment("CONVEX_SITE_URL"),
       jwksUrl: `${requireEnvironment("CONVEX_SITE_URL")}/api/auth/convex/jwks`,
     },
-    capabilities: [
-      { id: "accounts", versions: ["1"] },
-      { id: "messages", versions: ["1"] },
-    ],
+    capabilities: protocolCapabilities(...protocols),
     deploymentUrl: requireEnvironment("CONVEX_CLOUD_URL"),
     httpUrl: requireEnvironment("CONVEX_SITE_URL"),
     protocolVersion: "0.1",
diff --git a/services/backend/package.json b/services/backend/package.json
index 82da873a..e5307951 100644
--- a/services/backend/package.json
+++ b/services/backend/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    "./api": "./convex/_generated/api.js"
+    "./api": "./convex/_generated/api.js",
+    "./pds": "./pds.ts"
   },
   "scripts": {
     "clean": "git clean -xdf .cache .turbo node_modules",
@@ -13,12 +14,13 @@
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "format:fix": "prettier --write . --ignore-path ../../.gitignore",
     "lint": "eslint --flag unstable_native_nodejs_ts_config",
-    "typecheck": "tsgo --noEmit -p convex/tsconfig.json"
+    "typecheck": "tsgo --noEmit -p tsconfig.json"
   },
   "dependencies": {
     "@convex-dev/better-auth": "0.12.5",
     "@decentralized-convex/accounts": "workspace:*",
     "@decentralized-convex/address": "workspace:*",
+    "@decentralized-convex/client": "workspace:*",
     "@decentralized-convex/messages": "workspace:*",
     "@decentralized-convex/server": "workspace:*",
     "better-auth": "~1.6.15",
diff --git a/services/backend/pds.ts b/services/backend/pds.ts
new file mode 100644
index 00000000..93e7ef1d
--- /dev/null
+++ b/services/backend/pds.ts
@@ -0,0 +1,8 @@
+import { definePdsApi } from "@decentralized-convex/client";
+import { protocolsFromPdsApp } from "@decentralized-convex/server";
+
+import app from "./convex/convex.config.ts";
+
+/** Runtime protocols and client API inferred from the backend's plugin declaration. */
+export const protocols = protocolsFromPdsApp(app);
+export const pds = definePdsApi(...protocols);
diff --git a/services/backend/tsconfig.json b/services/backend/tsconfig.json
new file mode 100644
index 00000000..19bae889
--- /dev/null
+++ b/services/backend/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "./convex/tsconfig.json",
+  "include": ["./pds.ts", "./convex/**/*"],
+  "exclude": ["./convex/_generated"]
+}

From 04ea71527678e26f1ecd9044192559c5eef8f3d0 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 13:05:33 -0400
Subject: [PATCH 06/17] Add automatic home-first PDS routing

---
 README.md                                     |  21 +--
 apps/web/README.md                            |   4 +-
 .../src/features/account/AccountSession.tsx   |  53 ++----
 .../features/conversation/Conversation.tsx    |   1 -
 .../features/conversation/useConversation.ts  |  16 +-
 apps/web/src/features/pds/auth.ts             |  11 +-
 apps/web/src/features/pds/model.ts            |   4 +-
 docs/architecture.md                          |  22 ++-
 .../_generated/component.ts                   |   3 +
 .../decentralized-convex-client/README.md     |  15 +-
 .../src/client.test.ts                        |   4 +-
 .../decentralized-convex-client/src/client.ts | 126 +++++++++++++-
 .../decentralized-convex-client/src/index.ts  |   1 +
 .../src/pds.test.ts                           |  22 ++-
 .../decentralized-convex-client/src/pds.ts    |  55 +++++--
 .../src/pds.type-test.ts                      |   2 +-
 .../src/routed-pds-observer.ts                | 154 ++++++++++++++++++
 .../decentralized-convex-client/src/types.ts  |   6 +
 .../decentralized-convex-messages/README.md   |   5 +
 .../_generated/component.ts                   |  46 ++++--
 .../dispatcher.ts                             |  67 +++++++-
 .../decentralized-convex-messages/index.ts    |   2 +-
 .../decentralized-convex-messages/protocol.ts |  12 ++
 .../decentralized-convex-messages/schema.ts   |   5 +
 .../src/operations.test.ts                    |   4 +-
 .../src/operations.ts                         |   7 +-
 .../src/dispatcher.ts                         |  68 ++++++--
 .../decentralized-convex-server/src/index.ts  |   3 +
 .../src/routed-query.ts                       |  26 +++
 .../README.md                                 |  14 +-
 .../src/index.ts                              |   7 +-
 .../src/pds.test.ts                           |  37 +++--
 .../src/pds.ts                                |  84 +++-------
 33 files changed, 679 insertions(+), 228 deletions(-)
 create mode 100644 packages/decentralized-convex-client/src/routed-pds-observer.ts
 create mode 100644 packages/decentralized-convex-server/src/routed-query.ts

diff --git a/README.md b/README.md
index 9c7f8437..eb5feba4 100644
--- a/README.md
+++ b/README.md
@@ -44,15 +44,15 @@ Messages declares `requires: { accounts: "1" }`. Removing Accounts or
 installing an incompatible version fails type-checking. The normal
 `convex dev`, `convex deploy`, and `convex codegen` commands remain unchanged.
 
-The common client path is similarly small:
+The common client path uses the application's own TanStack hooks:
 
 ```ts
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
 import { pds } from "@vera/backend/pds";
 
-const messages = usePdsQuery({
-  request: pds.messages.list({ conversationId }),
-  targets,
-});
+const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
+const sendMessage = useMutation(pdsMutation(pds.messages.send));
 ```
 
 The backend's `pds` export derives its plugin names, versions, operations, and
@@ -60,10 +60,11 @@ types from the same `definePdsApp` declaration. The web app never repeats the
 installed plugin list, and the discovery manifest derives its capabilities
 from the same protocol tuple.
 
-`usePdsQuery` supplies a stable query key, connection reuse, realtime
-subscriptions, array merging, and per-PDS status by default. `combine`,
-`queryKey`, `enabled`, connection factories, and destination-aware auth remain
-available when an application needs control.
+The query starts at the signed-in account's home PDS, reads routing identities
+stored with the conversation, discovers their current deployments, and merges
+live results. Mutations automatically target home. Ordinary TanStack options,
+connection factories, explicit lower-level federation, and destination-aware
+authentication remain available when an application needs control.
 
 ## Workspace
 
@@ -74,7 +75,7 @@ available when an application needs control.
 - `packages/decentralized-convex-client` — discovery, connections, typed calls,
   federation, and subscriptions
 - `packages/decentralized-convex-react` — client provider
-- `packages/decentralized-convex-tanstack-query` — reactive query hooks
+- `packages/decentralized-convex-tanstack-query` — native TanStack option builders
 - `packages/decentralized-convex-accounts` and `-messages` — first-party plugins
 - `services/backend` — Vera's thin Better Auth PDS host
 - `apps/web` — the Vera reference client
diff --git a/apps/web/README.md b/apps/web/README.md
index 84c9c055..b6fb4fb1 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -28,7 +28,9 @@ Each signup and outgoing message is stored only on the selected home
 deployment. Each home keeps its own isolated Better Auth and Messages Component
 data. The home PDS issues a short-lived, destination-bound identity proof; the
 other PDS verifies it through discovery and returns a local Convex credential.
-The client opens an authenticated subscription to each home and reconciles both
+The selected account stores its conversation routing identities on its own PDS.
+The client first subscribes there, discovers the current participant PDSs from
+that response, then opens authenticated subscriptions and reconciles the
 results through TanStack Query.
 
 The account address uses the PDS's public account domain, never its internal
diff --git a/apps/web/src/features/account/AccountSession.tsx b/apps/web/src/features/account/AccountSession.tsx
index 5350ae4b..ff73562f 100644
--- a/apps/web/src/features/account/AccountSession.tsx
+++ b/apps/web/src/features/account/AccountSession.tsx
@@ -2,10 +2,7 @@ import type { AuthClient } from "@convex-dev/better-auth/react";
 import { useEffect, useState } from "react";
 import { useQueryClient } from "@tanstack/react-query";
 import { ConvexBetterAuthProvider } from "@convex-dev/better-auth/react";
-import {
-  DecentralizedConvexClient,
-  discoverPds,
-} from "@decentralized-convex/client";
+import { DecentralizedConvexClient } from "@decentralized-convex/client";
 import {
   DecentralizedConvexProvider,
   useQuery,
@@ -21,7 +18,6 @@ import {
   createFederationAuthTokenFetcher,
   createHomeAuthClient,
 } from "../pds/auth.ts";
-import { pdsHomeFromDiscovery, prototypeConversation } from "../pds/model.ts";
 import { SignInForm } from "./SignInForm.tsx";
 
 interface AccountSessionProps {
@@ -94,7 +90,6 @@ function AuthenticatedAccount({
     <DecentralizedConvexProvider client={federation.client}>
       <Conversation
         home={home}
-        homes={federation.homes}
         onChangeAccount={onBack}
         onSignOut={() => authClient.signOut()}
         user={user}
@@ -106,50 +101,30 @@ function AuthenticatedAccount({
 function useConversationFederation(authClient: HomeAuthClient, home: PdsHome) {
   const queryClient = useQueryClient();
   const [federation, setFederation] = useState<
-    | { client: DecentralizedConvexClient; homes: readonly PdsHome[] }
-    | { error: Error }
+    { client: DecentralizedConvexClient } | { error: Error }
   >();
 
   useEffect(() => {
     let active = true;
     let nextClient: DecentralizedConvexClient | undefined;
     let nextDisconnect: (() => void) | undefined;
-    void Promise.all(
-      prototypeConversation.participantDomains.map(async (domain) =>
-        domain === home.domain
-          ? home
-          : pdsHomeFromDiscovery(await discoverPds(domain)),
-      ),
-    )
-      .then((homes) => {
-        if (!active) return;
+    void Promise.resolve().then(() => {
+      if (!active) return;
+      try {
         const client = new DecentralizedConvexClient({
-          getAuthToken: createFederationAuthTokenFetcher({
-            authClient,
-            home,
-            homes,
-          }),
+          getAuthToken: createFederationAuthTokenFetcher({ authClient, home }),
+          pds: { home: home.discovery },
         });
         nextClient = client;
-        const pdsQueryClient = new PdsQueryClient({
-          client,
-          mutationTarget: { id: home.domain, url: home.convexUrl },
-          queryTargets: homes.map((server) => ({
-            id: `member@${server.domain}`,
-            url: server.convexUrl,
-          })),
-        });
-        const disconnect = pdsQueryClient.connect(queryClient);
-        nextDisconnect = disconnect;
-        setFederation({ client, homes });
-      })
-      .catch((cause: unknown) => {
-        if (!active) return;
+        const pdsQueryClient = new PdsQueryClient(client);
+        nextDisconnect = pdsQueryClient.connect(queryClient);
+        setFederation({ client });
+      } catch (cause) {
         setFederation({
-          error:
-            cause instanceof Error ? cause : new Error("PDS discovery failed"),
+          error: cause instanceof Error ? cause : new Error("PDS setup failed"),
         });
-      });
+      }
+    });
     return () => {
       active = false;
       nextDisconnect?.();
diff --git a/apps/web/src/features/conversation/Conversation.tsx b/apps/web/src/features/conversation/Conversation.tsx
index 392ef718..b0c533e9 100644
--- a/apps/web/src/features/conversation/Conversation.tsx
+++ b/apps/web/src/features/conversation/Conversation.tsx
@@ -10,7 +10,6 @@ import { useConversation } from "./useConversation.ts";
 
 interface ConversationProps {
   home: PdsHome;
-  homes: readonly PdsHome[];
   onChangeAccount: () => void;
   onSignOut: () => Promise<unknown>;
   user: { actor: string };
diff --git a/apps/web/src/features/conversation/useConversation.ts b/apps/web/src/features/conversation/useConversation.ts
index 6ae27c08..1e93d1ea 100644
--- a/apps/web/src/features/conversation/useConversation.ts
+++ b/apps/web/src/features/conversation/useConversation.ts
@@ -1,6 +1,6 @@
 import type { Message } from "@decentralized-convex/messages";
 import type { FormEvent } from "react";
-import { useState } from "react";
+import { useEffect, useEffectEvent, useState } from "react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import {
   pdsMutation,
@@ -12,16 +12,28 @@ import { pds } from "@vera/backend/pds";
 import { prototypeConversation } from "../pds/model.ts";
 
 export function useConversation() {
+  const conversation = useMutation(pdsMutation(pds.messages.putConversation));
   const messageOptions = pdsQuery(pds.messages.list, {
     conversationId: prototypeConversation.id,
   });
   const query = useQuery({
     ...messageOptions,
+    enabled: conversation.isSuccess,
     select: combineMessages,
   });
   const federation = usePdsQueryState(messageOptions);
   const sendMessage = useMutation(pdsMutation(pds.messages.send));
   const [draft, setDraft] = useState("");
+  const saveConversation = useEffectEvent(() => {
+    conversation.mutate({
+      conversationId: prototypeConversation.id,
+      participants: [...prototypeConversation.participants],
+    });
+  });
+
+  useEffect(() => {
+    saveConversation();
+  }, []);
 
   async function send(event: FormEvent<HTMLFormElement>) {
     event.preventDefault();
@@ -44,7 +56,7 @@ export function useConversation() {
   return {
     composer: {
       draft,
-      error: sendMessage.error?.message,
+      error: conversation.error?.message ?? sendMessage.error?.message,
       sending: sendMessage.isPending,
       setDraft,
       submit: send,
diff --git a/apps/web/src/features/pds/auth.ts b/apps/web/src/features/pds/auth.ts
index 50cfb30c..2bd560b9 100644
--- a/apps/web/src/features/pds/auth.ts
+++ b/apps/web/src/features/pds/auth.ts
@@ -6,6 +6,7 @@ import {
 import { createAuthClient } from "better-auth/react";
 
 import type { PdsHome } from "./model.ts";
+import { pdsHomeFromDiscovery } from "./model.ts";
 
 export function createHomeAuthClient(home: PdsHome) {
   return createAuthClient({
@@ -22,7 +23,6 @@ export type HomeAuthClient = ReturnType<typeof createHomeAuthClient>;
 interface FederationAuthOptions {
   authClient: HomeAuthClient;
   home: PdsHome;
-  homes: readonly PdsHome[];
 }
 
 interface CachedToken {
@@ -37,21 +37,18 @@ interface CachedToken {
 export function createFederationAuthTokenFetcher({
   authClient,
   home,
-  homes,
 }: FederationAuthOptions): FederationAuthTokenFetcher {
   const cache = new Map<string, CachedToken>();
-  const homesByUrl = new Map(homes.map((server) => [server.convexUrl, server]));
 
-  return async ({ forceRefreshToken, url }) => {
+  return async ({ forceRefreshToken, pds, url }) => {
     if (url === home.convexUrl) return getHomeToken(authClient);
-    const target = homesByUrl.get(url);
-    if (target === undefined) return null;
+    if (pds === undefined) return null;
     return getRemoteToken({
       authClient,
       cache,
       forceRefreshToken,
       home,
-      target,
+      target: pdsHomeFromDiscovery(pds),
       url,
     });
   };
diff --git a/apps/web/src/features/pds/model.ts b/apps/web/src/features/pds/model.ts
index 0c40f1ab..245b9c24 100644
--- a/apps/web/src/features/pds/model.ts
+++ b/apps/web/src/features/pds/model.ts
@@ -3,6 +3,7 @@ import type { DiscoveredPds } from "@decentralized-convex/client";
 /** Everything the client learns about one account's home PDS. */
 export interface PdsHome {
   convexUrl: string;
+  discovery: DiscoveredPds;
   domain: string;
   manifestUrl: string;
   siteUrl: string;
@@ -14,12 +15,13 @@ export interface PdsHome {
  */
 export const prototypeConversation = {
   id: "conversation:direct:a.vera.chat:b.vera.chat",
-  participantDomains: ["a.vera.chat", "b.vera.chat"],
+  participants: ["a.vera.chat", "b.vera.chat"],
 } as const;
 
 export function pdsHomeFromDiscovery(discovery: DiscoveredPds): PdsHome {
   return {
     convexUrl: discovery.manifest.deploymentUrl,
+    discovery,
     domain: discovery.domain,
     manifestUrl: discovery.manifestUrl,
     siteUrl: discovery.manifest.httpUrl,
diff --git a/docs/architecture.md b/docs/architecture.md
index ba8a5132..0e56db2b 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -58,14 +58,16 @@ the generated API of any particular independently hosted backend.
 A Messages read follows this path:
 
 ```text
-usePdsQuery
-  -> DecentralizedConvexClient connection for each target
-  -> pds:dispatchQuery on each deployment
+useQuery(pdsQuery(...))
+  -> pds:dispatchQuery on the signed-in account's home
+  -> typed data plus hidden conversation routing identities
+  -> current PDS discovery for those identities
+  -> pds:dispatchQuery on each discovered deployment
   -> root authentication and plugin selection
   -> messages.dispatcher.dispatchQuery
   -> exact operation/version/argument validation
   -> list handler and Component database
-  -> per-source results merged in the client
+  -> per-source results merged into the application's TanStack cache
 ```
 
 A write follows the same path through `pds:dispatchMutation`, targeting only the
@@ -94,15 +96,15 @@ The default path intentionally needs only:
 
 - `definePdsApp` on the server;
 - one stable backend `pds` export inferred from that app definition;
-- `usePdsQuery({ request, targets })` for reactive reads;
-- `client.pdsMutation(target, request)` for writes.
+- `useQuery(pdsQuery(operation, args))` for reactive reads;
+- `useMutation(pdsMutation(operation))` for writes.
 
 Applications may override:
 
 - ordinary Component install names and HTTP prefixes;
 - the root app HTTP prefix;
 - connection creation and destination-aware token fetching;
-- target-specific requests;
+- explicit lower-level federation targets;
 - result combination and deduplication;
 - TanStack query keys and enablement;
 - the canonical root query and mutation references through `PdsClient`.
@@ -115,8 +117,10 @@ updates, root dispatch, exact Component validation, and author-home storage.
 
 Still prototype-only:
 
-- the web app uses one explicit two-domain conversation fixture;
-- conversation membership and routing are not discovered from product data;
+- the web app uses one explicit two-domain conversation fixture, but its
+  routing is stored on each account's home and discovered through product data;
+- the initial loading grace period and partial-result reveal policy are not yet
+  implemented;
 - the UI holds one active account rather than concurrent accounts;
 - auth lacks scopes, revocation, replay limits, and resource-specific policy;
 - plugin version ranges, migrations, upgrades, and large plugin graphs need a
diff --git a/packages/decentralized-convex-accounts/_generated/component.ts b/packages/decentralized-convex-accounts/_generated/component.ts
index 0bc1564d..3b049da5 100644
--- a/packages/decentralized-convex-accounts/_generated/component.ts
+++ b/packages/decentralized-convex-accounts/_generated/component.ts
@@ -43,6 +43,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           version: "1";
         },
         {
+          routes?: Array<string>;
           type: "upsertMyProfile";
           value: {
             accountId: string;
@@ -70,6 +71,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           version: "1";
         },
         | {
+            routes?: Array<string>;
             type: "getMyProfile";
             value: null | {
               accountId: string;
@@ -78,6 +80,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             };
           }
         | {
+            routes?: Array<string>;
             type: "getProfile";
             value: null | {
               accountId: string;
diff --git a/packages/decentralized-convex-client/README.md b/packages/decentralized-convex-client/README.md
index 02ffb006..96982503 100644
--- a/packages/decentralized-convex-client/README.md
+++ b/packages/decentralized-convex-client/README.md
@@ -4,19 +4,20 @@ Framework-independent discovery, connection, and federation client.
 
 ```ts
 const pds = definePdsApi(accountsProtocol, messagesProtocol);
+const client = new DecentralizedConvexClient({ pds: { home } });
 
-await client.pdsMutation(
-  { id: accountId, url: homeUrl },
-  pds.messages.send(input),
-);
+await client.pdsMutation(pds.messages.send(input));
+const messages = await client.pdsQuery(pds.messages.list({ conversationId }));
 ```
 
 `definePdsApi` uses each protocol's own name. Query and mutation builders are
 available directly on each plugin; the nested namespaces remain available to
 the lower-level binding API. `DecentralizedConvexClient` lazily reuses one
-Convex connection per normalized deployment URL, groups duplicate targets,
-supports point queries and realtime observers, and reports every source
-independently.
+Convex connection per normalized deployment URL. A PDS query starts at the
+configured home, reads routing identities returned by the plugin, discovers
+their current deployments, and reconciles every source. Mutations default to
+the configured home. The lower-level `federatedPdsQuery` and
+`federatedPdsMutation` methods remain available for explicitly targeted tools.
 
 The default function references are `pds:dispatchQuery` and
 `pds:dispatchMutation`. Advanced consumers may construct `PdsClient` with
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
index 3a6de8bc..7c5f8214 100644
--- a/packages/decentralized-convex-client/src/client.test.ts
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -75,7 +75,7 @@ void test("federates typed PDS requests without a generated backend API", async
     connectionFactory: (url) => new MemoryConnection(url),
   });
 
-  const snapshot = await client.pdsQuery({
+  const snapshot = await client.federatedPdsQuery({
     request: api.notes.queries.list({}),
     targets: [
       { id: "alice@a.test", url: "https://a.test" },
@@ -113,7 +113,7 @@ class MemoryConnection implements FederationConnection {
     args: FunctionArgs<Query>,
   ): Promise<FunctionReturnType<Query>> {
     const result = isPdsRequest(args)
-      ? [{ body: this.#url }]
+      ? { routes: [], value: [{ body: this.#url }] }
       : [{ id: this.#url, value: getScope(args) }];
     // The fake connection cannot derive a concrete return type from an arbitrary test reference.
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
diff --git a/packages/decentralized-convex-client/src/client.ts b/packages/decentralized-convex-client/src/client.ts
index 939a661e..5f1f9b82 100644
--- a/packages/decentralized-convex-client/src/client.ts
+++ b/packages/decentralized-convex-client/src/client.ts
@@ -1,4 +1,6 @@
+import type { DiscoveredPds } from "@decentralized-convex/address";
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import { accountDomain, discoverPds } from "@decentralized-convex/address";
 
 import type {
   AnyPdsMutationRequest,
@@ -19,18 +21,27 @@ import { createConvexFederationConnection } from "./connection.ts";
 import { FederatedQueryObserver } from "./observer.ts";
 import { FederatedPdsQueryObserver } from "./pds-observer.ts";
 import { PdsClient } from "./pds.ts";
+import { RoutedPdsQueryObserver } from "./routed-pds-observer.ts";
 import { createFederatedSnapshot } from "./snapshot.ts";
 import { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 
 export class DecentralizedConvexClient {
   readonly #connectionFactory;
   readonly #connections = new Map<string, FederationConnection>();
+  readonly #discoverPds;
   readonly #getAuthToken;
+  readonly #home?: DiscoveredPds;
+  readonly #pdsByDomain = new Map<string, DiscoveredPds>();
+  readonly #pdsByUrl = new Map<string, DiscoveredPds>();
+  readonly #pdsResolutions = new Map<string, Promise<DiscoveredPds>>();
 
   constructor(options: FederationClientOptions = {}) {
     this.#connectionFactory =
       options.connectionFactory ?? createConvexFederationConnection;
+    this.#discoverPds = options.pds?.discover ?? discoverPds;
     this.#getAuthToken = options.getAuthToken;
+    this.#home = options.pds?.home;
+    if (this.#home !== undefined) this.#rememberPds(this.#home);
   }
 
   watchQuery<Query extends FederationQueryReference, Combined>(
@@ -41,7 +52,7 @@ export class DecentralizedConvexClient {
     );
   }
 
-  watchPdsQuery<
+  watchFederatedPdsQuery<
     Request extends AnyPdsQueryRequest,
     Combined = DefaultCombinedPdsResult<Request>,
   >(options: FederatedPdsQueryOptions<Request, Combined>) {
@@ -50,6 +61,16 @@ export class DecentralizedConvexClient {
     );
   }
 
+  watchPdsQuery<Request extends AnyPdsQueryRequest>(request: Request) {
+    const home = this.#requireHome();
+    return new RoutedPdsQueryObserver({
+      getConnection: (url) => this.#getConnection(url),
+      home: pdsTarget(home.domain, home),
+      request,
+      resolveRoutes: (routes) => this.#resolveRoutes(routes),
+    });
+  }
+
   async query<Query extends FederationQueryReference, Combined>(
     options: FederatedQueryOptions<Query, Combined>,
   ) {
@@ -81,7 +102,7 @@ export class DecentralizedConvexClient {
     );
   }
 
-  async pdsQuery<
+  async federatedPdsQuery<
     Request extends AnyPdsQueryRequest,
     Combined = DefaultCombinedPdsResult<Request>,
   >(options: FederatedPdsQueryOptions<Request, Combined>) {
@@ -112,6 +133,43 @@ export class DecentralizedConvexClient {
     );
   }
 
+  async pdsQuery<Request extends AnyPdsQueryRequest>(request: Request) {
+    const home = this.#requireHome();
+    const homeTarget = pdsTarget(home.domain, home);
+    const homeGroup = groupFederationTargets([homeTarget])[0];
+    if (homeGroup === undefined) throw new Error("PDS home is invalid");
+    const homeResult = await new PdsClient({
+      connection: this.#getConnection(homeTarget.url),
+    }).queryWithRouting(request);
+    const targets = groupFederationTargets([
+      homeTarget,
+      ...(await this.#resolveRoutes(homeResult.routes)),
+    ]);
+    const settled = await Promise.all(
+      targets.map(async (target) => {
+        if (target.url === homeGroup.url) {
+          return { data: homeResult.data, status: "live" as const, target };
+        }
+        try {
+          const data = await new PdsClient({
+            connection: this.#getConnection(target.url),
+          }).query(request);
+          return { data, status: "live" as const, target };
+        } catch (error) {
+          return {
+            error: toError(error),
+            status: "error" as const,
+            target,
+          };
+        }
+      }),
+    );
+    return createFederatedSnapshot<
+      PdsRequestResult<Request>,
+      DefaultCombinedPdsResult<Request>
+    >(settled);
+  }
+
   mutation<Mutation extends FederationMutationReference>(
     target: FederationTarget,
     mutation: Mutation,
@@ -120,7 +178,7 @@ export class DecentralizedConvexClient {
     return this.#getConnection(target.url).mutation(mutation, args);
   }
 
-  pdsMutation<Request extends AnyPdsMutationRequest>(
+  federatedPdsMutation<Request extends AnyPdsMutationRequest>(
     target: FederationTarget,
     request: Request,
   ): Promise<PdsRequestResult<Request>> {
@@ -129,6 +187,31 @@ export class DecentralizedConvexClient {
     }).mutation(request);
   }
 
+  pdsMutation<Request extends AnyPdsMutationRequest>(request: Request) {
+    const home = this.#requireHome();
+    return new PdsClient({
+      connection: this.#getConnection(home.manifest.deploymentUrl),
+    }).mutation(request);
+  }
+
+  async resolvePds(addressOrDomain: string) {
+    const domain = accountDomain(addressOrDomain);
+    const existing = this.#pdsByDomain.get(domain);
+    if (existing !== undefined) return existing;
+    const pending = this.#pdsResolutions.get(domain);
+    if (pending !== undefined) return pending;
+    const resolution = this.#discoverPds(addressOrDomain)
+      .then((resolved) => {
+        this.#rememberPds(resolved);
+        return resolved;
+      })
+      .finally(() => {
+        this.#pdsResolutions.delete(domain);
+      });
+    this.#pdsResolutions.set(domain, resolution);
+    return resolution;
+  }
+
   async close() {
     await Promise.all(
       [...this.#connections.values()].map((connection) => connection.close()),
@@ -140,10 +223,45 @@ export class DecentralizedConvexClient {
     const url = normalizeFederationUrl(inputUrl);
     const existing = this.#connections.get(url);
     if (existing !== undefined) return existing;
-    const connection = this.#connectionFactory(url, this.#getAuthToken);
+    const fetchAuthToken = this.#getAuthToken;
+    const getAuthToken =
+      fetchAuthToken === undefined
+        ? undefined
+        : (request: Parameters<typeof fetchAuthToken>[0]) =>
+            fetchAuthToken({
+              ...request,
+              pds: this.#pdsByUrl.get(url),
+            });
+    const connection = this.#connectionFactory(url, getAuthToken);
     this.#connections.set(url, connection);
     return connection;
   }
+
+  async #resolveRoutes(routes: readonly string[]) {
+    return Promise.all(
+      [...new Set(routes)].map(async (route) =>
+        pdsTarget(route, await this.resolvePds(route)),
+      ),
+    );
+  }
+
+  #rememberPds(pds: DiscoveredPds) {
+    this.#pdsByDomain.set(pds.domain, pds);
+    this.#pdsByUrl.set(normalizeFederationUrl(pds.manifest.deploymentUrl), pds);
+  }
+
+  #requireHome() {
+    if (this.#home === undefined) {
+      throw new Error(
+        "Configure FederationClientOptions.pds.home before using automatic PDS routing",
+      );
+    }
+    return this.#home;
+  }
+}
+
+function pdsTarget(id: string, pds: DiscoveredPds): FederationTarget {
+  return { id, url: pds.manifest.deploymentUrl };
 }
 
 function toError(error: unknown) {
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 4e965694..eea77f5b 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -46,6 +46,7 @@ export type {
   PdsApi,
   PdsConnection,
   PdsPluginApi,
+  PdsQueryResult,
   PdsRequest,
   PdsRequestResult,
 } from "./pds.ts";
diff --git a/packages/decentralized-convex-client/src/pds.test.ts b/packages/decentralized-convex-client/src/pds.test.ts
index 864ef7e9..769ccc27 100644
--- a/packages/decentralized-convex-client/src/pds.test.ts
+++ b/packages/decentralized-convex-client/src/pds.test.ts
@@ -63,16 +63,23 @@ void test("binds protocols to canonical typed PDS calls", async () => {
     },
     query: (_query, args) => {
       calls.push(args);
-      return Promise.resolve([{ body: "hello", id: "note-1" }]);
+      return Promise.resolve({
+        routes: ["a.test", "b.test"],
+        value: [{ body: "hello", id: "note-1" }],
+      });
     },
     subscribe: (_query, args, onResult) => {
       calls.push(args);
-      onResult([{ body: "live", id: "note-2" }]);
+      onResult({
+        routes: ["a.test", "b.test"],
+        value: [{ body: "live", id: "note-2" }],
+      });
       return () => undefined;
     },
   };
   const client = new PdsClient({ connection });
-  const api = client.bind(definePdsApi(notes));
+  const requests = definePdsApi(notes);
+  const api = client.bind(requests);
 
   assert.equal(getFunctionName(pdsFunctions.query), "pds:dispatchQuery");
   assert.equal(getFunctionName(pdsFunctions.mutation), "pds:dispatchMutation");
@@ -82,6 +89,13 @@ void test("binds protocols to canonical typed PDS calls", async () => {
   assert.deepEqual(await api.notes.query.list({ owner: "shawn" }), [
     { body: "hello", id: "note-1" },
   ]);
+  assert.deepEqual(
+    await client.queryWithRouting(requests.notes.list({ owner: "shawn" })),
+    {
+      data: [{ body: "hello", id: "note-1" }],
+      routes: ["a.test", "b.test"],
+    },
+  );
 
   let live: unknown;
   api.notes.watch.list(
@@ -92,5 +106,5 @@ void test("binds protocols to canonical typed PDS calls", async () => {
     assert.fail,
   );
   assert.deepEqual(live, [{ body: "live", id: "note-2" }]);
-  assert.equal(calls.length, 3);
+  assert.equal(calls.length, 4);
 });
diff --git a/packages/decentralized-convex-client/src/pds.ts b/packages/decentralized-convex-client/src/pds.ts
index 7e321004..5cdb8cc8 100644
--- a/packages/decentralized-convex-client/src/pds.ts
+++ b/packages/decentralized-convex-client/src/pds.ts
@@ -20,11 +20,16 @@ export type {
   PdsRequestResult,
 } from "./api.ts";
 
+interface SerializedPdsQueryResult {
+  readonly routes: readonly string[];
+  readonly value: unknown;
+}
+
 type RootQuery = FunctionReference<
   "query",
   "public",
   SerializedPdsRequest,
-  unknown
+  SerializedPdsQueryResult
 >;
 
 type RootMutation = FunctionReference<
@@ -38,11 +43,18 @@ export const pdsFunctions = Object.freeze({
   mutation: makeFunctionReference<"mutation", SerializedPdsRequest, unknown>(
     "pds:dispatchMutation",
   ),
-  query: makeFunctionReference<"query", SerializedPdsRequest, unknown>(
-    "pds:dispatchQuery",
-  ),
+  query: makeFunctionReference<
+    "query",
+    SerializedPdsRequest,
+    SerializedPdsQueryResult
+  >("pds:dispatchQuery"),
 });
 
+export interface PdsQueryResult<Result> {
+  readonly data: Result;
+  readonly routes: readonly string[];
+}
+
 export interface PdsConnection {
   close(): Promise<void>;
   mutation<Mutation extends RootMutation>(
@@ -86,27 +98,48 @@ export class PdsClient {
     >;
   }
 
-  query<Request extends AnyPdsQueryRequest>(
+  async query<Request extends AnyPdsQueryRequest>(
     request: Request,
   ): Promise<PdsRequestResult<Request>> {
+    return (await this.queryWithRouting(request)).data;
+  }
+
+  async queryWithRouting<Request extends AnyPdsQueryRequest>(
+    request: Request,
+  ): Promise<PdsQueryResult<PdsRequestResult<Request>>> {
+    const result = await this.#connection.query(this.#query, request);
     // The request's phantom result is defined by the same protocol that created its payload.
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return this.#connection.query(this.#query, request) as Promise<
-      PdsRequestResult<Request>
-    >;
+    const data = result.value as PdsRequestResult<Request>;
+    return { data, routes: result.routes };
   }
 
   watchQuery<Request extends AnyPdsQueryRequest>(
     request: Request,
     onResult: (result: PdsRequestResult<Request>) => void,
     onError: (error: Error) => void,
+  ) {
+    return this.watchQueryWithRouting(
+      request,
+      (result) => onResult(result.data),
+      onError,
+    );
+  }
+
+  watchQueryWithRouting<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    onResult: (result: PdsQueryResult<PdsRequestResult<Request>>) => void,
+    onError: (error: Error) => void,
   ) {
     return this.#connection.subscribe(
       this.#query,
       request,
-      // The subscription uses the same typed request and root query as the point query path.
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      (result) => onResult(result as PdsRequestResult<Request>),
+      (result) => {
+        // The request's phantom result is defined by the same protocol that created its payload.
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        const data = result.value as PdsRequestResult<Request>;
+        onResult({ data, routes: result.routes });
+      },
       onError,
     );
   }
diff --git a/packages/decentralized-convex-client/src/pds.type-test.ts b/packages/decentralized-convex-client/src/pds.type-test.ts
index 16ec474c..701c94c0 100644
--- a/packages/decentralized-convex-client/src/pds.type-test.ts
+++ b/packages/decentralized-convex-client/src/pds.type-test.ts
@@ -49,7 +49,7 @@ void boundListResult;
 declare const federationClient: DecentralizedConvexClient;
 const federatedListResult: Promise<
   FederatedQuerySnapshot<{ body: string }[], { body: string }[]>
-> = federationClient.pdsQuery({
+> = federationClient.federatedPdsQuery({
   request: list,
   targets: [{ id: "shawn@example.com", url: "https://pds.example.com" }],
 });
diff --git a/packages/decentralized-convex-client/src/routed-pds-observer.ts b/packages/decentralized-convex-client/src/routed-pds-observer.ts
new file mode 100644
index 00000000..9d07ed7d
--- /dev/null
+++ b/packages/decentralized-convex-client/src/routed-pds-observer.ts
@@ -0,0 +1,154 @@
+import type {
+  AnyPdsQueryRequest,
+  DefaultCombinedPdsResult,
+  PdsConnection,
+  PdsRequestResult,
+} from "./pds.ts";
+import type {
+  FederatedQuerySnapshot,
+  FederationSourceSnapshot,
+  FederationTarget,
+} from "./types.ts";
+import { PdsClient } from "./pds.ts";
+import { createFederatedSnapshot } from "./snapshot.ts";
+import { groupFederationTargets } from "./targets.ts";
+
+export class RoutedPdsQueryObserver<
+  Request extends AnyPdsQueryRequest,
+  Combined = DefaultCombinedPdsResult<Request>,
+> {
+  readonly #getConnection;
+  readonly #home;
+  readonly #listeners = new Set<() => void>();
+  readonly #request;
+  readonly #resolveRoutes;
+  readonly #sources = new Map<
+    string,
+    FederationSourceSnapshot<PdsRequestResult<Request>>
+  >();
+  readonly #unsubscribes = new Map<string, () => void>();
+  #closed = false;
+  #routingGeneration = 0;
+  #snapshot: FederatedQuerySnapshot<Combined, PdsRequestResult<Request>>;
+
+  constructor(options: {
+    getConnection: (url: string) => PdsConnection;
+    home: FederationTarget;
+    request: Request;
+    resolveRoutes: (
+      routes: readonly string[],
+    ) => Promise<readonly FederationTarget[]>;
+  }) {
+    this.#getConnection = options.getConnection;
+    this.#home = groupFederationTargets([options.home])[0] ?? {
+      ids: [options.home.id],
+      url: options.home.url,
+    };
+    this.#request = options.request;
+    this.#resolveRoutes = options.resolveRoutes;
+    this.#sources.set(this.#home.url, {
+      status: "pending",
+      target: this.#home,
+    });
+    this.#snapshot = createFederatedSnapshot([...this.#sources.values()]);
+    this.#watchHome();
+  }
+
+  getSnapshot = () => this.#snapshot;
+
+  subscribe = (listener: () => void) => {
+    this.#listeners.add(listener);
+    return () => this.#listeners.delete(listener);
+  };
+
+  close() {
+    if (this.#closed) return;
+    this.#closed = true;
+    this.#routingGeneration += 1;
+    for (const unsubscribe of this.#unsubscribes.values()) unsubscribe();
+    this.#unsubscribes.clear();
+    this.#listeners.clear();
+  }
+
+  #watchHome() {
+    const client = new PdsClient({
+      connection: this.#getConnection(this.#home.url),
+    });
+    const unsubscribe = client.watchQueryWithRouting(
+      this.#request,
+      ({ data, routes }) => {
+        this.#update(this.#home.url, { data, status: "live" });
+        void this.#reconcileRoutes(routes).catch(() => {
+          // The point query exposes route-discovery failures through its normal error result.
+        });
+      },
+      (error) => this.#update(this.#home.url, { error, status: "error" }),
+    );
+    this.#unsubscribes.set(this.#home.url, unsubscribe);
+  }
+
+  async #reconcileRoutes(routes: readonly string[]) {
+    const generation = ++this.#routingGeneration;
+    const resolved = await this.#resolveRoutes(routes);
+    if (this.#closed || generation !== this.#routingGeneration) return;
+
+    const targets = groupFederationTargets([
+      { id: this.#home.ids[0] ?? this.#home.url, url: this.#home.url },
+      ...resolved,
+    ]);
+    this.#removeStaleTargets(targets);
+    this.#addTargets(targets);
+    this.#publish();
+  }
+
+  #removeStaleTargets(targets: readonly { readonly url: string }[]) {
+    const desiredUrls = new Set(targets.map(({ url }) => url));
+    for (const url of this.#sources.keys()) {
+      if (url === this.#home.url || desiredUrls.has(url)) continue;
+      this.#unsubscribes.get(url)?.();
+      this.#unsubscribes.delete(url);
+      this.#sources.delete(url);
+    }
+  }
+
+  #addTargets(
+    targets: readonly {
+      readonly ids: readonly string[];
+      readonly url: string;
+    }[],
+  ) {
+    for (const target of targets) {
+      if (target.url === this.#home.url || this.#sources.has(target.url)) {
+        continue;
+      }
+      this.#sources.set(target.url, { status: "pending", target });
+      const client = new PdsClient({
+        connection: this.#getConnection(target.url),
+      });
+      this.#unsubscribes.set(
+        target.url,
+        client.watchQuery(
+          this.#request,
+          (data) => this.#update(target.url, { data, status: "live" }),
+          (error) => this.#update(target.url, { error, status: "error" }),
+        ),
+      );
+    }
+  }
+
+  #update(
+    url: string,
+    patch: Partial<FederationSourceSnapshot<PdsRequestResult<Request>>>,
+  ) {
+    if (this.#closed) return;
+    const source = this.#sources.get(url);
+    if (source === undefined) return;
+    this.#sources.set(url, { ...source, ...patch });
+    this.#publish();
+  }
+
+  #publish() {
+    this.#snapshot = createFederatedSnapshot([...this.#sources.values()]);
+    for (const listener of this.#listeners) listener();
+  }
+}
diff --git a/packages/decentralized-convex-client/src/types.ts b/packages/decentralized-convex-client/src/types.ts
index 8d97e4c7..06d9e12a 100644
--- a/packages/decentralized-convex-client/src/types.ts
+++ b/packages/decentralized-convex-client/src/types.ts
@@ -1,3 +1,4 @@
+import type { DiscoveredPds } from "@decentralized-convex/address";
 import type {
   DefaultFunctionArgs,
   FunctionArgs,
@@ -71,6 +72,7 @@ export interface FederatedQueryOptions<
 
 export interface FederationAuthRequest {
   forceRefreshToken: boolean;
+  pds?: DiscoveredPds;
   url: string;
 }
 
@@ -104,4 +106,8 @@ export type FederationConnectionFactory = (
 export interface FederationClientOptions {
   connectionFactory?: FederationConnectionFactory;
   getAuthToken?: FederationAuthTokenFetcher;
+  pds?: {
+    discover?: (addressOrDomain: string) => Promise<DiscoveredPds>;
+    home: DiscoveredPds;
+  };
 }
diff --git a/packages/decentralized-convex-messages/README.md b/packages/decentralized-convex-messages/README.md
index cc3a6706..d24b870f 100644
--- a/packages/decentralized-convex-messages/README.md
+++ b/packages/decentralized-convex-messages/README.md
@@ -7,6 +7,11 @@ Messages without a compatible Accounts plugin. Messages receives canonical
 identity from the root PDS router and keeps its hot read/write path inside one
 Component boundary.
 
+Each account stores its own conversation routing record in the Component.
+`messages.list` returns ordinary `Message[]` to application code while carrying
+those routing identities as transport metadata. The core client reads that
+metadata from home and discovers the current participant PDS deployments.
+
 ```ts
 import messages from "@decentralized-convex/messages/convex.config";
 ```
diff --git a/packages/decentralized-convex-messages/_generated/component.ts b/packages/decentralized-convex-messages/_generated/component.ts
index 080f1b3e..74b8d865 100644
--- a/packages/decentralized-convex-messages/_generated/component.ts
+++ b/packages/decentralized-convex-messages/_generated/component.ts
@@ -36,23 +36,38 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             subject: string;
             tokenIdentifier: string;
           };
-          operation: {
-            args: { body: string; conversationId: string; messageId: string };
-            type: "send";
-          };
+          operation:
+            | {
+                args: { conversationId: string; participants: Array<string> };
+                type: "putConversation";
+              }
+            | {
+                args: {
+                  body: string;
+                  conversationId: string;
+                  messageId: string;
+                };
+                type: "send";
+              };
           version: "1";
         },
-        {
-          type: "send";
-          value: {
-            authorId: string;
-            authorName: string;
-            body: string;
-            conversationId: string;
-            messageId: string;
-            sentAt: number;
-          };
-        },
+        | {
+            routes?: Array<string>;
+            type: "putConversation";
+            value: { conversationId: string; participants: Array<string> };
+          }
+        | {
+            routes?: Array<string>;
+            type: "send";
+            value: {
+              authorId: string;
+              authorName: string;
+              body: string;
+              conversationId: string;
+              messageId: string;
+              sentAt: number;
+            };
+          },
         Name
       >;
       dispatchQuery: FunctionReference<
@@ -71,6 +86,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           version: "1";
         },
         {
+          routes?: Array<string>;
           type: "list";
           value: Array<{
             authorId: string;
diff --git a/packages/decentralized-convex-messages/dispatcher.ts b/packages/decentralized-convex-messages/dispatcher.ts
index d92525f4..0088d85a 100644
--- a/packages/decentralized-convex-messages/dispatcher.ts
+++ b/packages/decentralized-convex-messages/dispatcher.ts
@@ -1,4 +1,7 @@
-import { defineComponentDispatchers } from "@decentralized-convex/server";
+import {
+  defineComponentDispatchers,
+  routedQueryResult,
+} from "@decentralized-convex/server";
 import { ConvexError } from "convex/values";
 
 import { mutation, query } from "./_generated/server.js";
@@ -7,6 +10,29 @@ import { messagesProtocol } from "./protocol.ts";
 export const { dispatchMutation, dispatchQuery } = defineComponentDispatchers({
   handlers: {
     mutations: {
+      putConversation: async (ctx, { args, identity }) => {
+        const accountId = requireAccountId(identity);
+        const participants = normalizeParticipants(args.participants);
+        const existing = await ctx.db
+          .query("conversations")
+          .withIndex("by_account_conversation", (index) =>
+            index
+              .eq("accountId", accountId)
+              .eq("conversationId", args.conversationId),
+          )
+          .unique();
+        const conversation = {
+          accountId,
+          conversationId: args.conversationId,
+          participants,
+        };
+        if (existing === null) {
+          await ctx.db.insert("conversations", conversation);
+        } else {
+          await ctx.db.patch(existing._id, conversation);
+        }
+        return { conversationId: args.conversationId, participants };
+      },
       send: async (ctx, { args, identity }) => {
         const authorId = requireAccountId(identity);
         const body = args.body.trim();
@@ -37,20 +63,31 @@ export const { dispatchMutation, dispatchQuery } = defineComponentDispatchers({
     },
     queries: {
       list: async (ctx, { args, identity }) => {
-        requireAccountId(identity);
+        const accountId = requireAccountId(identity);
+        const conversation = await ctx.db
+          .query("conversations")
+          .withIndex("by_account_conversation", (index) =>
+            index
+              .eq("accountId", accountId)
+              .eq("conversationId", args.conversationId),
+          )
+          .unique();
         const messages = await ctx.db
           .query("messages")
           .withIndex("by_conversation", (index) =>
             index.eq("conversationId", args.conversationId),
           )
           .collect();
-        return messages
-          .map(toMessage)
-          .sort(
-            (left, right) =>
-              left.sentAt - right.sentAt ||
-              left.messageId.localeCompare(right.messageId),
-          );
+        return routedQueryResult(
+          messages
+            .map(toMessage)
+            .sort(
+              (left, right) =>
+                left.sentAt - right.sentAt ||
+                left.messageId.localeCompare(right.messageId),
+            ),
+          conversation?.participants ?? [],
+        );
       },
     },
   },
@@ -71,6 +108,18 @@ function requireAccountId(
   return accountId;
 }
 
+function normalizeParticipants(participants: readonly string[]) {
+  const normalized = [
+    ...new Set(
+      participants.map((participant) => participant.trim().toLowerCase()),
+    ),
+  ].filter(Boolean);
+  if (normalized.length === 0) {
+    throw new ConvexError({ code: "CONVERSATION_PARTICIPANTS_REQUIRED" });
+  }
+  return normalized.sort();
+}
+
 function toMessage(message: {
   authorId: string;
   authorName: string;
diff --git a/packages/decentralized-convex-messages/index.ts b/packages/decentralized-convex-messages/index.ts
index cec7f6db..34075254 100644
--- a/packages/decentralized-convex-messages/index.ts
+++ b/packages/decentralized-convex-messages/index.ts
@@ -1,2 +1,2 @@
-export { message, messagesProtocol } from "./protocol.ts";
+export { conversation, message, messagesProtocol } from "./protocol.ts";
 export type { Message } from "./protocol.ts";
diff --git a/packages/decentralized-convex-messages/protocol.ts b/packages/decentralized-convex-messages/protocol.ts
index 98b9d0fb..dafd184c 100644
--- a/packages/decentralized-convex-messages/protocol.ts
+++ b/packages/decentralized-convex-messages/protocol.ts
@@ -16,9 +16,21 @@ export const message = v.object({
 
 export type Message = Infer<typeof message>;
 
+export const conversation = v.object({
+  conversationId: v.string(),
+  participants: v.array(v.string()),
+});
+
 export const messagesProtocol = definePluginProtocol({
   name: "messages",
   mutations: {
+    putConversation: defineOperation({
+      args: v.object({
+        conversationId: v.string(),
+        participants: v.array(v.string()),
+      }),
+      returns: conversation,
+    }),
     send: defineOperation({
       args: v.object({
         body: v.string(),
diff --git a/packages/decentralized-convex-messages/schema.ts b/packages/decentralized-convex-messages/schema.ts
index 9c270956..7ac0e647 100644
--- a/packages/decentralized-convex-messages/schema.ts
+++ b/packages/decentralized-convex-messages/schema.ts
@@ -2,6 +2,11 @@ import { defineSchema, defineTable } from "convex/server";
 import { v } from "convex/values";
 
 export default defineSchema({
+  conversations: defineTable({
+    accountId: v.string(),
+    conversationId: v.string(),
+    participants: v.array(v.string()),
+  }).index("by_account_conversation", ["accountId", "conversationId"]),
   messages: defineTable({
     authorId: v.string(),
     authorName: v.string(),
diff --git a/packages/decentralized-convex-plugin/src/operations.test.ts b/packages/decentralized-convex-plugin/src/operations.test.ts
index fa04ef1a..c8241c2b 100644
--- a/packages/decentralized-convex-plugin/src/operations.test.ts
+++ b/packages/decentralized-convex-plugin/src/operations.test.ts
@@ -34,8 +34,8 @@ void test("builds discriminated request and response validators", () => {
       return Object.keys(member.fields);
     }),
     [
-      ["type", "value"],
-      ["type", "value"],
+      ["routes", "type", "value"],
+      ["routes", "type", "value"],
     ],
   );
   assert.deepEqual(
diff --git a/packages/decentralized-convex-plugin/src/operations.ts b/packages/decentralized-convex-plugin/src/operations.ts
index 96685aec..b2a69770 100644
--- a/packages/decentralized-convex-plugin/src/operations.ts
+++ b/packages/decentralized-convex-plugin/src/operations.ts
@@ -64,6 +64,7 @@ export type OperationReturn<
 
 export type OperationResponse<Operations extends OperationMap> = {
   readonly [Name in keyof Operations & string]: {
+    readonly routes?: readonly string[];
     readonly type: Name;
     readonly value: OperationResult<Operations[Name]>;
   };
@@ -118,7 +119,11 @@ export function operationResponseValidator<
   operations: Operations,
 ): Validator<OperationResponse<Operations>, "required", string> {
   const members = Object.entries(operations).map(([type, operation]) =>
-    v.object({ type: v.literal(type), value: operation.returns }),
+    v.object({
+      routes: v.optional(v.array(v.string())),
+      type: v.literal(type),
+      value: operation.returns,
+    }),
   );
   if (members.length === 0) {
     throw new Error("A dispatcher must define at least one operation.");
diff --git a/packages/decentralized-convex-server/src/dispatcher.ts b/packages/decentralized-convex-server/src/dispatcher.ts
index 3612fd04..678c46fb 100644
--- a/packages/decentralized-convex-server/src/dispatcher.ts
+++ b/packages/decentralized-convex-server/src/dispatcher.ts
@@ -24,6 +24,9 @@ import {
 } from "@decentralized-convex/plugin";
 import { ConvexError, v } from "convex/values";
 
+import type { RoutedQueryResult } from "./routed-query.ts";
+import { isRoutedQueryResult } from "./routed-query.ts";
+
 export interface DispatcherIdentity {
   readonly accountId?: string;
   readonly email?: string;
@@ -61,6 +64,16 @@ export type OperationHandlers<Operations extends OperationMap, Context> = {
   ) => MaybePromise<OperationResult<Operations[Name]>>;
 };
 
+export type QueryOperationHandlers<Operations extends OperationMap, Context> = {
+  readonly [Name in keyof Operations]: (
+    ctx: Context,
+    request: OperationHandlerContext<OperationArgs<Operations[Name]>>,
+  ) => MaybePromise<
+    | OperationResult<Operations[Name]>
+    | RoutedQueryResult<OperationResult<Operations[Name]>>
+  >;
+};
+
 export function defineComponentDispatchers<
   DataModel extends GenericDataModel,
   const Name extends string,
@@ -79,7 +92,10 @@ export function defineComponentDispatchers<
       Mutations,
       GenericMutationCtx<DataModel>
     >;
-    readonly queries: OperationHandlers<Queries, GenericQueryCtx<DataModel>>;
+    readonly queries: QueryOperationHandlers<
+      Queries,
+      GenericQueryCtx<DataModel>
+    >;
   };
   readonly mutation: MutationBuilder<DataModel, "public">;
   readonly protocol: PluginProtocol<
@@ -124,18 +140,21 @@ export function defineComponentDispatchers<
         version: v.literal(protocol.version),
       },
       returns: queryReturns,
-      handler: async (ctx, { identity, operation }) =>
+      handler: async (ctx, { identity, operation }) => {
+        const result = await invokeQueryOperation(
+          handlers.queries,
+          ctx,
+          identity,
+          operation,
+        );
         // Convex applies a top-level nullability transform that cannot be proven for an open union.
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        ({
+        return {
+          ...(isRoutedQueryResult(result) ? { routes: result.routes } : {}),
           type: operation.type,
-          value: await invokeOperation(
-            handlers.queries,
-            ctx,
-            identity,
-            operation,
-          ),
-        }) as ValidatorTypeToReturnType<OperationResponse<Queries>>,
+          value: isRoutedQueryResult(result) ? result.data : result,
+        } as ValidatorTypeToReturnType<OperationResponse<Queries>>;
+      },
     }),
   } as const;
 }
@@ -159,6 +178,7 @@ type ComponentMutation = FunctionReference<
 >;
 
 interface DispatcherResponse {
+  readonly routes?: readonly string[];
   readonly type: string;
   readonly value: Value;
 }
@@ -201,12 +221,38 @@ export function definePdsRouter<DataModel extends GenericDataModel>({
           operation: request.operation,
           version: request.version,
         });
-        return response.value;
+        return {
+          routes: response.routes ?? [],
+          value: response.value,
+        };
       },
     }),
   } as const;
 }
 
+function invokeQueryOperation<Operations extends OperationMap, Context>(
+  handlers: QueryOperationHandlers<Operations, Context>,
+  ctx: Context,
+  identity: DispatcherIdentity | null,
+  operation: OperationRequest<Operations>,
+): MaybePromise<
+  | OperationResult<Operations[keyof Operations]>
+  | RoutedQueryResult<OperationResult<Operations[keyof Operations]>>
+> {
+  const handler = handlers[operation.type];
+  if (typeof handler !== "function") {
+    throw new ConvexError({
+      code: "UNKNOWN_PLUGIN_OPERATION",
+      operation: operation.type,
+    });
+  }
+
+  return Reflect.apply(handler, undefined, [
+    ctx,
+    { args: operation.args, identity },
+  ]);
+}
+
 function invokeOperation<Operations extends OperationMap, Context>(
   handlers: OperationHandlers<Operations, Context>,
   ctx: Context,
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
index b48035c9..cf70aea1 100644
--- a/packages/decentralized-convex-server/src/index.ts
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -31,4 +31,7 @@ export type {
   DispatcherIdentity,
   OperationHandlerContext,
   OperationHandlers,
+  QueryOperationHandlers,
 } from "./dispatcher.ts";
+export { routedQueryResult } from "./routed-query.ts";
+export type { RoutedQueryResult } from "./routed-query.ts";
diff --git a/packages/decentralized-convex-server/src/routed-query.ts b/packages/decentralized-convex-server/src/routed-query.ts
new file mode 100644
index 00000000..763c824e
--- /dev/null
+++ b/packages/decentralized-convex-server/src/routed-query.ts
@@ -0,0 +1,26 @@
+import type { Value } from "convex/values";
+
+const RoutedQueryResultMarker = Symbol("RoutedQueryResult");
+
+export interface RoutedQueryResult<Result> {
+  readonly [RoutedQueryResultMarker]: true;
+  readonly data: Result;
+  readonly routes: readonly string[];
+}
+
+export function routedQueryResult<Result>(
+  data: Result,
+  routes: readonly string[],
+): RoutedQueryResult<Result> {
+  return { [RoutedQueryResultMarker]: true, data, routes };
+}
+
+export function isRoutedQueryResult(
+  value: unknown,
+): value is RoutedQueryResult<Value> {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    RoutedQueryResultMarker in value
+  );
+}
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
index dc1f0a6f..5131c2d7 100644
--- a/packages/decentralized-convex-tanstack-query/README.md
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -28,16 +28,12 @@ const messages = useQuery({
 Connect the decentralized transport once when creating an account session:
 
 ```ts
-const pdsQueryClient = new PdsQueryClient({
-  client,
-  mutationTarget: home,
-  queryTargets: conversationHomes,
-});
+const pdsQueryClient = new PdsQueryClient(client);
 
 const disconnect = pdsQueryClient.connect(queryClient);
 ```
 
-`PdsQueryClient` updates TanStack's cache from live Convex subscriptions. Static
-targets are sufficient for the current prototype; the resolver forms of
-`queryTargets` and `mutationTarget` are the extension point for automatic
-home-first routing.
+`PdsQueryClient` updates TanStack's cache from live Convex subscriptions. The
+core client owns home-first routing, PDS discovery, connection reuse, and
+author-home mutations; the TanStack adapter only bridges those results into the
+application's cache.
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index e9e3987f..12b2c3cf 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -6,11 +6,6 @@ export {
   PdsQueryClient,
   usePdsQueryState,
 } from "./pds.ts";
-export type {
-  PdsMutationTargetResolver,
-  PdsQueryClientOptions,
-  PdsQueryKey,
-  PdsQueryTargetResolver,
-} from "./pds.ts";
+export type { PdsQueryKey } from "./pds.ts";
 export { useFederatedQuery } from "./useFederatedQuery.ts";
 export type { FederatedTanStackQueryResult } from "./useFederatedQuery.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index 0e38fc8a..c481d030 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -47,16 +47,13 @@ void test("produces native TanStack query and mutation options", async () => {
       connections.set(url, connection);
       return connection;
     },
+    pds: {
+      discover: (domain) => Promise.resolve(discoveredPds(domain)),
+      home: discoveredPds("a.test"),
+    },
   });
   const queryClient = new QueryClient();
-  const adapter = new PdsQueryClient({
-    client: transport,
-    mutationTarget: { id: "alice@a.test", url: "https://a.test" },
-    queryTargets: [
-      { id: "alice@a.test", url: "https://a.test" },
-      { id: "bob@b.test", url: "https://b.test" },
-    ],
-  });
+  const adapter = new PdsQueryClient(transport);
   const disconnect = adapter.connect(queryClient);
 
   const query = pdsQuery(listNotes, { owner: "alice" });
@@ -114,7 +111,10 @@ class MemoryConnection implements FederationConnection {
     args: FunctionArgs<Query>,
   ): Promise<FunctionReturnType<Query>> {
     const owner = operationArgs(args).owner;
-    const result = [{ body: this.#url, id: owner }];
+    const result = {
+      routes: this.#url === "https://a.test" ? ["a.test", "b.test"] : [],
+      value: [{ body: this.#url, id: owner }],
+    };
     // The fake connection cannot derive a concrete result from an arbitrary reference.
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     return Promise.resolve(result) as Promise<FunctionReturnType<Query>>;
@@ -125,9 +125,13 @@ class MemoryConnection implements FederationConnection {
     args: FunctionArgs<Query>,
     onResult: (result: FunctionReturnType<Query>) => void,
   ) {
+    const routes = this.#url === "https://a.test" ? ["a.test", "b.test"] : [];
     function publish(body: string) {
       const owner = operationArgs(args).owner;
-      const result = [{ body, id: owner }];
+      const result = {
+        routes,
+        value: [{ body, id: owner }],
+      };
       // The fake connection cannot derive a concrete result from an arbitrary reference.
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       onResult(result as FunctionReturnType<Query>);
@@ -142,6 +146,19 @@ class MemoryConnection implements FederationConnection {
   }
 }
 
+function discoveredPds(domain: string) {
+  return {
+    domain,
+    manifest: {
+      accountDomain: domain,
+      deploymentUrl: `https://${domain}`,
+      httpUrl: `https://${domain}`,
+      protocolVersion: "0.1" as const,
+    },
+    manifestUrl: `https://${domain}/.well-known/pds.json`,
+  };
+}
+
 function nextTask() {
   return new Promise<void>((resolve) => setTimeout(resolve, 0));
 }
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
index a0cdd251..e036e413 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -4,7 +4,6 @@ import type {
   DecentralizedConvexClient,
   DefaultCombinedPdsResult,
   FederatedQuerySnapshot,
-  FederationTarget,
   PdsRequest,
   PdsRequestResult,
 } from "@decentralized-convex/client";
@@ -21,27 +20,10 @@ import {
   queryOptions,
   useQueryClient,
 } from "@tanstack/react-query";
-import { groupFederationTargets } from "@decentralized-convex/client";
 
 const PDS_QUERY_META_KEY = "decentralizedConvexPdsQuery";
 const connectedClients = new WeakMap<QueryClient, PdsQueryClient>();
 
-type MaybePromise<Value> = Promise<Value> | Value;
-
-export type PdsQueryTargetResolver = (
-  request: AnyPdsQueryRequest,
-) => MaybePromise<readonly FederationTarget[]>;
-
-export type PdsMutationTargetResolver = (
-  request: AnyPdsMutationRequest,
-) => MaybePromise<FederationTarget>;
-
-export interface PdsQueryClientOptions {
-  client: DecentralizedConvexClient;
-  mutationTarget: FederationTarget | PdsMutationTargetResolver;
-  queryTargets: readonly FederationTarget[] | PdsQueryTargetResolver;
-}
-
 interface ActiveQuery {
   cancelled: boolean;
   close?: () => void;
@@ -58,14 +40,10 @@ export class PdsQueryClient {
   readonly #client;
   readonly #connections = new Map<QueryClient, () => void>();
   readonly #listeners = new Map<string, Set<() => void>>();
-  readonly #mutationTarget;
-  readonly #queryTargets;
   readonly #snapshots = new Map<string, UnknownSnapshot>();
 
-  constructor(options: PdsQueryClientOptions) {
-    this.#client = options.client;
-    this.#mutationTarget = options.mutationTarget;
-    this.#queryTargets = options.queryTargets;
+  constructor(client: DecentralizedConvexClient) {
+    this.#client = client;
   }
 
   connect(queryClient: QueryClient) {
@@ -130,8 +108,7 @@ export class PdsQueryClient {
     request: Request,
     queryKey: QueryKey,
   ): Promise<DefaultCombinedPdsResult<Request>> {
-    const targets = await this.#resolveQueryTargets(request);
-    const snapshot = await this.#client.pdsQuery({ request, targets });
+    const snapshot = await this.#client.pdsQuery(request);
     this.#publish(hashKey(queryKey), snapshot);
     if (snapshot.status === "error") throw allTargetsFailed(snapshot);
     return snapshot.data;
@@ -140,11 +117,7 @@ export class PdsQueryClient {
   async mutate<Request extends AnyPdsMutationRequest>(
     request: Request,
   ): Promise<PdsRequestResult<Request>> {
-    const target =
-      typeof this.#mutationTarget === "function"
-        ? await this.#mutationTarget(request)
-        : this.#mutationTarget;
-    return this.#client.pdsMutation(target, request);
+    return this.#client.pdsMutation(request);
   }
 
   getSnapshot<Request extends AnyPdsQueryRequest>(
@@ -157,15 +130,9 @@ export class PdsQueryClient {
     const queryHash = hashKey(queryKey);
     let snapshot = this.#snapshots.get(queryHash);
     if (snapshot === undefined) {
-      const targets = Array.isArray(this.#queryTargets)
-        ? groupFederationTargets(this.#queryTargets)
-        : [];
       snapshot = {
         data: [],
-        sources: targets.map((target) => ({
-          status: "pending" as const,
-          target,
-        })),
+        sources: [],
         status: "pending",
       };
       this.#snapshots.set(queryHash, snapshot);
@@ -190,12 +157,6 @@ export class PdsQueryClient {
     };
   }
 
-  async #resolveQueryTargets(request: AnyPdsQueryRequest) {
-    return typeof this.#queryTargets === "function"
-      ? await this.#queryTargets(request)
-      : this.#queryTargets;
-  }
-
   #publish(queryHash: string, snapshot: UnknownSnapshot) {
     this.#snapshots.set(queryHash, snapshot);
     for (const listener of this.#listeners.get(queryHash) ?? []) listener();
@@ -209,27 +170,20 @@ export class PdsQueryClient {
 
     const active: ActiveQuery = { cancelled: false };
     this.#activeQueries.set(query.queryHash, active);
-    void this.#resolveQueryTargets(request)
-      .then((targets) => {
-        if (active.cancelled) return;
-        const observer = this.#client.watchPdsQuery({ request, targets });
-        const publish = () => {
-          const snapshot = observer.getSnapshot();
-          this.#publish(hashKey(query.queryKey), snapshot);
-          if (snapshot.status === "success" || snapshot.status === "partial") {
-            queryClient.setQueryData(query.queryKey, snapshot.data);
-          }
-        };
-        const unsubscribe = observer.subscribe(publish);
-        active.close = () => {
-          unsubscribe();
-          observer.close();
-        };
-        publish();
-      })
-      .catch(() => {
-        // The ordinary TanStack query function owns and exposes routing errors.
-      });
+    const observer = this.#client.watchPdsQuery(request);
+    const publish = () => {
+      const snapshot = observer.getSnapshot();
+      this.#publish(hashKey(query.queryKey), snapshot);
+      if (snapshot.status === "success" || snapshot.status === "partial") {
+        queryClient.setQueryData(query.queryKey, snapshot.data);
+      }
+    };
+    const unsubscribe = observer.subscribe(publish);
+    active.close = () => {
+      unsubscribe();
+      observer.close();
+    };
+    publish();
   }
 
   #stopQuery(queryHash: string) {

From 79dc1a53cdf3be38b9961e78b2e04976ff48a6b4 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 13:17:47 -0400
Subject: [PATCH 07/17] Clarify home PDS discovery flow

---
 apps/web/README.md                            | 17 +++++++++++++++
 .../web/src/features/account/AccountEntry.tsx |  9 ++++----
 .../src/features/account/AccountSession.tsx   | 15 +++++++------
 apps/web/src/features/account/SignInForm.tsx  |  4 ++--
 .../features/conversation/Conversation.tsx    | 10 ++++-----
 apps/web/src/features/pds/auth.ts             | 21 +++++++++----------
 apps/web/src/features/pds/model.ts            | 20 ++----------------
 apps/web/src/routes/index.tsx                 |  4 ++--
 8 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/apps/web/README.md b/apps/web/README.md
index b6fb4fb1..11bafb93 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -24,6 +24,23 @@ Open `https://www.vera.localhost` and:
 3. Send messages. Vera reads the conversation from both development PDSs with
    the one home login.
 
+Home discovery happens before sign-in. The address entry screen resolves the
+account domain and keeps that verified descriptor as `home`; both auth and the
+decentralized client use the same value:
+
+```ts
+const home = await discoverPds("alice@a.vera.chat");
+
+const authClient = createHomeAuthClient(home);
+const client = new DecentralizedConvexClient({
+  getAuthToken,
+  pds: { home },
+});
+```
+
+Signing in creates the authenticated session on that already-discovered home.
+It does not produce or replace the `home` value.
+
 Each signup and outgoing message is stored only on the selected home
 deployment. Each home keeps its own isolated Better Auth and Messages Component
 data. The home PDS issues a short-lived, destination-bound identity proof; the
diff --git a/apps/web/src/features/account/AccountEntry.tsx b/apps/web/src/features/account/AccountEntry.tsx
index 013ac5e5..f4556202 100644
--- a/apps/web/src/features/account/AccountEntry.tsx
+++ b/apps/web/src/features/account/AccountEntry.tsx
@@ -2,11 +2,10 @@ import type { FormEvent } from "react";
 import { useState } from "react";
 import { discoverPds } from "@decentralized-convex/client";
 
-import type { PdsHome } from "../pds/model.ts";
-import { pdsHomeFromDiscovery } from "../pds/model.ts";
+import type { HomePds } from "../pds/model.ts";
 
 interface AccountEntryProps {
-  onSelect: (selection: { home: PdsHome; username: string }) => void;
+  onSelect: (selection: { home: HomePds; username: string }) => void;
 }
 
 export function AccountEntry({ onSelect }: AccountEntryProps) {
@@ -27,8 +26,8 @@ export function AccountEntry({ onSelect }: AccountEntryProps) {
 
     setLoading(true);
     try {
-      const discovery = await discoverPds(normalized);
-      onSelect({ home: pdsHomeFromDiscovery(discovery), username });
+      const home = await discoverPds(normalized);
+      onSelect({ home, username });
     } catch (cause) {
       setError(cause instanceof Error ? cause.message : "PDS discovery failed");
     } finally {
diff --git a/apps/web/src/features/account/AccountSession.tsx b/apps/web/src/features/account/AccountSession.tsx
index ff73562f..c48f168f 100644
--- a/apps/web/src/features/account/AccountSession.tsx
+++ b/apps/web/src/features/account/AccountSession.tsx
@@ -12,7 +12,7 @@ import { api } from "@vera/backend/api";
 import { ConvexReactClient, useConvexAuth } from "convex/react";
 
 import type { HomeAuthClient } from "../pds/auth.ts";
-import type { PdsHome } from "../pds/model.ts";
+import type { HomePds } from "../pds/model.ts";
 import { Conversation } from "../conversation/Conversation.tsx";
 import {
   createFederationAuthTokenFetcher,
@@ -21,7 +21,7 @@ import {
 import { SignInForm } from "./SignInForm.tsx";
 
 interface AccountSessionProps {
-  home: PdsHome;
+  home: HomePds;
   initialUsername: string;
   onBack: () => void;
 }
@@ -29,7 +29,10 @@ interface AccountSessionProps {
 export function AccountSession(props: AccountSessionProps) {
   const [authClient] = useState(() => createHomeAuthClient(props.home));
   const [convex] = useState(
-    () => new ConvexReactClient(props.home.convexUrl, { expectAuth: true }),
+    () =>
+      new ConvexReactClient(props.home.manifest.deploymentUrl, {
+        expectAuth: true,
+      }),
   );
   // Better Auth's provider erases the concrete plugins returned by createAuthClient.
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -98,7 +101,7 @@ function AuthenticatedAccount({
   );
 }
 
-function useConversationFederation(authClient: HomeAuthClient, home: PdsHome) {
+function useConversationFederation(authClient: HomeAuthClient, home: HomePds) {
   const queryClient = useQueryClient();
   const [federation, setFederation] = useState<
     { client: DecentralizedConvexClient } | { error: Error }
@@ -113,7 +116,7 @@ function useConversationFederation(authClient: HomeAuthClient, home: PdsHome) {
       try {
         const client = new DecentralizedConvexClient({
           getAuthToken: createFederationAuthTokenFetcher({ authClient, home }),
-          pds: { home: home.discovery },
+          pds: { home },
         });
         nextClient = client;
         const pdsQueryClient = new PdsQueryClient(client);
@@ -135,7 +138,7 @@ function useConversationFederation(authClient: HomeAuthClient, home: PdsHome) {
   return federation;
 }
 
-function Connecting({ home }: { home: PdsHome }) {
+function Connecting({ home }: { home: HomePds }) {
   return (
     <main className="account-shell">
       <section className="account-panel loading-panel">
diff --git a/apps/web/src/features/account/SignInForm.tsx b/apps/web/src/features/account/SignInForm.tsx
index 25dcf372..24f655ef 100644
--- a/apps/web/src/features/account/SignInForm.tsx
+++ b/apps/web/src/features/account/SignInForm.tsx
@@ -2,11 +2,11 @@ import type { FormEvent } from "react";
 import { useState } from "react";
 
 import type { HomeAuthClient } from "../pds/auth.ts";
-import type { PdsHome } from "../pds/model.ts";
+import type { HomePds } from "../pds/model.ts";
 
 interface SignInFormProps {
   authClient: HomeAuthClient;
-  home: PdsHome;
+  home: HomePds;
   initialUsername: string;
   onBack: () => void;
 }
diff --git a/apps/web/src/features/conversation/Conversation.tsx b/apps/web/src/features/conversation/Conversation.tsx
index b0c533e9..71058fdf 100644
--- a/apps/web/src/features/conversation/Conversation.tsx
+++ b/apps/web/src/features/conversation/Conversation.tsx
@@ -5,11 +5,11 @@ import type {
 import type { Message as ChatMessage } from "@decentralized-convex/messages";
 import type { FormEvent } from "react";
 
-import type { PdsHome } from "../pds/model.ts";
+import type { HomePds } from "../pds/model.ts";
 import { useConversation } from "./useConversation.ts";
 
 interface ConversationProps {
-  home: PdsHome;
+  home: HomePds;
   onChangeAccount: () => void;
   onSignOut: () => Promise<unknown>;
   user: { actor: string };
@@ -83,7 +83,7 @@ function ConversationHeader({
   home,
   messages,
 }: {
-  home: PdsHome;
+  home: HomePds;
   messages: ConversationMessages;
 }) {
   const { sources, status } = messages.federation;
@@ -115,7 +115,7 @@ function ConnectionDiagnostics({
   home,
   sources,
 }: {
-  home: PdsHome;
+  home: HomePds;
   sources: readonly FederationSourceSnapshot<ChatMessage[]>[];
 }) {
   return (
@@ -155,7 +155,7 @@ function MessageList({
   home,
   messages,
 }: {
-  home: PdsHome;
+  home: HomePds;
   messages: {
     data?: readonly ChatMessage[];
     federation: {
diff --git a/apps/web/src/features/pds/auth.ts b/apps/web/src/features/pds/auth.ts
index 2bd560b9..c86be28c 100644
--- a/apps/web/src/features/pds/auth.ts
+++ b/apps/web/src/features/pds/auth.ts
@@ -5,12 +5,11 @@ import {
 } from "@convex-dev/better-auth/client/plugins";
 import { createAuthClient } from "better-auth/react";
 
-import type { PdsHome } from "./model.ts";
-import { pdsHomeFromDiscovery } from "./model.ts";
+import type { HomePds } from "./model.ts";
 
-export function createHomeAuthClient(home: PdsHome) {
+export function createHomeAuthClient(home: HomePds) {
   return createAuthClient({
-    baseURL: home.siteUrl,
+    baseURL: home.manifest.httpUrl,
     plugins: [
       convexClient(),
       crossDomainClient({ storagePrefix: `vera-${home.domain}` }),
@@ -22,7 +21,7 @@ export type HomeAuthClient = ReturnType<typeof createHomeAuthClient>;
 
 interface FederationAuthOptions {
   authClient: HomeAuthClient;
-  home: PdsHome;
+  home: HomePds;
 }
 
 interface CachedToken {
@@ -41,14 +40,14 @@ export function createFederationAuthTokenFetcher({
   const cache = new Map<string, CachedToken>();
 
   return async ({ forceRefreshToken, pds, url }) => {
-    if (url === home.convexUrl) return getHomeToken(authClient);
+    if (url === home.manifest.deploymentUrl) return getHomeToken(authClient);
     if (pds === undefined) return null;
     return getRemoteToken({
       authClient,
       cache,
       forceRefreshToken,
       home,
-      target: pdsHomeFromDiscovery(pds),
+      target: pds,
       url,
     });
   };
@@ -72,8 +71,8 @@ async function getRemoteToken({
   authClient: HomeAuthClient;
   cache: Map<string, CachedToken>;
   forceRefreshToken: boolean;
-  home: PdsHome;
-  target: PdsHome;
+  home: HomePds;
+  target: HomePds;
   url: string;
 }) {
   const cached = cache.get(url);
@@ -90,7 +89,7 @@ async function getRemoteToken({
   if (sessionToken === undefined) return null;
 
   const assertionResponse = await postJson(
-    `${home.siteUrl}/api/auth/federation/assertion`,
+    `${home.manifest.httpUrl}/api/auth/federation/assertion`,
     { audience: target.domain },
     { authorization: `Bearer ${sessionToken}` },
   );
@@ -106,7 +105,7 @@ async function getRemoteToken({
     "assertion",
   );
   const exchangeResponse = await postJson(
-    `${target.siteUrl}/api/auth/federation/exchange`,
+    `${target.manifest.httpUrl}/api/auth/federation/exchange`,
     { assertion },
   );
   if (!exchangeResponse.ok) {
diff --git a/apps/web/src/features/pds/model.ts b/apps/web/src/features/pds/model.ts
index 245b9c24..042dae56 100644
--- a/apps/web/src/features/pds/model.ts
+++ b/apps/web/src/features/pds/model.ts
@@ -1,13 +1,7 @@
 import type { DiscoveredPds } from "@decentralized-convex/client";
 
-/** Everything the client learns about one account's home PDS. */
-export interface PdsHome {
-  convexUrl: string;
-  discovery: DiscoveredPds;
-  domain: string;
-  manifestUrl: string;
-  siteUrl: string;
-}
+/** The verified PDS descriptor discovered from an account address. */
+export type HomePds = DiscoveredPds;
 
 /**
  * The proven two-home conversation. Real conversation discovery will replace
@@ -17,13 +11,3 @@ export const prototypeConversation = {
   id: "conversation:direct:a.vera.chat:b.vera.chat",
   participants: ["a.vera.chat", "b.vera.chat"],
 } as const;
-
-export function pdsHomeFromDiscovery(discovery: DiscoveredPds): PdsHome {
-  return {
-    convexUrl: discovery.manifest.deploymentUrl,
-    discovery,
-    domain: discovery.domain,
-    manifestUrl: discovery.manifestUrl,
-    siteUrl: discovery.manifest.httpUrl,
-  };
-}
diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx
index 66a9f79d..7e1173cc 100644
--- a/apps/web/src/routes/index.tsx
+++ b/apps/web/src/routes/index.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { createFileRoute } from "@tanstack/react-router";
 
-import type { PdsHome } from "../features/pds/model.ts";
+import type { HomePds } from "../features/pds/model.ts";
 import { AccountEntry } from "../features/account/AccountEntry.tsx";
 import { AccountSession } from "../features/account/AccountSession.tsx";
 
@@ -9,7 +9,7 @@ export const Route = createFileRoute("/")({ component: Home });
 
 function Home() {
   const [selection, setSelection] = useState<{
-    home: PdsHome;
+    home: HomePds;
     username: string;
   }>();
   if (selection !== undefined) {

From 30eda3935a0cf2ad72753f78c28fd2e8b8c812ab Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 14:26:46 -0400
Subject: [PATCH 08/17] Establish decentralized Convex 0.1.0 versioning

---
 AGENTS.md                                     |  17 +++
 README.md                                     |   7 +-
 apps/web/README.md                            |   5 +-
 apps/web/package.json                         |   8 +-
 .../web/src/features/account/AccountEntry.tsx |   8 +-
 docs/architecture.md                          |  15 +--
 docs/versioning.md                            |  58 ++++++++++
 package.json                                  |   4 +-
 .../_generated/component.ts                   |   6 +-
 .../package.json                              |   7 +-
 .../decentralized-convex-accounts/protocol.ts |   3 +-
 .../decentralized-convex-address/package.json |   5 +-
 .../src/discovery.test.ts                     |  11 +-
 .../src/discovery.ts                          |  34 +++---
 .../decentralized-convex-address/src/index.ts |   2 +-
 .../decentralized-convex-client/README.md     |   6 ++
 .../decentralized-convex-client/package.json  |   7 +-
 .../decentralized-convex-client/src/api.ts    |  44 ++++++++
 .../src/client.test.ts                        |   3 +-
 .../decentralized-convex-client/src/client.ts |  18 ++--
 .../src/compatibility.test.ts                 |  95 ++++++++++++++++
 .../src/compatibility.ts                      |  64 +++++++++++
 .../decentralized-convex-client/src/index.ts  |  14 ++-
 .../src/pds.test.ts                           |  18 +++-
 .../decentralized-convex-client/src/pds.ts    |   4 +-
 .../src/pds.type-test.ts                      |   3 +-
 .../eslint.config.ts                          |   5 +
 .../decentralized-convex-core/package.json    |  28 +++++
 .../src/index.test.ts                         |  18 ++++
 .../decentralized-convex-core/src/index.ts    |  33 ++++++
 .../decentralized-convex-core/tsconfig.json   |   9 ++
 .../_generated/component.ts                   |   6 +-
 .../package.json                              |   7 +-
 .../decentralized-convex-messages/protocol.ts |   8 +-
 .../decentralized-convex-plugin/README.md     |  17 +--
 .../decentralized-convex-plugin/package.json  |   3 +-
 .../src/operations.test.ts                    |   5 +-
 .../src/operations.ts                         |  35 ++++--
 .../src/protocol-graph.test.ts                |  13 +--
 .../decentralized-convex-react/package.json   |   4 +-
 .../decentralized-convex-server/README.md     |   5 +-
 .../decentralized-convex-server/package.json  |   5 +-
 .../src/app.test.ts                           |  19 +++-
 .../decentralized-convex-server/src/app.ts    |  35 +++++-
 .../src/app.type-test.ts                      |  25 +++--
 .../src/descriptor.test.ts                    |  10 +-
 .../src/descriptor.ts                         |   5 +-
 .../src/dispatcher-types.ts                   |  45 ++++++++
 .../src/dispatcher.ts                         |  59 ++++------
 .../decentralized-convex-server/src/index.ts  |   2 +
 .../package.json                              |   8 +-
 .../src/pds.test.ts                           |  19 +++-
 pnpm-lock.yaml                                |  84 +++++++++++----
 scripts/check-decentralized-convex-release.ts | 101 ++++++++++++++++++
 services/backend/convex/http.ts               |  25 +++--
 services/backend/package.json                 |  10 +-
 56 files changed, 911 insertions(+), 203 deletions(-)
 create mode 100644 docs/versioning.md
 create mode 100644 packages/decentralized-convex-client/src/compatibility.test.ts
 create mode 100644 packages/decentralized-convex-client/src/compatibility.ts
 create mode 100644 packages/decentralized-convex-core/eslint.config.ts
 create mode 100644 packages/decentralized-convex-core/package.json
 create mode 100644 packages/decentralized-convex-core/src/index.test.ts
 create mode 100644 packages/decentralized-convex-core/src/index.ts
 create mode 100644 packages/decentralized-convex-core/tsconfig.json
 create mode 100644 packages/decentralized-convex-server/src/dispatcher-types.ts
 create mode 100644 scripts/check-decentralized-convex-release.ts

diff --git a/AGENTS.md b/AGENTS.md
index f15cb7d7..99ff9353 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -16,3 +16,20 @@ If all of these succeed, run:
 4. `pnpm run format:fix`
 
 Then summarize changes for the user.
+
+## Decentralized Convex Release Invariant
+
+All official `@decentralized-convex/*` packages and the wire protocol use one
+exact ecosystem version. The source of truth is
+`packages/decentralized-convex-core/src/index.ts`.
+
+- Never version one decentralized Convex package independently.
+- On every release, bump every `@decentralized-convex/*` `package.json` and
+  every internal `workspace:<version>` dependency together.
+- Update `DECENTRALIZED_CONVEX_LAST_CHANGED` only for packages or wire
+  contracts that actually changed in that release.
+- Do not write a plugin protocol version manually; `definePluginProtocol`
+  injects the ecosystem version.
+- Run `pnpm run decentralized-convex:check`; it is also enforced by lint.
+- Component data upgrades belong behind the PDS management surface. Do not ask
+  application developers to run plugin-specific migration commands directly.
diff --git a/README.md b/README.md
index eb5feba4..5a3efd35 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,8 @@ Read these files in order to follow one request end to end:
    client API used for reactive reads and writes.
 
 The longer explanation is in [docs/architecture.md](docs/architecture.md).
+The lockstep `0.1.0` release and upgrade rules are in
+[docs/versioning.md](docs/versioning.md).
 
 ## The default setup
 
@@ -40,7 +42,8 @@ export default definePdsApp({
 });
 ```
 
-Messages declares `requires: { accounts: "1" }`. Removing Accounts or
+Messages declares an exact dependency on Accounts at the shared ecosystem
+version. Removing Accounts or
 installing an incompatible version fails type-checking. The normal
 `convex dev`, `convex deploy`, and `convex codegen` commands remain unchanged.
 
@@ -70,6 +73,8 @@ authentication remain available when an application needs control.
 
 - `packages/decentralized-convex-plugin` — operation protocols and dependency
   graph validation
+- `packages/decentralized-convex-core` — the single ecosystem version and
+  last-changed release metadata
 - `packages/decentralized-convex-server` — PDS installation, root dispatch,
   Component dispatch, and discovery descriptors
 - `packages/decentralized-convex-client` — discovery, connections, typed calls,
diff --git a/apps/web/README.md b/apps/web/README.md
index 11bafb93..13b4b059 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -29,7 +29,10 @@ account domain and keeps that verified descriptor as `home`; both auth and the
 decentralized client use the same value:
 
 ```ts
-const home = await discoverPds("alice@a.vera.chat");
+const home = assertPdsCompatibility(
+  await discoverPds("alice@a.vera.chat"),
+  pds,
+);
 
 const authClient = createHomeAuthClient(home);
 const client = new DecentralizedConvexClient({
diff --git a/apps/web/package.json b/apps/web/package.json
index c78d48f9..b8697709 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "@convex-dev/better-auth": "0.12.5",
-    "@decentralized-convex/client": "workspace:*",
-    "@decentralized-convex/messages": "workspace:*",
-    "@decentralized-convex/react": "workspace:*",
-    "@decentralized-convex/tanstack-query": "workspace:*",
+    "@decentralized-convex/client": "workspace:0.1.0",
+    "@decentralized-convex/messages": "workspace:0.1.0",
+    "@decentralized-convex/react": "workspace:0.1.0",
+    "@decentralized-convex/tanstack-query": "workspace:0.1.0",
     "@tanstack/react-query": "catalog:",
     "@tanstack/react-router": "catalog:",
     "@tanstack/react-router-ssr-query": "catalog:",
diff --git a/apps/web/src/features/account/AccountEntry.tsx b/apps/web/src/features/account/AccountEntry.tsx
index f4556202..8d0e4638 100644
--- a/apps/web/src/features/account/AccountEntry.tsx
+++ b/apps/web/src/features/account/AccountEntry.tsx
@@ -1,6 +1,10 @@
 import type { FormEvent } from "react";
 import { useState } from "react";
-import { discoverPds } from "@decentralized-convex/client";
+import {
+  assertPdsCompatibility,
+  discoverPds,
+} from "@decentralized-convex/client";
+import { pds } from "@vera/backend/pds";
 
 import type { HomePds } from "../pds/model.ts";
 
@@ -26,7 +30,7 @@ export function AccountEntry({ onSelect }: AccountEntryProps) {
 
     setLoading(true);
     try {
-      const home = await discoverPds(normalized);
+      const home = assertPdsCompatibility(await discoverPds(normalized), pds);
       onSelect({ home, username });
     } catch (cause) {
       setError(cause instanceof Error ? cause.message : "PDS discovery failed");
diff --git a/docs/architecture.md b/docs/architecture.md
index 0e56db2b..e6e1837d 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -6,16 +6,17 @@ A plugin protocol is the source of truth for four things:
 
 ```ts
 export const messagesProtocol = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.messages,
   name: "messages",
-  version: "1",
-  requires: { accounts: "1" },
+  requires: { accounts: DECENTRALIZED_CONVEX_VERSION },
   queries: { list: defineOperation(/* validators */) },
   mutations: { send: defineOperation(/* validators */) },
 });
 ```
 
 - `name` is the Convex Component install name and wire plugin discriminator.
-- `version` is checked by the client, root router, Component, and manifest.
+- the ecosystem `version` is injected from one release source of truth;
+- `lastChanged` records when this plugin's wire contract actually changed;
 - `requires` is validated against the complete deployment at type-check and
   Convex config evaluation time.
 - operation validators produce client argument/result types and enforce the
@@ -32,7 +33,7 @@ required by Convex and never manually pairs a Component with its protocol.
 
 The host calls `definePdsApp({ plugins, components })`. It:
 
-1. checks duplicate names, missing plugins, and incompatible exact versions
+1. checks duplicate names, missing plugins, and incompatible ecosystem versions
    through the plugin tuple's TypeScript type;
 2. installs each plugin as a normal Convex Component;
 3. installs unrelated Components such as Better Auth without treating them as
@@ -65,7 +66,7 @@ useQuery(pdsQuery(...))
   -> pds:dispatchQuery on each discovered deployment
   -> root authentication and plugin selection
   -> messages.dispatcher.dispatchQuery
-  -> exact operation/version/argument validation
+  -> exact operation/last-changed/argument validation
   -> list handler and Component database
   -> per-source results merged into the application's TanStack cache
 ```
@@ -123,6 +124,6 @@ Still prototype-only:
   implemented;
 - the UI holds one active account rather than concurrent accounts;
 - auth lacks scopes, revocation, replay limits, and resource-specific policy;
-- plugin version ranges, migrations, upgrades, and large plugin graphs need a
-  production design;
+- Component migration execution, persisted upgrade state, and large plugin
+  graphs still need a production design;
 - packages are private workspace packages and self-hosting is not productized.
diff --git a/docs/versioning.md b/docs/versioning.md
new file mode 100644
index 00000000..80295a38
--- /dev/null
+++ b/docs/versioning.md
@@ -0,0 +1,58 @@
+# Decentralized Convex versioning and upgrades
+
+## One ecosystem version
+
+Every official `@decentralized-convex/*` npm package, plugin protocol, client
+request, and server release uses one exact version. The initial release is
+`0.1.0`. If any constituent changes, every package is republished together.
+
+The source of truth is
+`packages/decentralized-convex-core/src/index.ts`. It contains:
+
+- the current ecosystem version;
+- the ordered set of known releases;
+- `lastChanged`, recording the ecosystem release in which each package or wire
+  contract last actually changed.
+
+`scripts/check-decentralized-convex-release.ts` verifies every official package
+version and every internal dependency. It runs as part of `pnpm run lint`.
+`definePluginProtocol` injects the ecosystem version, so plugin authors cannot
+accidentally publish a different protocol version.
+
+## Client-to-PDS compatibility
+
+The PDS discovery descriptor advertises its current ecosystem version, when
+the core wire contract last changed, and when each installed plugin contract
+last changed. The generated application API embeds the same requirements.
+
+Compatibility currently uses the conservative rule that every required
+`lastChanged` value must match exactly. The overall ecosystem versions do not
+need to match: a newer PDS is compatible when the contracts used by the client
+are unchanged. Requests carry the client's ecosystem version for diagnostics
+and the plugin's `lastChanged` value for server validation.
+
+## Component upgrades
+
+Each plugin is a Convex Component and owns its tables. Plugin packages will
+eventually ship ordered migrations, while the PDS management surface will own
+planning, starting, resuming, and reporting the complete upgrade. Application
+developers must not need to discover or invoke plugin-specific migrations.
+
+The current `pdsReleaseFromApp` and `pdsDescriptorFromApp` functions establish
+that management boundary and derive release state from `definePdsApp`. They do
+not run migrations yet. Until migration execution and persisted upgrade state
+exist, the PDS must not claim that a data upgrade completed automatically.
+
+## Release procedure
+
+For a future release:
+
+1. Add the new release to `DECENTRALIZED_CONVEX_RELEASES` and make it current.
+2. Set every official package version to that exact release.
+3. Set every internal decentralized Convex dependency to
+   `workspace:<release>`.
+4. Update `DECENTRALIZED_CONVEX_LAST_CHANGED` only for constituents that
+   actually changed.
+5. Add required Component migrations and compatibility tests.
+6. Run `pnpm run decentralized-convex:check`, followed by the repository's
+   required validation sequence.
diff --git a/package.json b/package.json
index 3a4873b2..c33e72a9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "vera",
   "private": true,
+  "type": "module",
   "engines": {
     "node": ">=24 <25",
     "pnpm": "10.32.1"
@@ -13,7 +14,8 @@
     "dev": "portless proxy start && turbo run dev --parallel --continue",
     "format": "turbo run format --continue -- --cache --cache-location .cache/.prettiercache",
     "format:fix": "turbo run format --continue -- --write --cache --cache-location .cache/.prettiercache",
-    "lint": "turbo run lint --continue -- --cache --cache-location .cache/.eslintcache",
+    "decentralized-convex:check": "node --experimental-strip-types scripts/check-decentralized-convex-release.ts",
+    "lint": "pnpm run decentralized-convex:check && turbo run lint --continue -- --cache --cache-location .cache/.eslintcache",
     "lint:fix": "turbo run lint --continue -- --fix --cache --cache-location .cache/.eslintcache",
     "lint:ws": "pnpm dlx sherif@latest",
     "postinstall": "pnpm lint:ws",
diff --git a/packages/decentralized-convex-accounts/_generated/component.ts b/packages/decentralized-convex-accounts/_generated/component.ts
index 3b049da5..99d85eca 100644
--- a/packages/decentralized-convex-accounts/_generated/component.ts
+++ b/packages/decentralized-convex-accounts/_generated/component.ts
@@ -36,11 +36,12 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             subject: string;
             tokenIdentifier: string;
           };
+          lastChanged: "0.1.0";
           operation: {
             args: { avatarUrl: null | string; displayName: string };
             type: "upsertMyProfile";
           };
-          version: "1";
+          version: string;
         },
         {
           routes?: Array<string>;
@@ -65,10 +66,11 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             subject: string;
             tokenIdentifier: string;
           };
+          lastChanged: "0.1.0";
           operation:
             | { args: {}; type: "getMyProfile" }
             | { args: { accountId: string }; type: "getProfile" };
-          version: "1";
+          version: string;
         },
         | {
             routes?: Array<string>;
diff --git a/packages/decentralized-convex-accounts/package.json b/packages/decentralized-convex-accounts/package.json
index 75f2bb80..a9b26088 100644
--- a/packages/decentralized-convex-accounts/package.json
+++ b/packages/decentralized-convex-accounts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/accounts",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -16,8 +16,9 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@decentralized-convex/plugin": "workspace:*",
-    "@decentralized-convex/server": "workspace:*",
+    "@decentralized-convex/core": "workspace:0.1.0",
+    "@decentralized-convex/plugin": "workspace:0.1.0",
+    "@decentralized-convex/server": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-accounts/protocol.ts b/packages/decentralized-convex-accounts/protocol.ts
index 9ecefd48..84a03d18 100644
--- a/packages/decentralized-convex-accounts/protocol.ts
+++ b/packages/decentralized-convex-accounts/protocol.ts
@@ -1,4 +1,5 @@
 import type { Infer } from "convex/values";
+import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -14,6 +15,7 @@ export const accountProfile = v.object({
 export type AccountProfile = Infer<typeof accountProfile>;
 
 export const accountsProtocol = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.accounts,
   name: "accounts",
   mutations: {
     upsertMyProfile: defineOperation({
@@ -35,5 +37,4 @@ export const accountsProtocol = definePluginProtocol({
     }),
   },
   requires: {},
-  version: "1",
 });
diff --git a/packages/decentralized-convex-address/package.json b/packages/decentralized-convex-address/package.json
index 9ea13470..784a435a 100644
--- a/packages/decentralized-convex-address/package.json
+++ b/packages/decentralized-convex-address/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/address",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -15,6 +15,9 @@
     "test": "node --experimental-strip-types --test src/*.test.ts",
     "typecheck": "tsgo --noEmit"
   },
+  "dependencies": {
+    "@decentralized-convex/core": "workspace:0.1.0"
+  },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",
     "@acme/prettier-config": "workspace:*",
diff --git a/packages/decentralized-convex-address/src/discovery.test.ts b/packages/decentralized-convex-address/src/discovery.test.ts
index dbee5075..4230116b 100644
--- a/packages/decentralized-convex-address/src/discovery.test.ts
+++ b/packages/decentralized-convex-address/src/discovery.test.ts
@@ -47,10 +47,11 @@ void test("discovers and validates a PDS manifest", async () => {
             issuer: "https://a.example",
             jwksUrl: "https://a.example/jwks",
           },
-          capabilities: [{ id: "messages", versions: ["1"] }],
+          capabilities: [{ id: "messages", lastChanged: "0.1.0" }],
           deploymentUrl: "https://a.example.convex.cloud",
           httpUrl: "https://a.example.convex.site",
-          protocolVersion: "0.1",
+          lastChanged: "0.1.0",
+          version: "0.1.0",
         }),
       );
     },
@@ -76,7 +77,8 @@ void test("rejects a manifest for a different account domain", async () => {
             accountDomain: "b.vera.chat",
             deploymentUrl: "https://a.example.convex.cloud",
             httpUrl: "https://a.example.convex.site",
-            protocolVersion: "0.1",
+            lastChanged: "0.1.0",
+            version: "0.1.0",
           }),
         ),
       resolveTxt: () =>
@@ -114,7 +116,8 @@ void test("uses browser-compatible DNS-over-HTTPS by default", async () => {
               accountDomain: "a.vera.chat",
               deploymentUrl: "https://a.example.convex.cloud",
               httpUrl: "https://a.example.convex.site",
-              protocolVersion: "0.1",
+              lastChanged: "0.1.0",
+              version: "0.1.0",
             }),
       );
     },
diff --git a/packages/decentralized-convex-address/src/discovery.ts b/packages/decentralized-convex-address/src/discovery.ts
index fe3402dd..9a3f2bcb 100644
--- a/packages/decentralized-convex-address/src/discovery.ts
+++ b/packages/decentralized-convex-address/src/discovery.ts
@@ -1,4 +1,5 @@
-export const PDS_DISCOVERY_VERSION = "pds1";
+/** Stable DNS record format marker, not an ecosystem version. */
+export const PDS_DISCOVERY_RECORD_FORMAT = "pds1";
 export const PDS_DNS_LABEL = "_pds";
 
 export interface PdsManifest {
@@ -9,11 +10,12 @@ export interface PdsManifest {
   };
   capabilities?: readonly {
     id: string;
-    versions: readonly string[];
+    lastChanged: string;
   }[];
   deploymentUrl: string;
   httpUrl: string;
-  protocolVersion: "0.1";
+  lastChanged: string;
+  version: string;
 }
 
 export interface DiscoveredPds {
@@ -77,7 +79,7 @@ export function parsePdsTxtRecord(record: string) {
           : [field.slice(0, separator), field.slice(separator + 1)];
       }),
   );
-  if (fields.v !== PDS_DISCOVERY_VERSION || fields.url === undefined) {
+  if (fields.v !== PDS_DISCOVERY_RECORD_FORMAT || fields.url === undefined) {
     return null;
   }
   return requireHttpsUrl(fields.url, "PDS manifest URL");
@@ -104,7 +106,7 @@ function selectManifestUrl(records: readonly string[]) {
     .filter((url): url is string => url !== null);
   if (matches.length === 0) {
     throw new Error(
-      `No ${PDS_DISCOVERY_VERSION} record found at the _pds DNS name`,
+      `No ${PDS_DISCOVERY_RECORD_FORMAT} record found at the _pds DNS name`,
     );
   }
   if (matches.length > 1) {
@@ -140,10 +142,6 @@ async function resolveTxtWithDoh(name: string, fetcher: typeof fetch) {
 function parsePdsManifest(value: unknown): PdsManifest {
   if (!isRecord(value)) throw new Error("The PDS manifest is not an object");
   const accountDomainValue = accountDomain(requireString(value.accountDomain));
-  const protocolVersion = requireString(value.protocolVersion);
-  if (protocolVersion !== "0.1") {
-    throw new Error(`Unsupported PDS protocol version: ${protocolVersion}`);
-  }
   const auth = value.auth;
   return {
     accountDomain: accountDomainValue,
@@ -156,7 +154,8 @@ function parsePdsManifest(value: unknown): PdsManifest {
       "Convex deployment URL",
     ),
     httpUrl: requireHttpsUrl(requireString(value.httpUrl), "PDS HTTP URL"),
-    protocolVersion,
+    lastChanged: requireVersion(value.lastChanged, "PDS last-changed version"),
+    version: requireVersion(value.version, "PDS ecosystem version"),
   };
 }
 
@@ -171,16 +170,27 @@ function parseAuth(value: unknown) {
 function parseCapabilities(value: unknown) {
   if (!Array.isArray(value)) throw new Error("Invalid PDS capabilities");
   return value.map((capability) => {
-    if (!isRecord(capability) || !Array.isArray(capability.versions)) {
+    if (!isRecord(capability)) {
       throw new Error("Invalid PDS capability");
     }
     return {
       id: requireString(capability.id),
-      versions: capability.versions.map(requireString),
+      lastChanged: requireVersion(
+        capability.lastChanged,
+        "capability last-changed version",
+      ),
     };
   });
 }
 
+function requireVersion(value: unknown, label: string) {
+  const version = requireString(value);
+  if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(version)) {
+    throw new Error(`${label} is invalid`);
+  }
+  return version;
+}
+
 function requireHttpsUrl(input: string, label: string) {
   let url: URL;
   try {
diff --git a/packages/decentralized-convex-address/src/index.ts b/packages/decentralized-convex-address/src/index.ts
index 88774701..988c6b9c 100644
--- a/packages/decentralized-convex-address/src/index.ts
+++ b/packages/decentralized-convex-address/src/index.ts
@@ -5,7 +5,7 @@ export {
   decodeDnsTxtData,
   discoverPds,
   parsePdsTxtRecord,
-  PDS_DISCOVERY_VERSION,
+  PDS_DISCOVERY_RECORD_FORMAT,
   PDS_DNS_LABEL,
 } from "./discovery.ts";
 export type {
diff --git a/packages/decentralized-convex-client/README.md b/packages/decentralized-convex-client/README.md
index 96982503..149f8c9c 100644
--- a/packages/decentralized-convex-client/README.md
+++ b/packages/decentralized-convex-client/README.md
@@ -4,6 +4,7 @@ Framework-independent discovery, connection, and federation client.
 
 ```ts
 const pds = definePdsApi(accountsProtocol, messagesProtocol);
+const home = assertPdsCompatibility(await discoverPds(address), pds);
 const client = new DecentralizedConvexClient({ pds: { home } });
 
 await client.pdsMutation(pds.messages.send(input));
@@ -22,3 +23,8 @@ the configured home. The lower-level `federatedPdsQuery` and
 The default function references are `pds:dispatchQuery` and
 `pds:dispatchMutation`. Advanced consumers may construct `PdsClient` with
 different references or a custom connection.
+
+`assertPdsCompatibility` runs before sign-in. It checks the core wire contract
+and every plugin required by the generated API using `lastChanged` metadata.
+Overall ecosystem versions may differ when those exact contracts are
+unchanged.
diff --git a/packages/decentralized-convex-client/package.json b/packages/decentralized-convex-client/package.json
index dce8f878..0fe27b69 100644
--- a/packages/decentralized-convex-client/package.json
+++ b/packages/decentralized-convex-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/client",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -16,8 +16,9 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@decentralized-convex/address": "workspace:*",
-    "@decentralized-convex/plugin": "workspace:*",
+    "@decentralized-convex/address": "workspace:0.1.0",
+    "@decentralized-convex/core": "workspace:0.1.0",
+    "@decentralized-convex/plugin": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-client/src/api.ts b/packages/decentralized-convex-client/src/api.ts
index 732e665b..bbc74591 100644
--- a/packages/decentralized-convex-client/src/api.ts
+++ b/packages/decentralized-convex-client/src/api.ts
@@ -4,6 +4,10 @@ import type {
   OperationMap,
   OperationResult,
 } from "@decentralized-convex/plugin";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 
 import type {
   FederationTarget,
@@ -13,8 +17,22 @@ import type {
 
 declare const PdsResultType: unique symbol;
 
+export interface PdsApiRequirement {
+  readonly id: string;
+  readonly lastChanged: string;
+}
+
+export interface PdsApiRequirements {
+  readonly capabilities: readonly PdsApiRequirement[];
+  readonly lastChanged: string;
+  readonly version: string;
+}
+
+const requirementsByApi = new WeakMap<object, PdsApiRequirements>();
+
 export interface SerializedPdsRequest {
   readonly [key: string]: unknown;
+  readonly lastChanged: string;
   readonly operation: {
     readonly args: Record<string, unknown>;
     readonly type: string;
@@ -60,6 +78,7 @@ export interface FederatedPdsQueryOptions<
 type OperationRequestBuilders<
   PluginName extends string,
   PluginVersion extends string,
+  PluginLastChanged extends string,
   Operations extends OperationMap,
   Kind extends "mutation" | "query",
 > = {
@@ -70,6 +89,7 @@ type OperationRequestBuilders<
       readonly args: OperationArgs<Operations[Name]>;
       readonly type: Name;
     };
+    readonly lastChanged: PluginLastChanged;
     readonly plugin: PluginName;
     readonly version: PluginVersion;
   };
@@ -79,24 +99,28 @@ export type PdsPluginApi<Protocol extends AnyPluginProtocol> = {
   readonly mutations: OperationRequestBuilders<
     Protocol["name"],
     Protocol["version"],
+    Protocol["lastChanged"],
     Protocol["mutations"],
     "mutation"
   >;
   readonly queries: OperationRequestBuilders<
     Protocol["name"],
     Protocol["version"],
+    Protocol["lastChanged"],
     Protocol["queries"],
     "query"
   >;
 } & OperationRequestBuilders<
   Protocol["name"],
   Protocol["version"],
+  Protocol["lastChanged"],
   Protocol["queries"],
   "query"
 > &
   OperationRequestBuilders<
     Protocol["name"],
     Protocol["version"],
+    Protocol["lastChanged"],
     Protocol["mutations"],
     "mutation"
   >;
@@ -117,11 +141,13 @@ export function definePdsApi<
   const api = Object.fromEntries(
     protocols.map((protocol) => {
       const mutations = defineRequestBuilders(
+        protocol.lastChanged,
         protocol.name,
         protocol.version,
         protocol.mutations,
       );
       const queries = defineRequestBuilders(
+        protocol.lastChanged,
         protocol.name,
         protocol.version,
         protocol.queries,
@@ -129,6 +155,14 @@ export function definePdsApi<
       return [protocol.name, { ...queries, ...mutations, mutations, queries }];
     }),
   );
+  requirementsByApi.set(api, {
+    capabilities: protocols.map(({ lastChanged, name }) => ({
+      id: name,
+      lastChanged,
+    })),
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    version: DECENTRALIZED_CONVEX_VERSION,
+  });
 
   // The runtime object is constructed from the exact protocol map supplied by the caller.
   const erased: unknown = api;
@@ -136,7 +170,16 @@ export function definePdsApi<
   return erased as PdsApi<ProtocolsByName<Protocols>>;
 }
 
+export function pdsApiRequirements(api: object): PdsApiRequirements {
+  const requirements = requirementsByApi.get(api);
+  if (requirements === undefined) {
+    throw new Error("PDS API requirements are unavailable");
+  }
+  return requirements;
+}
+
 function defineRequestBuilders(
+  lastChanged: string,
   plugin: string,
   version: string,
   operations: OperationMap,
@@ -148,6 +191,7 @@ function defineRequestBuilders(
       Object.keys(operations).map((type) => [
         type,
         (args: Record<string, unknown>) => ({
+          lastChanged,
           operation: { args, type },
           plugin,
           version,
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
index 7c5f8214..a1558490 100644
--- a/packages/decentralized-convex-client/src/client.test.ts
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -54,6 +55,7 @@ void test("groups identities by deployment and combines native query results", a
 
 void test("federates typed PDS requests without a generated backend API", async () => {
   const notes = definePluginProtocol({
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     name: "notes",
     mutations: {
       create: defineOperation({
@@ -68,7 +70,6 @@ void test("federates typed PDS requests without a generated backend API", async
       }),
     },
     requires: {},
-    version: "1",
   });
   const api = definePdsApi(notes);
   const client = new DecentralizedConvexClient({
diff --git a/packages/decentralized-convex-client/src/client.ts b/packages/decentralized-convex-client/src/client.ts
index 5f1f9b82..e6e23427 100644
--- a/packages/decentralized-convex-client/src/client.ts
+++ b/packages/decentralized-convex-client/src/client.ts
@@ -17,6 +17,7 @@ import type {
   FederationQueryReference,
   FederationTarget,
 } from "./types.ts";
+import { assertPdsRequestCompatibility } from "./compatibility.ts";
 import { createConvexFederationConnection } from "./connection.ts";
 import { FederatedQueryObserver } from "./observer.ts";
 import { FederatedPdsQueryObserver } from "./pds-observer.ts";
@@ -63,11 +64,12 @@ export class DecentralizedConvexClient {
 
   watchPdsQuery<Request extends AnyPdsQueryRequest>(request: Request) {
     const home = this.#requireHome();
+    assertPdsRequestCompatibility(home, request);
     return new RoutedPdsQueryObserver({
       getConnection: (url) => this.#getConnection(url),
       home: pdsTarget(home.domain, home),
       request,
-      resolveRoutes: (routes) => this.#resolveRoutes(routes),
+      resolveRoutes: (routes) => this.#resolveRoutes(routes, request),
     });
   }
 
@@ -135,6 +137,7 @@ export class DecentralizedConvexClient {
 
   async pdsQuery<Request extends AnyPdsQueryRequest>(request: Request) {
     const home = this.#requireHome();
+    assertPdsRequestCompatibility(home, request);
     const homeTarget = pdsTarget(home.domain, home);
     const homeGroup = groupFederationTargets([homeTarget])[0];
     if (homeGroup === undefined) throw new Error("PDS home is invalid");
@@ -143,7 +146,7 @@ export class DecentralizedConvexClient {
     }).queryWithRouting(request);
     const targets = groupFederationTargets([
       homeTarget,
-      ...(await this.#resolveRoutes(homeResult.routes)),
+      ...(await this.#resolveRoutes(homeResult.routes, request)),
     ]);
     const settled = await Promise.all(
       targets.map(async (target) => {
@@ -189,6 +192,7 @@ export class DecentralizedConvexClient {
 
   pdsMutation<Request extends AnyPdsMutationRequest>(request: Request) {
     const home = this.#requireHome();
+    assertPdsRequestCompatibility(home, request);
     return new PdsClient({
       connection: this.#getConnection(home.manifest.deploymentUrl),
     }).mutation(request);
@@ -237,11 +241,13 @@ export class DecentralizedConvexClient {
     return connection;
   }
 
-  async #resolveRoutes(routes: readonly string[]) {
+  async #resolveRoutes(routes: readonly string[], request: AnyPdsQueryRequest) {
     return Promise.all(
-      [...new Set(routes)].map(async (route) =>
-        pdsTarget(route, await this.resolvePds(route)),
-      ),
+      [...new Set(routes)].map(async (route) => {
+        const pds = await this.resolvePds(route);
+        assertPdsRequestCompatibility(pds, request);
+        return pdsTarget(route, pds);
+      }),
     );
   }
 
diff --git a/packages/decentralized-convex-client/src/compatibility.test.ts b/packages/decentralized-convex-client/src/compatibility.test.ts
new file mode 100644
index 00000000..6a50030a
--- /dev/null
+++ b/packages/decentralized-convex-client/src/compatibility.test.ts
@@ -0,0 +1,95 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type { DiscoveredPds } from "@decentralized-convex/address";
+import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
+import {
+  defineOperation,
+  definePluginProtocol,
+} from "@decentralized-convex/plugin";
+import { v } from "convex/values";
+
+import { definePdsApi } from "./api.ts";
+import {
+  assertPdsCompatibility,
+  IncompatiblePdsError,
+} from "./compatibility.ts";
+
+const notes = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+  name: "notes",
+  mutations: {
+    write: defineOperation({ args: v.object({}), returns: v.null() }),
+  },
+  queries: {
+    read: defineOperation({ args: v.object({}), returns: v.null() }),
+  },
+  requires: {},
+});
+const api = definePdsApi(notes);
+
+void test("accepts a newer ecosystem release when required contracts are unchanged", () => {
+  const pds = discoveredPds({ ecosystemVersion: "9.0.0" });
+  assert.equal(assertPdsCompatibility(pds, api), pds);
+});
+
+void test("rejects missing or changed contracts before sign-in", () => {
+  assert.throws(
+    () => assertPdsCompatibility(discoveredPds({ capabilities: [] }), api),
+    (error: unknown) =>
+      error instanceof IncompatiblePdsError &&
+      error.message.includes("required notes plugin"),
+  );
+  assert.throws(
+    () =>
+      assertPdsCompatibility(
+        discoveredPds({ capabilityLastChanged: "0.2.0" }),
+        api,
+      ),
+    (error: unknown) =>
+      error instanceof IncompatiblePdsError &&
+      error.message.includes("notes last changed"),
+  );
+  assert.throws(
+    () =>
+      assertPdsCompatibility(
+        discoveredPds({ protocolLastChanged: "0.2.0" }),
+        api,
+      ),
+    (error: unknown) =>
+      error instanceof IncompatiblePdsError &&
+      error.message.includes("PDS contract last changed"),
+  );
+});
+
+function discoveredPds({
+  capabilities = [
+    {
+      id: "notes",
+      lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    },
+  ],
+  capabilityLastChanged,
+  ecosystemVersion = "0.1.0",
+  protocolLastChanged = DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+}: {
+  capabilities?: { id: string; lastChanged: string }[];
+  capabilityLastChanged?: string;
+  ecosystemVersion?: string;
+  protocolLastChanged?: string;
+}): DiscoveredPds {
+  return {
+    domain: "notes.example",
+    manifest: {
+      accountDomain: "notes.example",
+      capabilities: capabilities.map((capability) => ({
+        ...capability,
+        lastChanged: capabilityLastChanged ?? capability.lastChanged,
+      })),
+      deploymentUrl: "https://notes.example.convex.cloud",
+      httpUrl: "https://notes.example",
+      lastChanged: protocolLastChanged,
+      version: ecosystemVersion,
+    },
+    manifestUrl: "https://notes.example/.well-known/decentralized-convex",
+  };
+}
diff --git a/packages/decentralized-convex-client/src/compatibility.ts b/packages/decentralized-convex-client/src/compatibility.ts
new file mode 100644
index 00000000..269d25d6
--- /dev/null
+++ b/packages/decentralized-convex-client/src/compatibility.ts
@@ -0,0 +1,64 @@
+import type { DiscoveredPds } from "@decentralized-convex/address";
+import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
+
+import type { SerializedPdsRequest } from "./api.ts";
+import { pdsApiRequirements } from "./api.ts";
+
+export class IncompatiblePdsError extends Error {
+  override readonly name = "IncompatiblePdsError";
+}
+
+/**
+ * Verifies the exact wire contracts used by an application. The overall
+ * ecosystem versions may differ when none of those contracts changed.
+ */
+export function assertPdsCompatibility(
+  pds: DiscoveredPds,
+  api: object,
+): DiscoveredPds {
+  const requirements = pdsApiRequirements(api);
+  assertRequirements(pds, requirements.lastChanged, requirements.capabilities);
+  return pds;
+}
+
+export function assertPdsRequestCompatibility(
+  pds: DiscoveredPds,
+  request: SerializedPdsRequest,
+): DiscoveredPds {
+  assertRequirements(pds, DECENTRALIZED_CONVEX_LAST_CHANGED.protocol, [
+    { id: request.plugin, lastChanged: request.lastChanged },
+  ]);
+  return pds;
+}
+
+function assertRequirements(
+  pds: DiscoveredPds,
+  protocolLastChanged: string,
+  capabilities: readonly { id: string; lastChanged: string }[],
+) {
+  if (pds.manifest.lastChanged !== protocolLastChanged) {
+    throw new IncompatiblePdsError(
+      `This client expects the PDS contract last changed in ${protocolLastChanged}, but ${pds.domain} reports ${pds.manifest.lastChanged}.`,
+    );
+  }
+
+  const available = new Map(
+    pds.manifest.capabilities?.map((capability) => [
+      capability.id,
+      capability.lastChanged,
+    ]),
+  );
+  for (const required of capabilities) {
+    const lastChanged = available.get(required.id);
+    if (lastChanged === undefined) {
+      throw new IncompatiblePdsError(
+        `${pds.domain} does not provide the required ${required.id} plugin.`,
+      );
+    }
+    if (lastChanged !== required.lastChanged) {
+      throw new IncompatiblePdsError(
+        `This client expects ${required.id} last changed in ${required.lastChanged}, but ${pds.domain} reports ${lastChanged}.`,
+      );
+    }
+  }
+}
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index eea77f5b..4ccdda25 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -1,10 +1,15 @@
 export { DecentralizedConvexClient } from "./client.ts";
+export {
+  assertPdsCompatibility,
+  assertPdsRequestCompatibility,
+  IncompatiblePdsError,
+} from "./compatibility.ts";
 export {
   accountDomain,
   decodeDnsTxtData,
   discoverPds,
   parsePdsTxtRecord,
-  PDS_DISCOVERY_VERSION,
+  PDS_DISCOVERY_RECORD_FORMAT,
   PDS_DNS_LABEL,
 } from "@decentralized-convex/address";
 export type {
@@ -13,7 +18,12 @@ export type {
   PdsManifest,
 } from "@decentralized-convex/address";
 export { createConvexPdsConnection } from "./connection.ts";
-export { definePdsApi, pdsFunctions, PdsClient } from "./pds.ts";
+export {
+  definePdsApi,
+  pdsApiRequirements,
+  pdsFunctions,
+  PdsClient,
+} from "./pds.ts";
 export { FederatedQueryObserver } from "./observer.ts";
 export { FederatedPdsQueryObserver } from "./pds-observer.ts";
 export { defaultCombine } from "./snapshot.ts";
diff --git a/packages/decentralized-convex-client/src/pds.test.ts b/packages/decentralized-convex-client/src/pds.test.ts
index 769ccc27..5b43947d 100644
--- a/packages/decentralized-convex-client/src/pds.test.ts
+++ b/packages/decentralized-convex-client/src/pds.test.ts
@@ -1,5 +1,9 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -11,6 +15,7 @@ import type { PdsConnection } from "./pds.ts";
 import { definePdsApi, PdsClient, pdsFunctions } from "./pds.ts";
 
 const notes = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
   name: "notes",
   mutations: {
     create: defineOperation({
@@ -25,31 +30,34 @@ const notes = definePluginProtocol({
     }),
   },
   requires: {},
-  version: "1",
 });
 
 void test("builds serializable PDS dispatcher requests", () => {
   const api = definePdsApi(notes);
 
   assert.deepEqual(api.notes.queries.list({ owner: "shawn" }), {
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     operation: { args: { owner: "shawn" }, type: "list" },
     plugin: "notes",
-    version: "1",
+    version: DECENTRALIZED_CONVEX_VERSION,
   });
   assert.deepEqual(api.notes.mutations.create({ body: "hello" }), {
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     operation: { args: { body: "hello" }, type: "create" },
     plugin: "notes",
-    version: "1",
+    version: DECENTRALIZED_CONVEX_VERSION,
   });
   assert.deepEqual(api.notes.list({ owner: "shawn" }), {
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     operation: { args: { owner: "shawn" }, type: "list" },
     plugin: "notes",
-    version: "1",
+    version: DECENTRALIZED_CONVEX_VERSION,
   });
   assert.deepEqual(api.notes.create({ body: "hello" }), {
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     operation: { args: { body: "hello" }, type: "create" },
     plugin: "notes",
-    version: "1",
+    version: DECENTRALIZED_CONVEX_VERSION,
   });
 });
 
diff --git a/packages/decentralized-convex-client/src/pds.ts b/packages/decentralized-convex-client/src/pds.ts
index 5cdb8cc8..07f15d4f 100644
--- a/packages/decentralized-convex-client/src/pds.ts
+++ b/packages/decentralized-convex-client/src/pds.ts
@@ -8,13 +8,15 @@ import type {
   SerializedPdsRequest,
 } from "./api.ts";
 
-export { definePdsApi } from "./api.ts";
+export { definePdsApi, pdsApiRequirements } from "./api.ts";
 export type {
   AnyPdsMutationRequest,
   AnyPdsQueryRequest,
   DefaultCombinedPdsResult,
   FederatedPdsQueryOptions,
   PdsApi,
+  PdsApiRequirement,
+  PdsApiRequirements,
   PdsPluginApi,
   PdsRequest,
   PdsRequestResult,
diff --git a/packages/decentralized-convex-client/src/pds.type-test.ts b/packages/decentralized-convex-client/src/pds.type-test.ts
index 701c94c0..9ff74953 100644
--- a/packages/decentralized-convex-client/src/pds.type-test.ts
+++ b/packages/decentralized-convex-client/src/pds.type-test.ts
@@ -1,3 +1,4 @@
+import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -10,6 +11,7 @@ import type { FederatedQuerySnapshot } from "./types.ts";
 import { definePdsApi } from "./pds.ts";
 
 const messaging = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
   name: "messaging",
   mutations: {
     sendMessage: defineOperation({
@@ -24,7 +26,6 @@ const messaging = definePluginProtocol({
     }),
   },
   requires: {},
-  version: "1",
 });
 
 const api = definePdsApi(messaging);
diff --git a/packages/decentralized-convex-core/eslint.config.ts b/packages/decentralized-convex-core/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-core/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-core/package.json b/packages/decentralized-convex-core/package.json
new file mode 100644
index 00000000..e86419cd
--- /dev/null
+++ b/packages/decentralized-convex-core/package.json
@@ -0,0 +1,28 @@
+{
+  "name": "@decentralized-convex/core",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsgo --noEmit"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-core/src/index.test.ts b/packages/decentralized-convex-core/src/index.test.ts
new file mode 100644
index 00000000..03b37076
--- /dev/null
+++ b/packages/decentralized-convex-core/src/index.test.ts
@@ -0,0 +1,18 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_RELEASES,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "./index.ts";
+
+void test("the current release and every last-changed value are known", () => {
+  assert.equal(
+    DECENTRALIZED_CONVEX_RELEASES.at(-1),
+    DECENTRALIZED_CONVEX_VERSION,
+  );
+  for (const lastChanged of Object.values(DECENTRALIZED_CONVEX_LAST_CHANGED)) {
+    assert.ok(DECENTRALIZED_CONVEX_RELEASES.includes(lastChanged));
+  }
+});
diff --git a/packages/decentralized-convex-core/src/index.ts b/packages/decentralized-convex-core/src/index.ts
new file mode 100644
index 00000000..4d5a08aa
--- /dev/null
+++ b/packages/decentralized-convex-core/src/index.ts
@@ -0,0 +1,33 @@
+/**
+ * Every official decentralized Convex package and wire request ships on this
+ * one release version. Never update a package version independently.
+ */
+export const DECENTRALIZED_CONVEX_VERSION = "0.1.0" as const;
+
+/** All ecosystem releases that may be referenced by lastChanged metadata. */
+export const DECENTRALIZED_CONVEX_RELEASES = ["0.1.0"] as const;
+
+export type DecentralizedConvexVersion =
+  (typeof DECENTRALIZED_CONVEX_RELEASES)[number];
+
+/**
+ * The ecosystem release in which each package or wire contract last actually
+ * changed. Packages are still republished together on every release.
+ */
+export const DECENTRALIZED_CONVEX_LAST_CHANGED = Object.freeze({
+  accounts: "0.1.0",
+  address: "0.1.0",
+  client: "0.1.0",
+  core: "0.1.0",
+  messages: "0.1.0",
+  plugin: "0.1.0",
+  protocol: "0.1.0",
+  react: "0.1.0",
+  server: "0.1.0",
+  tanstackQuery: "0.1.0",
+} as const satisfies Record<string, DecentralizedConvexVersion>);
+
+export const decentralizedConvexRelease = Object.freeze({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED,
+  version: DECENTRALIZED_CONVEX_VERSION,
+});
diff --git a/packages/decentralized-convex-core/tsconfig.json b/packages/decentralized-convex-core/tsconfig.json
new file mode 100644
index 00000000..782fa4cf
--- /dev/null
+++ b/packages/decentralized-convex-core/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022"],
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-messages/_generated/component.ts b/packages/decentralized-convex-messages/_generated/component.ts
index 74b8d865..66dc7416 100644
--- a/packages/decentralized-convex-messages/_generated/component.ts
+++ b/packages/decentralized-convex-messages/_generated/component.ts
@@ -36,6 +36,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             subject: string;
             tokenIdentifier: string;
           };
+          lastChanged: "0.1.0";
           operation:
             | {
                 args: { conversationId: string; participants: Array<string> };
@@ -49,7 +50,7 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
                 };
                 type: "send";
               };
-          version: "1";
+          version: string;
         },
         | {
             routes?: Array<string>;
@@ -82,8 +83,9 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
             subject: string;
             tokenIdentifier: string;
           };
+          lastChanged: "0.1.0";
           operation: { args: { conversationId: string }; type: "list" };
-          version: "1";
+          version: string;
         },
         {
           routes?: Array<string>;
diff --git a/packages/decentralized-convex-messages/package.json b/packages/decentralized-convex-messages/package.json
index 20a66bce..8851ac51 100644
--- a/packages/decentralized-convex-messages/package.json
+++ b/packages/decentralized-convex-messages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/messages",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -16,8 +16,9 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@decentralized-convex/plugin": "workspace:*",
-    "@decentralized-convex/server": "workspace:*",
+    "@decentralized-convex/core": "workspace:0.1.0",
+    "@decentralized-convex/plugin": "workspace:0.1.0",
+    "@decentralized-convex/server": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-messages/protocol.ts b/packages/decentralized-convex-messages/protocol.ts
index dafd184c..dcefcd87 100644
--- a/packages/decentralized-convex-messages/protocol.ts
+++ b/packages/decentralized-convex-messages/protocol.ts
@@ -1,4 +1,8 @@
 import type { Infer } from "convex/values";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -22,6 +26,7 @@ export const conversation = v.object({
 });
 
 export const messagesProtocol = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.messages,
   name: "messages",
   mutations: {
     putConversation: defineOperation({
@@ -46,6 +51,5 @@ export const messagesProtocol = definePluginProtocol({
       returns: v.array(message),
     }),
   },
-  requires: { accounts: "1" },
-  version: "1",
+  requires: { accounts: DECENTRALIZED_CONVEX_VERSION },
 });
diff --git a/packages/decentralized-convex-plugin/README.md b/packages/decentralized-convex-plugin/README.md
index 3938ec13..5276e8ad 100644
--- a/packages/decentralized-convex-plugin/README.md
+++ b/packages/decentralized-convex-plugin/README.md
@@ -4,9 +4,9 @@ Defines the contract shared by plugin authors, PDS hosts, and clients.
 
 ```ts
 export const messagesProtocol = definePluginProtocol({
+  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.messages,
   name: "messages",
-  version: "1",
-  requires: { accounts: "1" },
+  requires: { accounts: DECENTRALIZED_CONVEX_VERSION },
   queries: {
     list: defineOperation({
       args: v.object({ conversationId: v.string() }),
@@ -26,7 +26,12 @@ export const messagesProtocol = definePluginProtocol({
 });
 ```
 
-`requires` maps plugin names to exact protocol versions. A complete protocol
+`definePluginProtocol` injects the one decentralized Convex ecosystem version;
+plugins cannot select independent versions. `lastChanged` comes from the
+central release manifest and changes only when this plugin's wire contract
+actually changes.
+
+`requires` maps plugin names to the ecosystem version. A complete protocol
 set rejects missing dependencies, incompatible versions, duplicate names, and
 cycles both statically and at runtime:
 
@@ -38,6 +43,6 @@ The same operation definitions generate discriminated request/response
 validators and preserve operation-specific argument and result types through
 the intentionally generic PDS dispatcher.
 
-Version ranges, optional dependencies, and migration policy are deliberately
-not hidden behind premature abstractions. Version `1` currently means exact
-compatibility.
+Every official package is released in lockstep. See
+[`docs/versioning.md`](../../docs/versioning.md) for compatibility and upgrade
+rules.
diff --git a/packages/decentralized-convex-plugin/package.json b/packages/decentralized-convex-plugin/package.json
index 7bd8af25..b74f9c44 100644
--- a/packages/decentralized-convex-plugin/package.json
+++ b/packages/decentralized-convex-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/plugin",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -16,6 +16,7 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
+    "@decentralized-convex/core": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-plugin/src/operations.test.ts b/packages/decentralized-convex-plugin/src/operations.test.ts
index c8241c2b..cea73c4e 100644
--- a/packages/decentralized-convex-plugin/src/operations.test.ts
+++ b/packages/decentralized-convex-plugin/src/operations.test.ts
@@ -1,5 +1,6 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
 import { v } from "convex/values";
 
 import {
@@ -51,11 +52,11 @@ void test("rejects operation names that cannot be flattened safely", () => {
   assert.throws(
     () =>
       definePluginProtocol({
+        lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
         name: "notes",
         mutations: { create: operations.create },
         queries: { create: operations.create },
         requires: {},
-        version: "1",
       }),
     /cannot define create as both a query and mutation/,
   );
@@ -63,11 +64,11 @@ void test("rejects operation names that cannot be flattened safely", () => {
   assert.throws(
     () =>
       definePluginProtocol({
+        lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
         name: "notes",
         mutations: { create: operations.create },
         queries: { queries: operations.remove },
         requires: {},
-        version: "1",
       }),
     /cannot use reserved operation name queries/,
   );
diff --git a/packages/decentralized-convex-plugin/src/operations.ts b/packages/decentralized-convex-plugin/src/operations.ts
index b2a69770..17fef6fa 100644
--- a/packages/decentralized-convex-plugin/src/operations.ts
+++ b/packages/decentralized-convex-plugin/src/operations.ts
@@ -1,4 +1,6 @@
+import type { DecentralizedConvexVersion } from "@decentralized-convex/core";
 import type { Infer, Validator } from "convex/values";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
 import { v } from "convex/values";
 
 export interface Operation<
@@ -25,6 +27,7 @@ export interface PluginProtocol<
   Mutations extends OperationMap,
   Requirements extends PluginRequirements,
 > {
+  readonly lastChanged: DecentralizedConvexVersion;
   readonly name: Name;
   readonly mutations: Mutations;
   readonly queries: Queries;
@@ -79,18 +82,38 @@ export function defineOperation<
 
 export function definePluginProtocol<
   const Name extends string,
-  const Version extends string,
   const Queries extends OperationMap,
   const Mutations extends OperationMap,
   const Requirements extends PluginRequirements,
->(protocol: PluginProtocol<Name, Version, Queries, Mutations, Requirements>) {
-  assertOperations(protocol.name, "query", protocol.queries);
-  assertOperations(protocol.name, "mutation", protocol.mutations);
-  assertDistinctOperationNames(protocol);
+>(
+  protocol: Omit<
+    PluginProtocol<
+      Name,
+      typeof DECENTRALIZED_CONVEX_VERSION,
+      Queries,
+      Mutations,
+      Requirements
+    >,
+    "version"
+  >,
+): PluginProtocol<
+  Name,
+  typeof DECENTRALIZED_CONVEX_VERSION,
+  Queries,
+  Mutations,
+  Requirements
+> {
+  const versioned = {
+    ...protocol,
+    version: DECENTRALIZED_CONVEX_VERSION,
+  };
+  assertOperations(versioned.name, "query", versioned.queries);
+  assertOperations(versioned.name, "mutation", versioned.mutations);
+  assertDistinctOperationNames(versioned);
   if (Object.hasOwn(protocol.requires, protocol.name)) {
     throw new Error(`Plugin ${protocol.name} cannot require itself.`);
   }
-  return Object.freeze(protocol);
+  return Object.freeze(versioned);
 }
 
 export function operationValidator<const Operations extends OperationMap>(
diff --git a/packages/decentralized-convex-plugin/src/protocol-graph.test.ts b/packages/decentralized-convex-plugin/src/protocol-graph.test.ts
index af687d43..3462ac4b 100644
--- a/packages/decentralized-convex-plugin/src/protocol-graph.test.ts
+++ b/packages/decentralized-convex-plugin/src/protocol-graph.test.ts
@@ -1,10 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { v } from "convex/values";
 
 import {
-  defineOperation,
-  definePluginProtocol,
   defineProtocolSet,
   inspectProtocolGraph,
   ProtocolGraphError,
@@ -15,17 +12,11 @@ function protocol<const Name extends string, const Version extends string>(
   version: Version,
   requires: Readonly<Record<string, string>> = {},
 ) {
-  return definePluginProtocol({
+  return {
     name,
-    mutations: {
-      write: defineOperation({ args: v.object({}), returns: v.null() }),
-    },
-    queries: {
-      read: defineOperation({ args: v.object({}), returns: v.null() }),
-    },
     requires,
     version,
-  });
+  } as const;
 }
 
 void test("accepts a valid protocol set with explicit dependencies", () => {
diff --git a/packages/decentralized-convex-react/package.json b/packages/decentralized-convex-react/package.json
index f3d75d8a..f4c68906 100644
--- a/packages/decentralized-convex-react/package.json
+++ b/packages/decentralized-convex-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/react",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -15,7 +15,7 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@decentralized-convex/client": "workspace:*",
+    "@decentralized-convex/client": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "peerDependencies": {
diff --git a/packages/decentralized-convex-server/README.md b/packages/decentralized-convex-server/README.md
index 28bd2c60..3f829b74 100644
--- a/packages/decentralized-convex-server/README.md
+++ b/packages/decentralized-convex-server/README.md
@@ -46,5 +46,6 @@ authenticates once, selects the installed plugin, and crosses one Component
 boundary. `defineComponentDispatchers` performs exact operation validation and
 invokes the plugin handler.
 
-`protocolCapabilities(...)` derives discovery-manifest capability entries from
-the same protocol definitions rather than duplicating names and versions.
+`pdsDescriptorFromApp(app, host)` derives the ecosystem release and installed
+plugin `lastChanged` metadata from the same app declaration. This is the PDS
+management boundary that future Component migration controls will extend.
diff --git a/packages/decentralized-convex-server/package.json b/packages/decentralized-convex-server/package.json
index 92ea25f6..b930789f 100644
--- a/packages/decentralized-convex-server/package.json
+++ b/packages/decentralized-convex-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/server",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -16,7 +16,8 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@decentralized-convex/plugin": "workspace:*",
+    "@decentralized-convex/core": "workspace:0.1.0",
+    "@decentralized-convex/plugin": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/decentralized-convex-server/src/app.test.ts b/packages/decentralized-convex-server/src/app.test.ts
index 30589d8d..b4dfe04d 100644
--- a/packages/decentralized-convex-server/src/app.test.ts
+++ b/packages/decentralized-convex-server/src/app.test.ts
@@ -1,5 +1,9 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -10,12 +14,14 @@ import { v } from "convex/values";
 import {
   definePdsApp,
   definePdsPluginComponent,
+  pdsReleaseFromApp,
   protocolsFromPdsApp,
 } from "./app.ts";
 
 void test("a typed PDS plugin remains the original Convex Component", () => {
   const component = defineComponent("notes");
   const protocol = definePluginProtocol({
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     name: "notes",
     mutations: {
       create: defineOperation({ args: v.object({}), returns: v.null() }),
@@ -24,7 +30,6 @@ void test("a typed PDS plugin remains the original Convex Component", () => {
       list: defineOperation({ args: v.object({}), returns: v.null() }),
     },
     requires: {},
-    version: "1",
   });
 
   const plugin = definePdsPluginComponent(component, protocol);
@@ -35,6 +40,7 @@ void test("a typed PDS plugin remains the original Convex Component", () => {
 
 void test("derives client protocols from the same local app declaration", () => {
   const accountsProtocol = definePluginProtocol({
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.accounts,
     name: "accounts",
     mutations: {
       write: defineOperation({ args: v.object({}), returns: v.null() }),
@@ -43,7 +49,6 @@ void test("derives client protocols from the same local app declaration", () =>
       read: defineOperation({ args: v.object({}), returns: v.null() }),
     },
     requires: {},
-    version: "1",
   });
   const accounts = definePdsPluginComponent(
     defineComponent("accounts"),
@@ -52,4 +57,14 @@ void test("derives client protocols from the same local app declaration", () =>
   const app = definePdsApp({ plugins: [accounts] });
 
   assert.deepEqual(protocolsFromPdsApp(app), [accountsProtocol]);
+  assert.deepEqual(pdsReleaseFromApp(app), {
+    capabilities: [
+      {
+        id: "accounts",
+        lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.accounts,
+      },
+    ],
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    version: DECENTRALIZED_CONVEX_VERSION,
+  });
 });
diff --git a/packages/decentralized-convex-server/src/app.ts b/packages/decentralized-convex-server/src/app.ts
index 1941414c..2e86d17c 100644
--- a/packages/decentralized-convex-server/src/app.ts
+++ b/packages/decentralized-convex-server/src/app.ts
@@ -3,9 +3,15 @@ import type {
   ProtocolGraphConstraint,
 } from "@decentralized-convex/plugin";
 import type { ComponentDefinition } from "convex/server";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 import { defineProtocolSet } from "@decentralized-convex/plugin";
 import { defineApp } from "convex/server";
 
+import type { FederationDescriptor } from "./descriptor.ts";
+
 type AppDefinition = ReturnType<typeof defineApp>;
 
 declare const pdsPluginProtocol: unique symbol;
@@ -143,12 +149,37 @@ export function definePdsApp<
 export function protocolCapabilities<
   const Protocols extends readonly AnyPluginProtocol[],
 >(...protocols: ProtocolGraphConstraint<Protocols>) {
-  return defineProtocolSet(...protocols).map(({ name, version }) => ({
+  return defineProtocolSet(...protocols).map(({ lastChanged, name }) => ({
     id: name,
-    versions: [version],
+    lastChanged,
   }));
 }
 
+/** Release state used by discovery today and PDS upgrades in the future. */
+export function pdsReleaseFromApp<
+  App extends PdsAppDefinition<readonly AnyPdsPluginComponent[]>,
+>(app: App) {
+  const protocols = protocolsFromPdsApp(app);
+  return Object.freeze({
+    capabilities: protocols.map(({ lastChanged, name }) => ({
+      id: name,
+      lastChanged,
+    })),
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    version: DECENTRALIZED_CONVEX_VERSION,
+  });
+}
+
+/** Builds a PDS descriptor without repeating release or plugin metadata. */
+export function pdsDescriptorFromApp<
+  App extends PdsAppDefinition<readonly AnyPdsPluginComponent[]>,
+>(
+  app: App,
+  host: Omit<FederationDescriptor, "capabilities" | "lastChanged" | "version">,
+): FederationDescriptor {
+  return { ...host, ...pdsReleaseFromApp(app) };
+}
+
 function isComponentInstall(
   value: ComponentDefinition | ComponentInstall,
 ): value is ComponentInstall {
diff --git a/packages/decentralized-convex-server/src/app.type-test.ts b/packages/decentralized-convex-server/src/app.type-test.ts
index 9b52119d..dbc8627c 100644
--- a/packages/decentralized-convex-server/src/app.type-test.ts
+++ b/packages/decentralized-convex-server/src/app.type-test.ts
@@ -1,3 +1,8 @@
+import type { DecentralizedConvexVersion } from "@decentralized-convex/core";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
@@ -10,10 +15,12 @@ import { definePdsApp, definePdsPluginComponent } from "./app.ts";
 
 function protocol<
   const Name extends string,
-  const Version extends string,
-  const Requirements extends Readonly<Record<string, string>>,
->(name: Name, version: Version, requires: Requirements) {
+  const Requirements extends Readonly<
+    Record<string, DecentralizedConvexVersion>
+  >,
+>(name: Name, requires: Requirements) {
   return definePluginProtocol({
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     name,
     mutations: {
       write: defineOperation({ args: v.object({}), returns: v.null() }),
@@ -22,21 +29,16 @@ function protocol<
       read: defineOperation({ args: v.object({}), returns: v.null() }),
     },
     requires,
-    version,
   });
 }
 
 const accounts = definePdsPluginComponent(
   defineComponent("accounts"),
-  protocol("accounts", "1", {}),
-);
-const accountsV2 = definePdsPluginComponent(
-  defineComponent("accounts_v2"),
-  protocol("accounts", "2", {}),
+  protocol("accounts", {}),
 );
 const messages = definePdsPluginComponent(
   defineComponent("messages"),
-  protocol("messages", "1", { accounts: "1" }),
+  protocol("messages", { accounts: DECENTRALIZED_CONVEX_VERSION }),
 );
 
 const _app = definePdsApp({ plugins: [accounts, messages] });
@@ -52,8 +54,5 @@ void unknownInstalledName;
 // @ts-expect-error -- messages requires the accounts plugin.
 definePdsApp({ plugins: [messages] });
 
-// @ts-expect-error -- accounts@2 does not satisfy messages' requirement.
-definePdsApp({ plugins: [accountsV2, messages] });
-
 // @ts-expect-error -- plugin names must be unique within a PDS.
 definePdsApp({ plugins: [accounts, accounts] });
diff --git a/packages/decentralized-convex-server/src/descriptor.test.ts b/packages/decentralized-convex-server/src/descriptor.test.ts
index d1f1c8ff..1820489b 100644
--- a/packages/decentralized-convex-server/src/descriptor.test.ts
+++ b/packages/decentralized-convex-server/src/descriptor.test.ts
@@ -6,18 +6,20 @@ import { federationDescriptorResponse } from "./descriptor.ts";
 void test("serves a capability-oriented descriptor", async () => {
   const response = federationDescriptorResponse({
     accountDomain: "notes.example",
-    capabilities: [{ id: "example.notes", versions: ["1"] }],
+    capabilities: [{ id: "example.notes", lastChanged: "0.1.0" }],
     deploymentUrl: "https://notes.example",
     httpUrl: "https://notes-http.example",
-    protocolVersion: "0.1",
+    lastChanged: "0.1.0",
+    version: "0.1.0",
   });
 
   assert.equal(response.status, 200);
   assert.deepEqual(await response.json(), {
     accountDomain: "notes.example",
-    capabilities: [{ id: "example.notes", versions: ["1"] }],
+    capabilities: [{ id: "example.notes", lastChanged: "0.1.0" }],
     deploymentUrl: "https://notes.example",
     httpUrl: "https://notes-http.example",
-    protocolVersion: "0.1",
+    lastChanged: "0.1.0",
+    version: "0.1.0",
   });
 });
diff --git a/packages/decentralized-convex-server/src/descriptor.ts b/packages/decentralized-convex-server/src/descriptor.ts
index 7aab8ab3..e93e0e4d 100644
--- a/packages/decentralized-convex-server/src/descriptor.ts
+++ b/packages/decentralized-convex-server/src/descriptor.ts
@@ -4,7 +4,7 @@ export const FEDERATION_DESCRIPTOR_PATH = "/.well-known/decentralized-convex";
 
 export interface FederationCapability {
   id: string;
-  versions: readonly string[];
+  lastChanged: string;
 }
 
 export interface FederationAuthDescriptor {
@@ -18,7 +18,8 @@ export interface FederationDescriptor {
   capabilities?: readonly FederationCapability[];
   deploymentUrl: string;
   httpUrl: string;
-  protocolVersion: "0.1";
+  lastChanged: string;
+  version: string;
 }
 
 export interface RegisterFederationRoutesOptions {
diff --git a/packages/decentralized-convex-server/src/dispatcher-types.ts b/packages/decentralized-convex-server/src/dispatcher-types.ts
new file mode 100644
index 00000000..880fd4c1
--- /dev/null
+++ b/packages/decentralized-convex-server/src/dispatcher-types.ts
@@ -0,0 +1,45 @@
+import type { FunctionReference } from "convex/server";
+import type { Value } from "convex/values";
+
+import type { DispatcherIdentity } from "./dispatcher.ts";
+
+interface ComponentDispatcherRequest {
+  readonly [key: string]: Value;
+  readonly identity: DispatcherIdentity | null;
+  readonly lastChanged: string;
+  // Component operation unions differ by plugin and are erased only inside the trusted router.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  readonly operation: any;
+  readonly version: string;
+}
+
+interface DispatcherResponse {
+  readonly routes?: readonly string[];
+  readonly type: string;
+  readonly value: Value;
+}
+
+type ComponentQuery = FunctionReference<
+  "query",
+  "internal" | "public",
+  ComponentDispatcherRequest,
+  DispatcherResponse
+>;
+
+type ComponentMutation = FunctionReference<
+  "mutation",
+  "internal" | "public",
+  ComponentDispatcherRequest,
+  DispatcherResponse
+>;
+
+interface DispatcherComponent {
+  readonly dispatcher: {
+    readonly dispatchMutation: ComponentMutation;
+    readonly dispatchQuery: ComponentQuery;
+  };
+}
+
+export type DispatcherComponents = Readonly<
+  Record<string, DispatcherComponent>
+>;
diff --git a/packages/decentralized-convex-server/src/dispatcher.ts b/packages/decentralized-convex-server/src/dispatcher.ts
index 678c46fb..dd90b01b 100644
--- a/packages/decentralized-convex-server/src/dispatcher.ts
+++ b/packages/decentralized-convex-server/src/dispatcher.ts
@@ -9,7 +9,6 @@ import type {
 } from "@decentralized-convex/plugin";
 import type {
   Auth,
-  FunctionReference,
   GenericDataModel,
   GenericMutationCtx,
   GenericQueryCtx,
@@ -17,17 +16,18 @@ import type {
   QueryBuilder,
   ValidatorTypeToReturnType,
 } from "convex/server";
-import type { Value } from "convex/values";
 import {
   operationResponseValidator,
   operationValidator,
 } from "@decentralized-convex/plugin";
 import { ConvexError, v } from "convex/values";
 
+import type { DispatcherComponents } from "./dispatcher-types.ts";
 import type { RoutedQueryResult } from "./routed-query.ts";
 import { isRoutedQueryResult } from "./routed-query.ts";
 
 export interface DispatcherIdentity {
+  readonly [key: string]: string | undefined;
   readonly accountId?: string;
   readonly email?: string;
   readonly issuer: string;
@@ -116,8 +116,9 @@ export function defineComponentDispatchers<
     dispatchMutation: mutation({
       args: {
         identity: componentDispatcherArgs.identity,
+        lastChanged: v.literal(protocol.lastChanged),
         operation: mutationOperation,
-        version: v.literal(protocol.version),
+        version: v.string(),
       },
       returns: mutationReturns,
       handler: async (ctx, { identity, operation }) =>
@@ -136,8 +137,9 @@ export function defineComponentDispatchers<
     dispatchQuery: query({
       args: {
         identity: componentDispatcherArgs.identity,
+        lastChanged: v.literal(protocol.lastChanged),
         operation: queryOperation,
-        version: v.literal(protocol.version),
+        version: v.string(),
       },
       returns: queryReturns,
       handler: async (ctx, { identity, operation }) => {
@@ -159,30 +161,6 @@ export function defineComponentDispatchers<
   } as const;
 }
 
-type ComponentQuery = FunctionReference<
-  "query",
-  "internal" | "public",
-  // Component operation unions differ by plugin and are erased only inside the trusted router.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  { identity: DispatcherIdentity | null; operation: any; version: string },
-  DispatcherResponse
->;
-
-type ComponentMutation = FunctionReference<
-  "mutation",
-  "internal" | "public",
-  // Component operation unions differ by plugin and are erased only inside the trusted router.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  { identity: DispatcherIdentity | null; operation: any; version: string },
-  DispatcherResponse
->;
-
-interface DispatcherResponse {
-  readonly routes?: readonly string[];
-  readonly type: string;
-  readonly value: Value;
-}
-
 export function definePdsRouter<DataModel extends GenericDataModel>({
   components,
   mutation,
@@ -195,13 +173,19 @@ export function definePdsRouter<DataModel extends GenericDataModel>({
   const installed = readDispatcherComponents(components);
   return {
     dispatchMutation: mutation({
-      args: { operation: v.any(), plugin: v.string(), version: v.string() },
+      args: {
+        lastChanged: v.string(),
+        operation: v.any(),
+        plugin: v.string(),
+        version: v.string(),
+      },
       returns: v.any(),
       handler: async (ctx, request) => {
         const component = getDispatcherComponent(installed, request.plugin);
         const identity = await resolveIdentity(ctx);
         const response = await ctx.runMutation(component.mutation, {
           identity,
+          lastChanged: request.lastChanged,
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           operation: request.operation,
           version: request.version,
@@ -210,13 +194,19 @@ export function definePdsRouter<DataModel extends GenericDataModel>({
       },
     }),
     dispatchQuery: query({
-      args: { operation: v.any(), plugin: v.string(), version: v.string() },
+      args: {
+        lastChanged: v.string(),
+        operation: v.any(),
+        plugin: v.string(),
+        version: v.string(),
+      },
       returns: v.any(),
       handler: async (ctx, request) => {
         const component = getDispatcherComponent(installed, request.plugin);
         const identity = await resolveIdentity(ctx);
         const response = await ctx.runQuery(component.query, {
           identity,
+          lastChanged: request.lastChanged,
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           operation: request.operation,
           version: request.version,
@@ -274,15 +264,6 @@ function invokeOperation<Operations extends OperationMap, Context>(
   ]);
 }
 
-interface DispatcherComponent {
-  readonly dispatcher: {
-    readonly dispatchMutation: ComponentMutation;
-    readonly dispatchQuery: ComponentQuery;
-  };
-}
-
-type DispatcherComponents = Readonly<Record<string, DispatcherComponent>>;
-
 function readDispatcherComponents(components: unknown): DispatcherComponents {
   // Convex generates `components` as a lazy proxy. Computed property access creates the same
   // FunctionReferences as static `components.myPlugin.dispatcher.*` access.
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
index cf70aea1..81223083 100644
--- a/packages/decentralized-convex-server/src/index.ts
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -1,6 +1,8 @@
 export {
   definePdsApp,
   definePdsPluginComponent,
+  pdsDescriptorFromApp,
+  pdsReleaseFromApp,
   protocolsFromPdsApp,
   protocolCapabilities,
 } from "./app.ts";
diff --git a/packages/decentralized-convex-tanstack-query/package.json b/packages/decentralized-convex-tanstack-query/package.json
index 22b58feb..3f1c2bee 100644
--- a/packages/decentralized-convex-tanstack-query/package.json
+++ b/packages/decentralized-convex-tanstack-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@decentralized-convex/tanstack-query",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "private": true,
   "type": "module",
   "exports": {
@@ -12,11 +12,13 @@
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "format:fix": "prettier --write . --ignore-path ../../.gitignore",
     "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@decentralized-convex/client": "workspace:*",
-    "@decentralized-convex/react": "workspace:*",
+    "@decentralized-convex/client": "workspace:0.1.0",
+    "@decentralized-convex/core": "workspace:0.1.0",
+    "@decentralized-convex/react": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "peerDependencies": {
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index c481d030..94d6ecd2 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -13,6 +13,10 @@ import {
   QueryObserver,
 } from "@tanstack/react-query";
 import { DecentralizedConvexClient } from "@decentralized-convex/client";
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "@decentralized-convex/core";
 
 import { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
 
@@ -25,17 +29,19 @@ function listNotes(args: {
   owner: string;
 }): PdsRequest<readonly Note[], "query"> {
   return {
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     operation: { args, type: "list" },
     plugin: "notes",
-    version: "1",
+    version: DECENTRALIZED_CONVEX_VERSION,
   };
 }
 
 function createNote(args: { body: string }): PdsRequest<Note, "mutation"> {
   return {
+    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
     operation: { args, type: "create" },
     plugin: "notes",
-    version: "1",
+    version: DECENTRALIZED_CONVEX_VERSION,
   };
 }
 
@@ -151,9 +157,16 @@ function discoveredPds(domain: string) {
     domain,
     manifest: {
       accountDomain: domain,
+      capabilities: [
+        {
+          id: "notes",
+          lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+        },
+      ],
       deploymentUrl: `https://${domain}`,
       httpUrl: `https://${domain}`,
-      protocolVersion: "0.1" as const,
+      lastChanged: "0.1.0",
+      version: "0.1.0",
     },
     manifestUrl: `https://${domain}/.well-known/pds.json`,
   };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4d0bcdb6..15e30349 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -123,16 +123,16 @@ importers:
         specifier: 0.12.5
         version: 0.12.5(@standard-schema/spec@1.1.0)(better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)
       '@decentralized-convex/client':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-client
       '@decentralized-convex/messages':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-messages
       '@decentralized-convex/react':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-react
       '@decentralized-convex/tanstack-query':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-tanstack-query
       '@tanstack/react-query':
         specifier: 'catalog:'
@@ -201,11 +201,14 @@ importers:
 
   packages/decentralized-convex-accounts:
     dependencies:
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       '@decentralized-convex/plugin':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-plugin
       '@decentralized-convex/server':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-server
       convex:
         specifier: 'catalog:'
@@ -234,6 +237,10 @@ importers:
         version: 5.9.3
 
   packages/decentralized-convex-address:
+    dependencies:
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
     devDependencies:
       '@acme/eslint-config':
         specifier: workspace:*
@@ -260,10 +267,13 @@ importers:
   packages/decentralized-convex-client:
     dependencies:
       '@decentralized-convex/address':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-address
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       '@decentralized-convex/plugin':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-plugin
       convex:
         specifier: 'catalog:'
@@ -291,13 +301,40 @@ importers:
         specifier: 'catalog:'
         version: 5.9.3
 
+  packages/decentralized-convex-core:
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
   packages/decentralized-convex-messages:
     dependencies:
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       '@decentralized-convex/plugin':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-plugin
       '@decentralized-convex/server':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-server
       convex:
         specifier: 'catalog:'
@@ -327,6 +364,9 @@ importers:
 
   packages/decentralized-convex-plugin:
     dependencies:
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       convex:
         specifier: 'catalog:'
         version: 1.38.0(react@19.2.5)
@@ -356,7 +396,7 @@ importers:
   packages/decentralized-convex-react:
     dependencies:
       '@decentralized-convex/client':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-client
       convex:
         specifier: 'catalog:'
@@ -392,8 +432,11 @@ importers:
 
   packages/decentralized-convex-server:
     dependencies:
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       '@decentralized-convex/plugin':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-plugin
       convex:
         specifier: 'catalog:'
@@ -424,10 +467,13 @@ importers:
   packages/decentralized-convex-tanstack-query:
     dependencies:
       '@decentralized-convex/client':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-client
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       '@decentralized-convex/react':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../decentralized-convex-react
       convex:
         specifier: 'catalog:'
@@ -470,19 +516,19 @@ importers:
         specifier: 0.12.5
         version: 0.12.5(@standard-schema/spec@1.1.0)(better-auth@1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(convex@1.38.0(react@19.2.5))(react@19.2.5)(typescript@5.9.3)
       '@decentralized-convex/accounts':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-accounts
       '@decentralized-convex/address':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-address
       '@decentralized-convex/client':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-client
       '@decentralized-convex/messages':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-messages
       '@decentralized-convex/server':
-        specifier: workspace:*
+        specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-server
       better-auth:
         specifier: ~1.6.15
diff --git a/scripts/check-decentralized-convex-release.ts b/scripts/check-decentralized-convex-release.ts
new file mode 100644
index 00000000..43b7bd08
--- /dev/null
+++ b/scripts/check-decentralized-convex-release.ts
@@ -0,0 +1,101 @@
+import { readdir, readFile } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+
+import {
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+  DECENTRALIZED_CONVEX_RELEASES,
+  DECENTRALIZED_CONVEX_VERSION,
+} from "../packages/decentralized-convex-core/src/index.ts";
+
+const packages = {
+  accounts: "decentralized-convex-accounts",
+  address: "decentralized-convex-address",
+  client: "decentralized-convex-client",
+  core: "decentralized-convex-core",
+  messages: "decentralized-convex-messages",
+  plugin: "decentralized-convex-plugin",
+  react: "decentralized-convex-react",
+  server: "decentralized-convex-server",
+  tanstackQuery: "decentralized-convex-tanstack-query",
+} as const;
+
+const repoRoot = fileURLToPath(new URL("../", import.meta.url));
+const problems: string[] = [];
+
+for (const [part, directory] of Object.entries(packages)) {
+  const manifest = await readJson(`${repoRoot}packages/${directory}/package.json`);
+  if (manifest.version !== DECENTRALIZED_CONVEX_VERSION) {
+    problems.push(
+      `${manifest.name ?? directory} is ${String(manifest.version)}, expected ${DECENTRALIZED_CONVEX_VERSION}`,
+    );
+  }
+  if (!(part in DECENTRALIZED_CONVEX_LAST_CHANGED)) {
+    problems.push(`${part} is missing lastChanged metadata`);
+  }
+
+}
+
+for (const root of ["apps", "packages", "services", "shared", "tooling"]) {
+  for (const entry of await readdir(`${repoRoot}${root}`, {
+    withFileTypes: true,
+  })) {
+    if (!entry.isDirectory()) continue;
+    const manifest = await readJson(
+      `${repoRoot}${root}/${entry.name}/package.json`,
+    );
+    checkInternalDependencyRanges(manifest);
+  }
+}
+
+if (!("protocol" in DECENTRALIZED_CONVEX_LAST_CHANGED)) {
+  problems.push("protocol is missing lastChanged metadata");
+}
+if (
+  DECENTRALIZED_CONVEX_RELEASES.at(-1) !== DECENTRALIZED_CONVEX_VERSION
+) {
+  problems.push("the current version is not the latest known release");
+}
+for (const [part, lastChanged] of Object.entries(
+  DECENTRALIZED_CONVEX_LAST_CHANGED,
+)) {
+  if (!DECENTRALIZED_CONVEX_RELEASES.includes(lastChanged)) {
+    problems.push(`${part} last changed in unknown release ${lastChanged}`);
+  }
+}
+
+if (problems.length > 0) {
+  throw new Error(
+    `Decentralized Convex release drift:\n${problems.map((problem) => `- ${problem}`).join("\n")}`,
+  );
+}
+
+console.log(
+  `Decentralized Convex ${DECENTRALIZED_CONVEX_VERSION}: package versions and internal dependencies are in sync.`,
+);
+
+async function readJson(path: string): Promise<Record<string, unknown>> {
+  const value: unknown = JSON.parse(await readFile(path, "utf8"));
+  if (!isRecord(value)) throw new Error(`${path} is not a JSON object`);
+  return value;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function checkInternalDependencyRanges(manifest: Record<string, unknown>) {
+  for (const field of ["dependencies", "devDependencies", "peerDependencies"]) {
+    const dependencies = manifest[field];
+    if (!isRecord(dependencies)) continue;
+    for (const [name, range] of Object.entries(dependencies)) {
+      if (
+        name.startsWith("@decentralized-convex/") &&
+        range !== `workspace:${DECENTRALIZED_CONVEX_VERSION}`
+      ) {
+        problems.push(
+          `${String(manifest.name)} declares ${name} as ${String(range)}, expected workspace:${DECENTRALIZED_CONVEX_VERSION}`,
+        );
+      }
+    }
+  }
+}
diff --git a/services/backend/convex/http.ts b/services/backend/convex/http.ts
index 8dc69ec1..39e1510a 100644
--- a/services/backend/convex/http.ts
+++ b/services/backend/convex/http.ts
@@ -1,29 +1,28 @@
 import {
-  protocolCapabilities,
+  pdsDescriptorFromApp,
   registerFederationRoutes,
 } from "@decentralized-convex/server";
 import { httpRouter } from "convex/server";
 
-import { protocols } from "../pds";
 import { httpAction } from "./_generated/server";
 import { authComponent, createAuth } from "./auth";
+import app from "./convex.config";
 import { requireEnvironment } from "./lib";
 
 const http = httpRouter();
 
 authComponent.registerRoutes(http, createAuth, { cors: true });
 registerFederationRoutes(http, httpAction, {
-  descriptor: () => ({
-    accountDomain: requireEnvironment("FEDERATION_DOMAIN"),
-    auth: {
-      issuer: requireEnvironment("CONVEX_SITE_URL"),
-      jwksUrl: `${requireEnvironment("CONVEX_SITE_URL")}/api/auth/convex/jwks`,
-    },
-    capabilities: protocolCapabilities(...protocols),
-    deploymentUrl: requireEnvironment("CONVEX_CLOUD_URL"),
-    httpUrl: requireEnvironment("CONVEX_SITE_URL"),
-    protocolVersion: "0.1",
-  }),
+  descriptor: () =>
+    pdsDescriptorFromApp(app, {
+      accountDomain: requireEnvironment("FEDERATION_DOMAIN"),
+      auth: {
+        issuer: requireEnvironment("CONVEX_SITE_URL"),
+        jwksUrl: `${requireEnvironment("CONVEX_SITE_URL")}/api/auth/convex/jwks`,
+      },
+      deploymentUrl: requireEnvironment("CONVEX_CLOUD_URL"),
+      httpUrl: requireEnvironment("CONVEX_SITE_URL"),
+    }),
 });
 
 export default http;
diff --git a/services/backend/package.json b/services/backend/package.json
index e5307951..4217aabd 100644
--- a/services/backend/package.json
+++ b/services/backend/package.json
@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@convex-dev/better-auth": "0.12.5",
-    "@decentralized-convex/accounts": "workspace:*",
-    "@decentralized-convex/address": "workspace:*",
-    "@decentralized-convex/client": "workspace:*",
-    "@decentralized-convex/messages": "workspace:*",
-    "@decentralized-convex/server": "workspace:*",
+    "@decentralized-convex/accounts": "workspace:0.1.0",
+    "@decentralized-convex/address": "workspace:0.1.0",
+    "@decentralized-convex/client": "workspace:0.1.0",
+    "@decentralized-convex/messages": "workspace:0.1.0",
+    "@decentralized-convex/server": "workspace:0.1.0",
     "better-auth": "~1.6.15",
     "convex": "catalog:",
     "jose": "catalog:",

From 8a61d5840076d3f1b493f8660abcf0fe61a19139 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 14:47:43 -0400
Subject: [PATCH 09/17] Decentralize package release metadata

---
 AGENTS.md                                     |  9 +-
 docs/architecture.md                          | 14 +++-
 docs/versioning.md                            | 27 ++++--
 .../_generated/api.ts                         | 10 ++-
 .../decentralized-convex-accounts/index.ts    |  1 +
 .../decentralized-convex-accounts/metadata.ts |  6 ++
 .../package.json                              |  3 +-
 .../decentralized-convex-accounts/protocol.ts |  5 +-
 .../decentralized-convex-address/metadata.ts  |  6 ++
 .../decentralized-convex-address/package.json |  3 +-
 .../decentralized-convex-address/src/index.ts |  1 +
 .../tsconfig.json                             |  2 +-
 .../decentralized-convex-client/metadata.ts   |  6 ++
 .../decentralized-convex-client/package.json  |  3 +-
 .../decentralized-convex-client/src/api.ts    |  8 +-
 .../src/client.test.ts                        |  4 +-
 .../src/compatibility.test.ts                 |  8 +-
 .../src/compatibility.ts                      |  4 +-
 .../decentralized-convex-client/src/index.ts  |  1 +
 .../src/pds.test.ts                           | 16 ++--
 .../src/pds.type-test.ts                      |  4 +-
 .../decentralized-convex-client/tsconfig.json |  2 +-
 .../decentralized-convex-core/metadata.ts     |  6 ++
 .../decentralized-convex-core/package.json    |  3 +-
 .../src/index.test.ts                         | 24 ++++--
 .../decentralized-convex-core/src/index.ts    | 43 +++-------
 .../decentralized-convex-core/src/release.ts  | 42 ++++++++++
 .../decentralized-convex-core/tsconfig.json   |  2 +-
 .../_generated/api.ts                         | 10 ++-
 .../decentralized-convex-messages/index.ts    |  1 +
 .../decentralized-convex-messages/metadata.ts |  6 ++
 .../package.json                              |  3 +-
 .../decentralized-convex-messages/protocol.ts |  9 +-
 .../decentralized-convex-plugin/README.md     | 15 +++-
 .../decentralized-convex-plugin/metadata.ts   |  6 ++
 .../decentralized-convex-plugin/package.json  |  3 +-
 .../decentralized-convex-plugin/src/index.ts  |  1 +
 .../src/operations.test.ts                    |  6 +-
 .../decentralized-convex-plugin/tsconfig.json |  2 +-
 .../decentralized-convex-react/metadata.ts    |  6 ++
 .../decentralized-convex-react/package.json   |  4 +-
 .../decentralized-convex-react/src/index.ts   |  1 +
 .../decentralized-convex-react/tsconfig.json  |  2 +-
 .../decentralized-convex-server/metadata.ts   |  6 ++
 .../decentralized-convex-server/package.json  |  3 +-
 .../src/app.test.ts                           | 14 ++--
 .../decentralized-convex-server/src/app.ts    |  8 +-
 .../src/app.type-test.ts                      |  8 +-
 .../decentralized-convex-server/src/index.ts  |  1 +
 .../decentralized-convex-server/tsconfig.json |  2 +-
 .../metadata.ts                               |  6 ++
 .../package.json                              |  3 +-
 .../src/index.ts                              |  1 +
 .../src/pds.test.ts                           | 12 ++-
 .../tsconfig.json                             |  2 +-
 pnpm-lock.yaml                                |  3 +
 scripts/check-decentralized-convex-release.ts | 84 ++++++++++++-------
 57 files changed, 325 insertions(+), 166 deletions(-)
 create mode 100644 packages/decentralized-convex-accounts/metadata.ts
 create mode 100644 packages/decentralized-convex-address/metadata.ts
 create mode 100644 packages/decentralized-convex-client/metadata.ts
 create mode 100644 packages/decentralized-convex-core/metadata.ts
 create mode 100644 packages/decentralized-convex-core/src/release.ts
 create mode 100644 packages/decentralized-convex-messages/metadata.ts
 create mode 100644 packages/decentralized-convex-plugin/metadata.ts
 create mode 100644 packages/decentralized-convex-react/metadata.ts
 create mode 100644 packages/decentralized-convex-server/metadata.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/metadata.ts

diff --git a/AGENTS.md b/AGENTS.md
index 99ff9353..caf03235 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -21,13 +21,16 @@ Then summarize changes for the user.
 
 All official `@decentralized-convex/*` packages and the wire protocol use one
 exact ecosystem version. The source of truth is
-`packages/decentralized-convex-core/src/index.ts`.
+`packages/decentralized-convex-core/src/release.ts`.
 
 - Never version one decentralized Convex package independently.
 - On every release, bump every `@decentralized-convex/*` `package.json` and
   every internal `workspace:<version>` dependency together.
-- Update `DECENTRALIZED_CONVEX_LAST_CHANGED` only for packages or wire
-  contracts that actually changed in that release.
+- Every package owns a root `metadata.ts` and exports its
+  `decentralizedConvexPackage` object from `./metadata`. Update that package's
+  `lastChanged` only when the package actually changes.
+- Never add a registry of package metadata to core. Release tooling discovers
+  and validates the standardized package exports.
 - Do not write a plugin protocol version manually; `definePluginProtocol`
   injects the ecosystem version.
 - Run `pnpm run decentralized-convex:check`; it is also enforced by lint.
diff --git a/docs/architecture.md b/docs/architecture.md
index e6e1837d..82a735fe 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -2,11 +2,18 @@
 
 ## One concept from package to wire
 
-A plugin protocol is the source of truth for four things:
+A package owns its release metadata, and its plugin protocol consumes that
+local export:
 
 ```ts
+export const decentralizedConvexPackage =
+  defineDecentralizedConvexPackage({
+    name: "@decentralized-convex/messages",
+    lastChanged: "0.1.0",
+  });
+
 export const messagesProtocol = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.messages,
+  lastChanged: decentralizedConvexPackage.lastChanged,
   name: "messages",
   requires: { accounts: DECENTRALIZED_CONVEX_VERSION },
   queries: { list: defineOperation(/* validators */) },
@@ -16,7 +23,8 @@ export const messagesProtocol = definePluginProtocol({
 
 - `name` is the Convex Component install name and wire plugin discriminator.
 - the ecosystem `version` is injected from one release source of truth;
-- `lastChanged` records when this plugin's wire contract actually changed;
+- `lastChanged` comes from the package that owns the plugin and records when
+  that package actually changed;
 - `requires` is validated against the complete deployment at type-check and
   Convex config evaluation time.
 - operation validators produce client argument/result types and enforce the
diff --git a/docs/versioning.md b/docs/versioning.md
index 80295a38..4f0ca1ec 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -6,16 +6,31 @@ Every official `@decentralized-convex/*` npm package, plugin protocol, client
 request, and server release uses one exact version. The initial release is
 `0.1.0`. If any constituent changes, every package is republished together.
 
-The source of truth is
-`packages/decentralized-convex-core/src/index.ts`. It contains:
+The global release source of truth is
+`packages/decentralized-convex-core/src/release.ts`. It contains only:
 
 - the current ecosystem version;
 - the ordered set of known releases;
-- `lastChanged`, recording the ecosystem release in which each package or wire
-  contract last actually changed.
+- the factory and TypeScript type for standardized package metadata.
+
+Each package owns its own root `metadata.ts` and exposes it through the same
+`./metadata` package export:
+
+```ts
+export const decentralizedConvexPackage =
+  defineDecentralizedConvexPackage({
+    name: "@decentralized-convex/messages",
+    lastChanged: "0.1.0",
+  });
+```
+
+That local `lastChanged` records the ecosystem release in which that package
+last actually changed. Core does not import, enumerate, or store metadata for
+the other packages.
 
 `scripts/check-decentralized-convex-release.ts` verifies every official package
-version and every internal dependency. It runs as part of `pnpm run lint`.
+version, discovers and validates every local metadata export, and checks every
+internal dependency. It runs as part of `pnpm run lint`.
 `definePluginProtocol` injects the ecosystem version, so plugin authors cannot
 accidentally publish a different protocol version.
 
@@ -51,7 +66,7 @@ For a future release:
 2. Set every official package version to that exact release.
 3. Set every internal decentralized Convex dependency to
    `workspace:<release>`.
-4. Update `DECENTRALIZED_CONVEX_LAST_CHANGED` only for constituents that
+4. Update `lastChanged` in the local `metadata.ts` of only the packages that
    actually changed.
 5. Add required Component migrations and compatibility tests.
 6. Run `pnpm run decentralized-convex:check`, followed by the repository's
diff --git a/packages/decentralized-convex-accounts/_generated/api.ts b/packages/decentralized-convex-accounts/_generated/api.ts
index 4940cc5b..2b44fdc3 100644
--- a/packages/decentralized-convex-accounts/_generated/api.ts
+++ b/packages/decentralized-convex-accounts/_generated/api.ts
@@ -8,10 +8,6 @@
  * @module
  */
 
-import type * as dispatcher from "../dispatcher.js";
-import type * as index from "../index.js";
-import type * as protocol from "../protocol.js";
-
 import type {
   ApiFromModules,
   FilterApi,
@@ -19,9 +15,15 @@ import type {
 } from "convex/server";
 import { anyApi, componentsGeneric } from "convex/server";
 
+import type * as dispatcher from "../dispatcher.js";
+import type * as index from "../index.js";
+import type * as metadata from "../metadata.js";
+import type * as protocol from "../protocol.js";
+
 const fullApi: ApiFromModules<{
   dispatcher: typeof dispatcher;
   index: typeof index;
+  metadata: typeof metadata;
   protocol: typeof protocol;
 }> = anyApi as any;
 
diff --git a/packages/decentralized-convex-accounts/index.ts b/packages/decentralized-convex-accounts/index.ts
index 7957d853..16842381 100644
--- a/packages/decentralized-convex-accounts/index.ts
+++ b/packages/decentralized-convex-accounts/index.ts
@@ -1,2 +1,3 @@
+export { decentralizedConvexPackage } from "./metadata.ts";
 export { accountProfile, accountsProtocol } from "./protocol.ts";
 export type { AccountProfile } from "./protocol.ts";
diff --git a/packages/decentralized-convex-accounts/metadata.ts b/packages/decentralized-convex-accounts/metadata.ts
new file mode 100644
index 00000000..a673af5a
--- /dev/null
+++ b/packages/decentralized-convex-accounts/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/accounts",
+});
diff --git a/packages/decentralized-convex-accounts/package.json b/packages/decentralized-convex-accounts/package.json
index a9b26088..f3489c7c 100644
--- a/packages/decentralized-convex-accounts/package.json
+++ b/packages/decentralized-convex-accounts/package.json
@@ -5,7 +5,8 @@
   "type": "module",
   "exports": {
     ".": "./index.ts",
-    "./convex.config": "./convex.config.ts"
+    "./convex.config": "./convex.config.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-accounts/protocol.ts b/packages/decentralized-convex-accounts/protocol.ts
index 84a03d18..2eb68c86 100644
--- a/packages/decentralized-convex-accounts/protocol.ts
+++ b/packages/decentralized-convex-accounts/protocol.ts
@@ -1,11 +1,12 @@
 import type { Infer } from "convex/values";
-import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
 } from "@decentralized-convex/plugin";
 import { v } from "convex/values";
 
+import { decentralizedConvexPackage } from "./metadata.ts";
+
 export const accountProfile = v.object({
   accountId: v.string(),
   avatarUrl: v.union(v.null(), v.string()),
@@ -15,7 +16,7 @@ export const accountProfile = v.object({
 export type AccountProfile = Infer<typeof accountProfile>;
 
 export const accountsProtocol = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.accounts,
+  lastChanged: decentralizedConvexPackage.lastChanged,
   name: "accounts",
   mutations: {
     upsertMyProfile: defineOperation({
diff --git a/packages/decentralized-convex-address/metadata.ts b/packages/decentralized-convex-address/metadata.ts
new file mode 100644
index 00000000..a628a9fc
--- /dev/null
+++ b/packages/decentralized-convex-address/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/address",
+});
diff --git a/packages/decentralized-convex-address/package.json b/packages/decentralized-convex-address/package.json
index 784a435a..1ba6611a 100644
--- a/packages/decentralized-convex-address/package.json
+++ b/packages/decentralized-convex-address/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-address/src/index.ts b/packages/decentralized-convex-address/src/index.ts
index 988c6b9c..8ad37e2b 100644
--- a/packages/decentralized-convex-address/src/index.ts
+++ b/packages/decentralized-convex-address/src/index.ts
@@ -1,3 +1,4 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
 export { addressToTarget, formatAddress, parseAddress } from "./address.ts";
 export type { DecentralizedAddress } from "./address.ts";
 export {
diff --git a/packages/decentralized-convex-address/tsconfig.json b/packages/decentralized-convex-address/tsconfig.json
index e4011a4e..eac79cac 100644
--- a/packages/decentralized-convex-address/tsconfig.json
+++ b/packages/decentralized-convex-address/tsconfig.json
@@ -5,5 +5,5 @@
     "lib": ["ES2022", "DOM"],
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"]
+  "include": ["metadata.ts", "src/**/*.ts"]
 }
diff --git a/packages/decentralized-convex-client/metadata.ts b/packages/decentralized-convex-client/metadata.ts
new file mode 100644
index 00000000..dfa739c0
--- /dev/null
+++ b/packages/decentralized-convex-client/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/client",
+});
diff --git a/packages/decentralized-convex-client/package.json b/packages/decentralized-convex-client/package.json
index 0fe27b69..295b8373 100644
--- a/packages/decentralized-convex-client/package.json
+++ b/packages/decentralized-convex-client/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-client/src/api.ts b/packages/decentralized-convex-client/src/api.ts
index bbc74591..51123451 100644
--- a/packages/decentralized-convex-client/src/api.ts
+++ b/packages/decentralized-convex-client/src/api.ts
@@ -4,10 +4,8 @@ import type {
   OperationMap,
   OperationResult,
 } from "@decentralized-convex/plugin";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 
 import type {
   FederationTarget,
@@ -160,7 +158,7 @@ export function definePdsApi<
       id: name,
       lastChanged,
     })),
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     version: DECENTRALIZED_CONVEX_VERSION,
   });
 
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
index a1558490..52a73e92 100644
--- a/packages/decentralized-convex-client/src/client.test.ts
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
-import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
   definePluginProtocol,
@@ -55,7 +55,7 @@ void test("groups identities by deployment and combines native query results", a
 
 void test("federates typed PDS requests without a generated backend API", async () => {
   const notes = definePluginProtocol({
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     name: "notes",
     mutations: {
       create: defineOperation({
diff --git a/packages/decentralized-convex-client/src/compatibility.test.ts b/packages/decentralized-convex-client/src/compatibility.test.ts
index 6a50030a..db0a9249 100644
--- a/packages/decentralized-convex-client/src/compatibility.test.ts
+++ b/packages/decentralized-convex-client/src/compatibility.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import type { DiscoveredPds } from "@decentralized-convex/address";
-import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
   definePluginProtocol,
@@ -15,7 +15,7 @@ import {
 } from "./compatibility.ts";
 
 const notes = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+  lastChanged: corePackage.lastChanged,
   name: "notes",
   mutations: {
     write: defineOperation({ args: v.object({}), returns: v.null() }),
@@ -65,12 +65,12 @@ function discoveredPds({
   capabilities = [
     {
       id: "notes",
-      lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+      lastChanged: corePackage.lastChanged,
     },
   ],
   capabilityLastChanged,
   ecosystemVersion = "0.1.0",
-  protocolLastChanged = DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+  protocolLastChanged = corePackage.lastChanged,
 }: {
   capabilities?: { id: string; lastChanged: string }[];
   capabilityLastChanged?: string;
diff --git a/packages/decentralized-convex-client/src/compatibility.ts b/packages/decentralized-convex-client/src/compatibility.ts
index 269d25d6..5536e7bb 100644
--- a/packages/decentralized-convex-client/src/compatibility.ts
+++ b/packages/decentralized-convex-client/src/compatibility.ts
@@ -1,5 +1,5 @@
 import type { DiscoveredPds } from "@decentralized-convex/address";
-import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 
 import type { SerializedPdsRequest } from "./api.ts";
 import { pdsApiRequirements } from "./api.ts";
@@ -25,7 +25,7 @@ export function assertPdsRequestCompatibility(
   pds: DiscoveredPds,
   request: SerializedPdsRequest,
 ): DiscoveredPds {
-  assertRequirements(pds, DECENTRALIZED_CONVEX_LAST_CHANGED.protocol, [
+  assertRequirements(pds, corePackage.lastChanged, [
     { id: request.plugin, lastChanged: request.lastChanged },
   ]);
   return pds;
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 4ccdda25..4f97a8e8 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -1,3 +1,4 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
 export { DecentralizedConvexClient } from "./client.ts";
 export {
   assertPdsCompatibility,
diff --git a/packages/decentralized-convex-client/src/pds.test.ts b/packages/decentralized-convex-client/src/pds.test.ts
index 5b43947d..35ca1e2d 100644
--- a/packages/decentralized-convex-client/src/pds.test.ts
+++ b/packages/decentralized-convex-client/src/pds.test.ts
@@ -1,9 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
   definePluginProtocol,
@@ -15,7 +13,7 @@ import type { PdsConnection } from "./pds.ts";
 import { definePdsApi, PdsClient, pdsFunctions } from "./pds.ts";
 
 const notes = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+  lastChanged: corePackage.lastChanged,
   name: "notes",
   mutations: {
     create: defineOperation({
@@ -36,25 +34,25 @@ void test("builds serializable PDS dispatcher requests", () => {
   const api = definePdsApi(notes);
 
   assert.deepEqual(api.notes.queries.list({ owner: "shawn" }), {
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     operation: { args: { owner: "shawn" }, type: "list" },
     plugin: "notes",
     version: DECENTRALIZED_CONVEX_VERSION,
   });
   assert.deepEqual(api.notes.mutations.create({ body: "hello" }), {
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     operation: { args: { body: "hello" }, type: "create" },
     plugin: "notes",
     version: DECENTRALIZED_CONVEX_VERSION,
   });
   assert.deepEqual(api.notes.list({ owner: "shawn" }), {
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     operation: { args: { owner: "shawn" }, type: "list" },
     plugin: "notes",
     version: DECENTRALIZED_CONVEX_VERSION,
   });
   assert.deepEqual(api.notes.create({ body: "hello" }), {
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     operation: { args: { body: "hello" }, type: "create" },
     plugin: "notes",
     version: DECENTRALIZED_CONVEX_VERSION,
diff --git a/packages/decentralized-convex-client/src/pds.type-test.ts b/packages/decentralized-convex-client/src/pds.type-test.ts
index 9ff74953..16e9c1d7 100644
--- a/packages/decentralized-convex-client/src/pds.type-test.ts
+++ b/packages/decentralized-convex-client/src/pds.type-test.ts
@@ -1,4 +1,4 @@
-import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
   definePluginProtocol,
@@ -11,7 +11,7 @@ import type { FederatedQuerySnapshot } from "./types.ts";
 import { definePdsApi } from "./pds.ts";
 
 const messaging = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+  lastChanged: corePackage.lastChanged,
   name: "messaging",
   mutations: {
     sendMessage: defineOperation({
diff --git a/packages/decentralized-convex-client/tsconfig.json b/packages/decentralized-convex-client/tsconfig.json
index e4011a4e..eac79cac 100644
--- a/packages/decentralized-convex-client/tsconfig.json
+++ b/packages/decentralized-convex-client/tsconfig.json
@@ -5,5 +5,5 @@
     "lib": ["ES2022", "DOM"],
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"]
+  "include": ["metadata.ts", "src/**/*.ts"]
 }
diff --git a/packages/decentralized-convex-core/metadata.ts b/packages/decentralized-convex-core/metadata.ts
new file mode 100644
index 00000000..91134f31
--- /dev/null
+++ b/packages/decentralized-convex-core/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "./src/release.ts";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/core",
+});
diff --git a/packages/decentralized-convex-core/package.json b/packages/decentralized-convex-core/package.json
index e86419cd..af88bdaa 100644
--- a/packages/decentralized-convex-core/package.json
+++ b/packages/decentralized-convex-core/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-core/src/index.test.ts b/packages/decentralized-convex-core/src/index.test.ts
index 03b37076..452d376a 100644
--- a/packages/decentralized-convex-core/src/index.test.ts
+++ b/packages/decentralized-convex-core/src/index.test.ts
@@ -1,18 +1,32 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 
+import { decentralizedConvexPackage } from "../metadata.ts";
 import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
   DECENTRALIZED_CONVEX_RELEASES,
   DECENTRALIZED_CONVEX_VERSION,
+  defineDecentralizedConvexPackage,
 } from "./index.ts";
 
-void test("the current release and every last-changed value are known", () => {
+void test("defines package-owned metadata against the current release", () => {
   assert.equal(
     DECENTRALIZED_CONVEX_RELEASES.at(-1),
     DECENTRALIZED_CONVEX_VERSION,
   );
-  for (const lastChanged of Object.values(DECENTRALIZED_CONVEX_LAST_CHANGED)) {
-    assert.ok(DECENTRALIZED_CONVEX_RELEASES.includes(lastChanged));
-  }
+  assert.deepEqual(decentralizedConvexPackage, {
+    lastChanged: "0.1.0",
+    name: "@decentralized-convex/core",
+    version: "0.1.0",
+  });
+  assert.deepEqual(
+    defineDecentralizedConvexPackage({
+      lastChanged: "0.1.0",
+      name: "@decentralized-convex/example",
+    }),
+    {
+      lastChanged: "0.1.0",
+      name: "@decentralized-convex/example",
+      version: "0.1.0",
+    },
+  );
 });
diff --git a/packages/decentralized-convex-core/src/index.ts b/packages/decentralized-convex-core/src/index.ts
index 4d5a08aa..1a2cc6c5 100644
--- a/packages/decentralized-convex-core/src/index.ts
+++ b/packages/decentralized-convex-core/src/index.ts
@@ -1,33 +1,10 @@
-/**
- * Every official decentralized Convex package and wire request ships on this
- * one release version. Never update a package version independently.
- */
-export const DECENTRALIZED_CONVEX_VERSION = "0.1.0" as const;
-
-/** All ecosystem releases that may be referenced by lastChanged metadata. */
-export const DECENTRALIZED_CONVEX_RELEASES = ["0.1.0"] as const;
-
-export type DecentralizedConvexVersion =
-  (typeof DECENTRALIZED_CONVEX_RELEASES)[number];
-
-/**
- * The ecosystem release in which each package or wire contract last actually
- * changed. Packages are still republished together on every release.
- */
-export const DECENTRALIZED_CONVEX_LAST_CHANGED = Object.freeze({
-  accounts: "0.1.0",
-  address: "0.1.0",
-  client: "0.1.0",
-  core: "0.1.0",
-  messages: "0.1.0",
-  plugin: "0.1.0",
-  protocol: "0.1.0",
-  react: "0.1.0",
-  server: "0.1.0",
-  tanstackQuery: "0.1.0",
-} as const satisfies Record<string, DecentralizedConvexVersion>);
-
-export const decentralizedConvexRelease = Object.freeze({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED,
-  version: DECENTRALIZED_CONVEX_VERSION,
-});
+export { decentralizedConvexPackage } from "../metadata.ts";
+export {
+  DECENTRALIZED_CONVEX_RELEASES,
+  DECENTRALIZED_CONVEX_VERSION,
+  defineDecentralizedConvexPackage,
+} from "./release.ts";
+export type {
+  DecentralizedConvexPackageMetadata,
+  DecentralizedConvexVersion,
+} from "./release.ts";
diff --git a/packages/decentralized-convex-core/src/release.ts b/packages/decentralized-convex-core/src/release.ts
new file mode 100644
index 00000000..d582b5e7
--- /dev/null
+++ b/packages/decentralized-convex-core/src/release.ts
@@ -0,0 +1,42 @@
+/**
+ * Every official decentralized Convex package and wire request ships on this
+ * one release version. Never update a package version independently.
+ */
+export const DECENTRALIZED_CONVEX_VERSION = "0.1.0" as const;
+
+/** All ecosystem releases that may be referenced by package metadata. */
+export const DECENTRALIZED_CONVEX_RELEASES = ["0.1.0"] as const;
+
+export type DecentralizedConvexVersion =
+  (typeof DECENTRALIZED_CONVEX_RELEASES)[number];
+
+export interface DecentralizedConvexPackageMetadata<
+  Name extends `@decentralized-convex/${string}` =
+    `@decentralized-convex/${string}`,
+  LastChanged extends DecentralizedConvexVersion = DecentralizedConvexVersion,
+> {
+  readonly lastChanged: LastChanged;
+  readonly name: Name;
+  readonly version: typeof DECENTRALIZED_CONVEX_VERSION;
+}
+
+/**
+ * Defines the standardized metadata owned and exported by one package.
+ * The package supplies only its own identity and last meaningful change.
+ */
+export function defineDecentralizedConvexPackage<
+  const Name extends `@decentralized-convex/${string}`,
+  const LastChanged extends DecentralizedConvexVersion,
+>({
+  name,
+  lastChanged,
+}: Omit<
+  DecentralizedConvexPackageMetadata<Name, LastChanged>,
+  "version"
+>): DecentralizedConvexPackageMetadata<Name, LastChanged> {
+  return Object.freeze({
+    lastChanged,
+    name,
+    version: DECENTRALIZED_CONVEX_VERSION,
+  });
+}
diff --git a/packages/decentralized-convex-core/tsconfig.json b/packages/decentralized-convex-core/tsconfig.json
index 782fa4cf..d71c02b7 100644
--- a/packages/decentralized-convex-core/tsconfig.json
+++ b/packages/decentralized-convex-core/tsconfig.json
@@ -5,5 +5,5 @@
     "lib": ["ES2022"],
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"]
+  "include": ["metadata.ts", "src/**/*.ts"]
 }
diff --git a/packages/decentralized-convex-messages/_generated/api.ts b/packages/decentralized-convex-messages/_generated/api.ts
index 4940cc5b..2b44fdc3 100644
--- a/packages/decentralized-convex-messages/_generated/api.ts
+++ b/packages/decentralized-convex-messages/_generated/api.ts
@@ -8,10 +8,6 @@
  * @module
  */
 
-import type * as dispatcher from "../dispatcher.js";
-import type * as index from "../index.js";
-import type * as protocol from "../protocol.js";
-
 import type {
   ApiFromModules,
   FilterApi,
@@ -19,9 +15,15 @@ import type {
 } from "convex/server";
 import { anyApi, componentsGeneric } from "convex/server";
 
+import type * as dispatcher from "../dispatcher.js";
+import type * as index from "../index.js";
+import type * as metadata from "../metadata.js";
+import type * as protocol from "../protocol.js";
+
 const fullApi: ApiFromModules<{
   dispatcher: typeof dispatcher;
   index: typeof index;
+  metadata: typeof metadata;
   protocol: typeof protocol;
 }> = anyApi as any;
 
diff --git a/packages/decentralized-convex-messages/index.ts b/packages/decentralized-convex-messages/index.ts
index 34075254..e9706a47 100644
--- a/packages/decentralized-convex-messages/index.ts
+++ b/packages/decentralized-convex-messages/index.ts
@@ -1,2 +1,3 @@
+export { decentralizedConvexPackage } from "./metadata.ts";
 export { conversation, message, messagesProtocol } from "./protocol.ts";
 export type { Message } from "./protocol.ts";
diff --git a/packages/decentralized-convex-messages/metadata.ts b/packages/decentralized-convex-messages/metadata.ts
new file mode 100644
index 00000000..feb4f344
--- /dev/null
+++ b/packages/decentralized-convex-messages/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/messages",
+});
diff --git a/packages/decentralized-convex-messages/package.json b/packages/decentralized-convex-messages/package.json
index 8851ac51..de42d352 100644
--- a/packages/decentralized-convex-messages/package.json
+++ b/packages/decentralized-convex-messages/package.json
@@ -5,7 +5,8 @@
   "type": "module",
   "exports": {
     ".": "./index.ts",
-    "./convex.config": "./convex.config.ts"
+    "./convex.config": "./convex.config.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-messages/protocol.ts b/packages/decentralized-convex-messages/protocol.ts
index dcefcd87..59786127 100644
--- a/packages/decentralized-convex-messages/protocol.ts
+++ b/packages/decentralized-convex-messages/protocol.ts
@@ -1,14 +1,13 @@
 import type { Infer } from "convex/values";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
 import {
   defineOperation,
   definePluginProtocol,
 } from "@decentralized-convex/plugin";
 import { v } from "convex/values";
 
+import { decentralizedConvexPackage } from "./metadata.ts";
+
 export const message = v.object({
   authorId: v.string(),
   authorName: v.string(),
@@ -26,7 +25,7 @@ export const conversation = v.object({
 });
 
 export const messagesProtocol = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.messages,
+  lastChanged: decentralizedConvexPackage.lastChanged,
   name: "messages",
   mutations: {
     putConversation: defineOperation({
diff --git a/packages/decentralized-convex-plugin/README.md b/packages/decentralized-convex-plugin/README.md
index 5276e8ad..d40f79cc 100644
--- a/packages/decentralized-convex-plugin/README.md
+++ b/packages/decentralized-convex-plugin/README.md
@@ -3,8 +3,15 @@
 Defines the contract shared by plugin authors, PDS hosts, and clients.
 
 ```ts
+// metadata.ts
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  name: "@decentralized-convex/messages",
+  lastChanged: "0.1.0",
+});
+
+// protocol.ts
 export const messagesProtocol = definePluginProtocol({
-  lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.messages,
+  lastChanged: decentralizedConvexPackage.lastChanged,
   name: "messages",
   requires: { accounts: DECENTRALIZED_CONVEX_VERSION },
   queries: {
@@ -28,8 +35,10 @@ export const messagesProtocol = definePluginProtocol({
 
 `definePluginProtocol` injects the one decentralized Convex ecosystem version;
 plugins cannot select independent versions. `lastChanged` comes from the
-central release manifest and changes only when this plugin's wire contract
-actually changes.
+standardized metadata owned by this package and changes only when this package
+actually changes. Every package exposes that object as
+`@decentralized-convex/<name>/metadata`; core does not maintain a package
+registry.
 
 `requires` maps plugin names to the ecosystem version. A complete protocol
 set rejects missing dependencies, incompatible versions, duplicate names, and
diff --git a/packages/decentralized-convex-plugin/metadata.ts b/packages/decentralized-convex-plugin/metadata.ts
new file mode 100644
index 00000000..c153903c
--- /dev/null
+++ b/packages/decentralized-convex-plugin/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/plugin",
+});
diff --git a/packages/decentralized-convex-plugin/package.json b/packages/decentralized-convex-plugin/package.json
index b74f9c44..22987b73 100644
--- a/packages/decentralized-convex-plugin/package.json
+++ b/packages/decentralized-convex-plugin/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-plugin/src/index.ts b/packages/decentralized-convex-plugin/src/index.ts
index 5c0624b8..f84e59ad 100644
--- a/packages/decentralized-convex-plugin/src/index.ts
+++ b/packages/decentralized-convex-plugin/src/index.ts
@@ -1,3 +1,4 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
 export {
   assertProtocolGraph,
   defineProtocolSet,
diff --git a/packages/decentralized-convex-plugin/src/operations.test.ts b/packages/decentralized-convex-plugin/src/operations.test.ts
index cea73c4e..e2fdfeec 100644
--- a/packages/decentralized-convex-plugin/src/operations.test.ts
+++ b/packages/decentralized-convex-plugin/src/operations.test.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { DECENTRALIZED_CONVEX_LAST_CHANGED } from "@decentralized-convex/core";
 import { v } from "convex/values";
 
+import { decentralizedConvexPackage } from "../metadata.ts";
 import {
   defineOperation,
   definePluginProtocol,
@@ -52,7 +52,7 @@ void test("rejects operation names that cannot be flattened safely", () => {
   assert.throws(
     () =>
       definePluginProtocol({
-        lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+        lastChanged: decentralizedConvexPackage.lastChanged,
         name: "notes",
         mutations: { create: operations.create },
         queries: { create: operations.create },
@@ -64,7 +64,7 @@ void test("rejects operation names that cannot be flattened safely", () => {
   assert.throws(
     () =>
       definePluginProtocol({
-        lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+        lastChanged: decentralizedConvexPackage.lastChanged,
         name: "notes",
         mutations: { create: operations.create },
         queries: { queries: operations.remove },
diff --git a/packages/decentralized-convex-plugin/tsconfig.json b/packages/decentralized-convex-plugin/tsconfig.json
index 782fa4cf..d71c02b7 100644
--- a/packages/decentralized-convex-plugin/tsconfig.json
+++ b/packages/decentralized-convex-plugin/tsconfig.json
@@ -5,5 +5,5 @@
     "lib": ["ES2022"],
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"]
+  "include": ["metadata.ts", "src/**/*.ts"]
 }
diff --git a/packages/decentralized-convex-react/metadata.ts b/packages/decentralized-convex-react/metadata.ts
new file mode 100644
index 00000000..c6fa0c57
--- /dev/null
+++ b/packages/decentralized-convex-react/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/react",
+});
diff --git a/packages/decentralized-convex-react/package.json b/packages/decentralized-convex-react/package.json
index f4c68906..badfafb6 100644
--- a/packages/decentralized-convex-react/package.json
+++ b/packages/decentralized-convex-react/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
@@ -16,6 +17,7 @@
   },
   "dependencies": {
     "@decentralized-convex/client": "workspace:0.1.0",
+    "@decentralized-convex/core": "workspace:0.1.0",
     "convex": "catalog:"
   },
   "peerDependencies": {
diff --git a/packages/decentralized-convex-react/src/index.ts b/packages/decentralized-convex-react/src/index.ts
index 034ea75a..fdae823a 100644
--- a/packages/decentralized-convex-react/src/index.ts
+++ b/packages/decentralized-convex-react/src/index.ts
@@ -1,3 +1,4 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
 export * from "convex/react";
 export {
   DecentralizedConvexProvider,
diff --git a/packages/decentralized-convex-react/tsconfig.json b/packages/decentralized-convex-react/tsconfig.json
index ea4432e2..7c54fbfe 100644
--- a/packages/decentralized-convex-react/tsconfig.json
+++ b/packages/decentralized-convex-react/tsconfig.json
@@ -5,5 +5,5 @@
     "jsx": "react-jsx",
     "lib": ["ES2022", "DOM", "DOM.Iterable"]
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx"]
+  "include": ["metadata.ts", "src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/packages/decentralized-convex-server/metadata.ts b/packages/decentralized-convex-server/metadata.ts
new file mode 100644
index 00000000..a37265e0
--- /dev/null
+++ b/packages/decentralized-convex-server/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/server",
+});
diff --git a/packages/decentralized-convex-server/package.json b/packages/decentralized-convex-server/package.json
index b930789f..c1792134 100644
--- a/packages/decentralized-convex-server/package.json
+++ b/packages/decentralized-convex-server/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-server/src/app.test.ts b/packages/decentralized-convex-server/src/app.test.ts
index b4dfe04d..ec468ece 100644
--- a/packages/decentralized-convex-server/src/app.test.ts
+++ b/packages/decentralized-convex-server/src/app.test.ts
@@ -1,9 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
   definePluginProtocol,
@@ -21,7 +19,7 @@ import {
 void test("a typed PDS plugin remains the original Convex Component", () => {
   const component = defineComponent("notes");
   const protocol = definePluginProtocol({
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     name: "notes",
     mutations: {
       create: defineOperation({ args: v.object({}), returns: v.null() }),
@@ -40,7 +38,7 @@ void test("a typed PDS plugin remains the original Convex Component", () => {
 
 void test("derives client protocols from the same local app declaration", () => {
   const accountsProtocol = definePluginProtocol({
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.accounts,
+    lastChanged: corePackage.lastChanged,
     name: "accounts",
     mutations: {
       write: defineOperation({ args: v.object({}), returns: v.null() }),
@@ -61,10 +59,10 @@ void test("derives client protocols from the same local app declaration", () =>
     capabilities: [
       {
         id: "accounts",
-        lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.accounts,
+        lastChanged: corePackage.lastChanged,
       },
     ],
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     version: DECENTRALIZED_CONVEX_VERSION,
   });
 });
diff --git a/packages/decentralized-convex-server/src/app.ts b/packages/decentralized-convex-server/src/app.ts
index 2e86d17c..6fc140da 100644
--- a/packages/decentralized-convex-server/src/app.ts
+++ b/packages/decentralized-convex-server/src/app.ts
@@ -3,10 +3,8 @@ import type {
   ProtocolGraphConstraint,
 } from "@decentralized-convex/plugin";
 import type { ComponentDefinition } from "convex/server";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import { defineProtocolSet } from "@decentralized-convex/plugin";
 import { defineApp } from "convex/server";
 
@@ -165,7 +163,7 @@ export function pdsReleaseFromApp<
       id: name,
       lastChanged,
     })),
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     version: DECENTRALIZED_CONVEX_VERSION,
   });
 }
diff --git a/packages/decentralized-convex-server/src/app.type-test.ts b/packages/decentralized-convex-server/src/app.type-test.ts
index dbc8627c..11dc5acf 100644
--- a/packages/decentralized-convex-server/src/app.type-test.ts
+++ b/packages/decentralized-convex-server/src/app.type-test.ts
@@ -1,8 +1,6 @@
 import type { DecentralizedConvexVersion } from "@decentralized-convex/core";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
   definePluginProtocol,
@@ -20,7 +18,7 @@ function protocol<
   >,
 >(name: Name, requires: Requirements) {
   return definePluginProtocol({
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     name,
     mutations: {
       write: defineOperation({ args: v.object({}), returns: v.null() }),
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
index 81223083..55a73ef6 100644
--- a/packages/decentralized-convex-server/src/index.ts
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -1,3 +1,4 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
 export {
   definePdsApp,
   definePdsPluginComponent,
diff --git a/packages/decentralized-convex-server/tsconfig.json b/packages/decentralized-convex-server/tsconfig.json
index e4011a4e..eac79cac 100644
--- a/packages/decentralized-convex-server/tsconfig.json
+++ b/packages/decentralized-convex-server/tsconfig.json
@@ -5,5 +5,5 @@
     "lib": ["ES2022", "DOM"],
     "types": ["node"]
   },
-  "include": ["src/**/*.ts"]
+  "include": ["metadata.ts", "src/**/*.ts"]
 }
diff --git a/packages/decentralized-convex-tanstack-query/metadata.ts b/packages/decentralized-convex-tanstack-query/metadata.ts
new file mode 100644
index 00000000..7406b5fe
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/tanstack-query",
+});
diff --git a/packages/decentralized-convex-tanstack-query/package.json b/packages/decentralized-convex-tanstack-query/package.json
index 3f1c2bee..54fc41f6 100644
--- a/packages/decentralized-convex-tanstack-query/package.json
+++ b/packages/decentralized-convex-tanstack-query/package.json
@@ -4,7 +4,8 @@
   "private": true,
   "type": "module",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts"
   },
   "scripts": {
     "build": "tsgo --noEmit",
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index 12b2c3cf..ff929a5e 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -1,3 +1,4 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
 export { federatedQueryOptions } from "./options.ts";
 export type { FederatedTanStackQueryOptions } from "./options.ts";
 export {
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index 94d6ecd2..95b4db4d 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -13,10 +13,8 @@ import {
   QueryObserver,
 } from "@tanstack/react-query";
 import { DecentralizedConvexClient } from "@decentralized-convex/client";
-import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-  DECENTRALIZED_CONVEX_VERSION,
-} from "@decentralized-convex/core";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 
 import { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
 
@@ -29,7 +27,7 @@ function listNotes(args: {
   owner: string;
 }): PdsRequest<readonly Note[], "query"> {
   return {
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     operation: { args, type: "list" },
     plugin: "notes",
     version: DECENTRALIZED_CONVEX_VERSION,
@@ -38,7 +36,7 @@ function listNotes(args: {
 
 function createNote(args: { body: string }): PdsRequest<Note, "mutation"> {
   return {
-    lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+    lastChanged: corePackage.lastChanged,
     operation: { args, type: "create" },
     plugin: "notes",
     version: DECENTRALIZED_CONVEX_VERSION,
@@ -160,7 +158,7 @@ function discoveredPds(domain: string) {
       capabilities: [
         {
           id: "notes",
-          lastChanged: DECENTRALIZED_CONVEX_LAST_CHANGED.protocol,
+          lastChanged: corePackage.lastChanged,
         },
       ],
       deploymentUrl: `https://${domain}`,
diff --git a/packages/decentralized-convex-tanstack-query/tsconfig.json b/packages/decentralized-convex-tanstack-query/tsconfig.json
index 7de130bc..4a91b748 100644
--- a/packages/decentralized-convex-tanstack-query/tsconfig.json
+++ b/packages/decentralized-convex-tanstack-query/tsconfig.json
@@ -6,5 +6,5 @@
     "lib": ["ES2022", "DOM", "DOM.Iterable"],
     "types": ["node"]
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx"]
+  "include": ["metadata.ts", "src/**/*.ts", "src/**/*.tsx"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15e30349..4fda34a6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -398,6 +398,9 @@ importers:
       '@decentralized-convex/client':
         specifier: workspace:0.1.0
         version: link:../decentralized-convex-client
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
       convex:
         specifier: 'catalog:'
         version: 1.38.0(react@19.2.5)
diff --git a/scripts/check-decentralized-convex-release.ts b/scripts/check-decentralized-convex-release.ts
index 43b7bd08..9db0fad7 100644
--- a/scripts/check-decentralized-convex-release.ts
+++ b/scripts/check-decentralized-convex-release.ts
@@ -1,38 +1,62 @@
 import { readdir, readFile } from "node:fs/promises";
+import { pathToFileURL } from "node:url";
 import { fileURLToPath } from "node:url";
 
 import {
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
   DECENTRALIZED_CONVEX_RELEASES,
   DECENTRALIZED_CONVEX_VERSION,
-} from "../packages/decentralized-convex-core/src/index.ts";
-
-const packages = {
-  accounts: "decentralized-convex-accounts",
-  address: "decentralized-convex-address",
-  client: "decentralized-convex-client",
-  core: "decentralized-convex-core",
-  messages: "decentralized-convex-messages",
-  plugin: "decentralized-convex-plugin",
-  react: "decentralized-convex-react",
-  server: "decentralized-convex-server",
-  tanstackQuery: "decentralized-convex-tanstack-query",
-} as const;
+} from "../packages/decentralized-convex-core/src/release.ts";
 
 const repoRoot = fileURLToPath(new URL("../", import.meta.url));
+const packagesRoot = `${repoRoot}packages`;
 const problems: string[] = [];
+const packageDirectories = (await readdir(packagesRoot, {
+  withFileTypes: true,
+}))
+  .filter(
+    (entry) =>
+      entry.isDirectory() && entry.name.startsWith("decentralized-convex-"),
+  )
+  .map((entry) => entry.name);
+
+for (const directory of packageDirectories) {
+  const packageRoot = `${packagesRoot}/${directory}`;
+  const manifest = await readJson(`${packageRoot}/package.json`);
+  const packageName = manifest.name ?? directory;
 
-for (const [part, directory] of Object.entries(packages)) {
-  const manifest = await readJson(`${repoRoot}packages/${directory}/package.json`);
   if (manifest.version !== DECENTRALIZED_CONVEX_VERSION) {
     problems.push(
-      `${manifest.name ?? directory} is ${String(manifest.version)}, expected ${DECENTRALIZED_CONVEX_VERSION}`,
+      `${String(packageName)} is ${String(manifest.version)}, expected ${DECENTRALIZED_CONVEX_VERSION}`,
     );
   }
-  if (!(part in DECENTRALIZED_CONVEX_LAST_CHANGED)) {
-    problems.push(`${part} is missing lastChanged metadata`);
+
+  const exports = manifest.exports;
+  if (!isRecord(exports) || exports["./metadata"] !== "./metadata.ts") {
+    problems.push(
+      `${String(packageName)} must export ./metadata from ./metadata.ts`,
+    );
   }
 
+  const metadata = await readPackageMetadata(`${packageRoot}/metadata.ts`);
+  if (metadata.name !== packageName) {
+    problems.push(
+      `${String(packageName)} metadata identifies itself as ${String(metadata.name)}`,
+    );
+  }
+  if (metadata.version !== DECENTRALIZED_CONVEX_VERSION) {
+    problems.push(
+      `${String(packageName)} metadata reports ${String(metadata.version)}, expected ${DECENTRALIZED_CONVEX_VERSION}`,
+    );
+  }
+  if (
+    !DECENTRALIZED_CONVEX_RELEASES.some(
+      (release) => release === metadata.lastChanged,
+    )
+  ) {
+    problems.push(
+      `${String(packageName)} last changed in unknown release ${String(metadata.lastChanged)}`,
+    );
+  }
 }
 
 for (const root of ["apps", "packages", "services", "shared", "tooling"]) {
@@ -47,21 +71,11 @@ for (const root of ["apps", "packages", "services", "shared", "tooling"]) {
   }
 }
 
-if (!("protocol" in DECENTRALIZED_CONVEX_LAST_CHANGED)) {
-  problems.push("protocol is missing lastChanged metadata");
-}
 if (
   DECENTRALIZED_CONVEX_RELEASES.at(-1) !== DECENTRALIZED_CONVEX_VERSION
 ) {
   problems.push("the current version is not the latest known release");
 }
-for (const [part, lastChanged] of Object.entries(
-  DECENTRALIZED_CONVEX_LAST_CHANGED,
-)) {
-  if (!DECENTRALIZED_CONVEX_RELEASES.includes(lastChanged)) {
-    problems.push(`${part} last changed in unknown release ${lastChanged}`);
-  }
-}
 
 if (problems.length > 0) {
   throw new Error(
@@ -70,7 +84,7 @@ if (problems.length > 0) {
 }
 
 console.log(
-  `Decentralized Convex ${DECENTRALIZED_CONVEX_VERSION}: package versions and internal dependencies are in sync.`,
+  `Decentralized Convex ${DECENTRALIZED_CONVEX_VERSION}: ${packageDirectories.length} package metadata exports and internal dependencies are in sync.`,
 );
 
 async function readJson(path: string): Promise<Record<string, unknown>> {
@@ -79,6 +93,16 @@ async function readJson(path: string): Promise<Record<string, unknown>> {
   return value;
 }
 
+async function readPackageMetadata(path: string) {
+  const module: unknown = await import(pathToFileURL(path).href);
+  if (!isRecord(module) || !isRecord(module.decentralizedConvexPackage)) {
+    throw new Error(
+      `${path} must export a decentralizedConvexPackage metadata object`,
+    );
+  }
+  return module.decentralizedConvexPackage;
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null;
 }

From 4c041ae45b667800f45b72836f9752abece8593c Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 16:44:59 -0400
Subject: [PATCH 10/17] Make PDS query data states explicit

---
 apps/web/README.md                            |  4 ++
 .../features/conversation/Conversation.tsx    | 21 ++++++---
 .../features/conversation/useConversation.ts  |  3 +-
 docs/architecture.md                          |  4 ++
 .../decentralized-convex-client/src/index.ts  |  2 +
 .../src/observer.ts                           |  6 ++-
 .../src/pds-observer.ts                       |  6 ++-
 .../src/query-data.test.ts                    | 29 ++++++++++++
 .../src/query-data.ts                         | 45 +++++++++++++++++++
 .../src/routed-pds-observer.ts                |  6 ++-
 .../src/snapshot.ts                           |  2 +-
 .../decentralized-convex-client/src/types.ts  | 21 ++++++---
 .../README.md                                 | 20 ++++++++-
 .../src/index.ts                              |  2 +
 .../src/pds.test.ts                           | 37 +++++++++++----
 .../src/pds.ts                                | 36 +++++++++------
 .../src/useFederatedQuery.ts                  |  4 +-
 17 files changed, 202 insertions(+), 46 deletions(-)
 create mode 100644 packages/decentralized-convex-client/src/query-data.test.ts
 create mode 100644 packages/decentralized-convex-client/src/query-data.ts

diff --git a/apps/web/README.md b/apps/web/README.md
index 13b4b059..ec6f0504 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -77,5 +77,9 @@ import { pds } from "@vera/backend/pds";
 
 const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
 
+if (messages.data.status === "success") {
+  messages.data.result; // Message[]
+}
+
 const sendMessage = useMutation(pdsMutation(pds.messages.send));
 ```
diff --git a/apps/web/src/features/conversation/Conversation.tsx b/apps/web/src/features/conversation/Conversation.tsx
index 71058fdf..e610684c 100644
--- a/apps/web/src/features/conversation/Conversation.tsx
+++ b/apps/web/src/features/conversation/Conversation.tsx
@@ -1,6 +1,7 @@
 import type {
   FederatedQueryStatus,
   FederationSourceSnapshot,
+  PdsQueryData,
 } from "@decentralized-convex/client";
 import type { Message as ChatMessage } from "@decentralized-convex/messages";
 import type { FormEvent } from "react";
@@ -157,12 +158,11 @@ function MessageList({
 }: {
   home: HomePds;
   messages: {
-    data?: readonly ChatMessage[];
+    data: PdsQueryData<readonly ChatMessage[]>;
     federation: {
       sources: readonly FederationSourceSnapshot<ChatMessage[]>[];
       status: FederatedQueryStatus;
     };
-    isPending: boolean;
   };
 }) {
   const live = messages.federation.sources.filter(
@@ -181,19 +181,26 @@ function MessageList({
           </p>
         </aside>
       ) : null}
-      {messages.isPending ? (
+      {messages.data.status === "loading" ? (
         <p className="empty-state">Connecting to participant servers…</p>
       ) : null}
-      {messages.data?.length === 0 ? (
+      {messages.data.status === "error" ? (
+        <p className="empty-state">{messages.data.error.message}</p>
+      ) : null}
+      {(messages.data.status === "partial" ||
+        messages.data.status === "success") &&
+      messages.data.result.length === 0 ? (
         <div className="empty-state">
           <span>#</span>
           <strong>No messages yet</strong>
           <p>Start the conversation from {home.domain}.</p>
         </div>
       ) : null}
-      {messages.data?.map((message) => (
-        <Message key={message.messageId} message={message} />
-      ))}
+      {messages.data.status === "partial" || messages.data.status === "success"
+        ? messages.data.result.map((message) => (
+            <Message key={message.messageId} message={message} />
+          ))
+        : null}
     </div>
   );
 }
diff --git a/apps/web/src/features/conversation/useConversation.ts b/apps/web/src/features/conversation/useConversation.ts
index 1e93d1ea..a0f58474 100644
--- a/apps/web/src/features/conversation/useConversation.ts
+++ b/apps/web/src/features/conversation/useConversation.ts
@@ -3,6 +3,7 @@ import type { FormEvent } from "react";
 import { useEffect, useEffectEvent, useState } from "react";
 import { useMutation, useQuery } from "@tanstack/react-query";
 import {
+  mapPdsQueryData,
   pdsMutation,
   pdsQuery,
   usePdsQueryState,
@@ -19,7 +20,7 @@ export function useConversation() {
   const query = useQuery({
     ...messageOptions,
     enabled: conversation.isSuccess,
-    select: combineMessages,
+    select: (data) => mapPdsQueryData(data, combineMessages),
   });
   const federation = usePdsQueryState(messageOptions);
   const sendMessage = useMutation(pdsMutation(pds.messages.send));
diff --git a/docs/architecture.md b/docs/architecture.md
index 82a735fe..166fd1df 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -108,6 +108,10 @@ The default path intentionally needs only:
 - `useQuery(pdsQuery(operation, args))` for reactive reads;
 - `useMutation(pdsMutation(operation))` for writes.
 
+PDS query `data` is a discriminated `loading`, `partial`, `success`, or `error`
+object. Partial and successful states carry the operation value as `result`;
+loading is never represented by an ambiguous `undefined` value.
+
 Applications may override:
 
 - ordinary Component install names and HTTP prefixes;
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 4f97a8e8..45cd1b53 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -27,6 +27,8 @@ export {
 } from "./pds.ts";
 export { FederatedQueryObserver } from "./observer.ts";
 export { FederatedPdsQueryObserver } from "./pds-observer.ts";
+export { mapPdsQueryData, pdsQueryDataFromSnapshot } from "./query-data.ts";
+export type { PdsQueryData } from "./query-data.ts";
 export { defaultCombine } from "./snapshot.ts";
 export { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 export type {
diff --git a/packages/decentralized-convex-client/src/observer.ts b/packages/decentralized-convex-client/src/observer.ts
index 73815e2a..1d2947b9 100644
--- a/packages/decentralized-convex-client/src/observer.ts
+++ b/packages/decentralized-convex-client/src/observer.ts
@@ -71,12 +71,14 @@ export class FederatedQueryObserver<
 
   #update(
     url: string,
-    patch: Partial<FederationSourceSnapshot<FunctionReturnType<Query>>>,
+    update:
+      | { data: FunctionReturnType<Query>; status: "live" }
+      | { error: Error; status: "error" },
   ) {
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
-    this.#sources.set(url, { ...source, ...patch });
+    this.#sources.set(url, { ...update, target: source.target });
     this.#snapshot = createFederatedSnapshot(
       [...this.#sources.values()],
       this.#options.combine,
diff --git a/packages/decentralized-convex-client/src/pds-observer.ts b/packages/decentralized-convex-client/src/pds-observer.ts
index 352a91f9..851514d4 100644
--- a/packages/decentralized-convex-client/src/pds-observer.ts
+++ b/packages/decentralized-convex-client/src/pds-observer.ts
@@ -72,12 +72,14 @@ export class FederatedPdsQueryObserver<
 
   #update(
     url: string,
-    patch: Partial<FederationSourceSnapshot<PdsRequestResult<Request>>>,
+    update:
+      | { data: PdsRequestResult<Request>; status: "live" }
+      | { error: Error; status: "error" },
   ) {
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
-    this.#sources.set(url, { ...source, ...patch });
+    this.#sources.set(url, { ...update, target: source.target });
     this.#snapshot = createFederatedSnapshot(
       [...this.#sources.values()],
       this.#options.combine,
diff --git a/packages/decentralized-convex-client/src/query-data.test.ts b/packages/decentralized-convex-client/src/query-data.test.ts
new file mode 100644
index 00000000..fe7f1a01
--- /dev/null
+++ b/packages/decentralized-convex-client/src/query-data.test.ts
@@ -0,0 +1,29 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { mapPdsQueryData, pdsQueryDataFromSnapshot } from "./query-data.ts";
+
+const target = { ids: ["alice@example.com"], url: "https://example.com" };
+
+void test("distinguishes a loaded undefined result from loading", () => {
+  const data = pdsQueryDataFromSnapshot({
+    data: undefined,
+    sources: [{ data: undefined, status: "live", target }],
+    status: "success",
+  });
+
+  assert.deepEqual(data, { result: undefined, status: "success" });
+});
+
+void test("maps only available query results", () => {
+  assert.deepEqual(
+    mapPdsQueryData({ result: [1, 2], status: "partial" }, (values) =>
+      values.map(String),
+    ),
+    { result: ["1", "2"], status: "partial" },
+  );
+  assert.deepEqual(
+    mapPdsQueryData({ status: "loading" }, () => "unreachable"),
+    { status: "loading" },
+  );
+});
diff --git a/packages/decentralized-convex-client/src/query-data.ts b/packages/decentralized-convex-client/src/query-data.ts
new file mode 100644
index 00000000..ef7e73e5
--- /dev/null
+++ b/packages/decentralized-convex-client/src/query-data.ts
@@ -0,0 +1,45 @@
+import type { FederatedQuerySnapshot } from "./types.ts";
+
+export type PdsQueryData<Result> =
+  | { readonly status: "loading" }
+  | { readonly result: Result; readonly status: "partial" }
+  | { readonly result: Result; readonly status: "success" }
+  | { readonly error: Error; readonly status: "error" };
+
+export function pdsQueryDataFromSnapshot<Result>(
+  snapshot: FederatedQuerySnapshot<Result, unknown>,
+): PdsQueryData<Result> {
+  switch (snapshot.status) {
+    case "pending":
+      return { status: "loading" };
+    case "partial":
+      return { result: snapshot.data, status: "partial" };
+    case "success":
+      return { result: snapshot.data, status: "success" };
+    case "error":
+      return {
+        error: new AggregateError(
+          snapshot.sources.flatMap((source) =>
+            source.status === "error" ? [source.error] : [],
+          ),
+          "Every PDS query target failed",
+        ),
+        status: "error",
+      };
+  }
+}
+
+export function mapPdsQueryData<Input, Output>(
+  data: PdsQueryData<Input>,
+  map: (result: Input) => Output,
+): PdsQueryData<Output> {
+  switch (data.status) {
+    case "loading":
+    case "error":
+      return data;
+    case "partial":
+      return { result: map(data.result), status: "partial" };
+    case "success":
+      return { result: map(data.result), status: "success" };
+  }
+}
diff --git a/packages/decentralized-convex-client/src/routed-pds-observer.ts b/packages/decentralized-convex-client/src/routed-pds-observer.ts
index 9d07ed7d..fe0ee9b9 100644
--- a/packages/decentralized-convex-client/src/routed-pds-observer.ts
+++ b/packages/decentralized-convex-client/src/routed-pds-observer.ts
@@ -138,12 +138,14 @@ export class RoutedPdsQueryObserver<
 
   #update(
     url: string,
-    patch: Partial<FederationSourceSnapshot<PdsRequestResult<Request>>>,
+    update:
+      | { data: PdsRequestResult<Request>; status: "live" }
+      | { error: Error; status: "error" },
   ) {
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
-    this.#sources.set(url, { ...source, ...patch });
+    this.#sources.set(url, { ...update, target: source.target });
     this.#publish();
   }
 
diff --git a/packages/decentralized-convex-client/src/snapshot.ts b/packages/decentralized-convex-client/src/snapshot.ts
index 632b6175..5e802ae9 100644
--- a/packages/decentralized-convex-client/src/snapshot.ts
+++ b/packages/decentralized-convex-client/src/snapshot.ts
@@ -12,7 +12,7 @@ export function createFederatedSnapshot<Result, Combined>(
   ) => Combined,
 ): FederatedQuerySnapshot<Combined, Result> {
   const successful = sources.flatMap((source) =>
-    source.status === "live" && source.data !== undefined
+    source.status === "live"
       ? [{ data: source.data, target: source.target }]
       : [],
   );
diff --git a/packages/decentralized-convex-client/src/types.ts b/packages/decentralized-convex-client/src/types.ts
index 06d9e12a..9cc90fa4 100644
--- a/packages/decentralized-convex-client/src/types.ts
+++ b/packages/decentralized-convex-client/src/types.ts
@@ -33,12 +33,21 @@ export interface FederationTargetGroup {
 export type FederationSourceStatus = "pending" | "live" | "error";
 export type FederatedQueryStatus = "pending" | "success" | "partial" | "error";
 
-export interface FederationSourceSnapshot<Result> {
-  data?: Result;
-  error?: Error;
-  status: FederationSourceStatus;
-  target: FederationTargetGroup;
-}
+export type FederationSourceSnapshot<Result> =
+  | {
+      data: Result;
+      status: "live";
+      target: FederationTargetGroup;
+    }
+  | {
+      error: Error;
+      status: "error";
+      target: FederationTargetGroup;
+    }
+  | {
+      status: "pending";
+      target: FederationTargetGroup;
+    };
 
 export interface FederatedQuerySnapshot<Combined, Result> {
   data: Combined;
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
index 5131c2d7..fbca74d0 100644
--- a/packages/decentralized-convex-tanstack-query/README.md
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -5,10 +5,18 @@ TanStack Query hooks and version:
 
 ```ts
 import { useMutation, useQuery } from "@tanstack/react-query";
-import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
+import {
+  mapPdsQueryData,
+  pdsMutation,
+  pdsQuery,
+} from "@decentralized-convex/tanstack-query";
 
 const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
 
+if (messages.data.status === "success") {
+  messages.data.result; // Message[]
+}
+
 const sendMessage = useMutation(pdsMutation(pds.messages.send));
 await sendMessage.mutateAsync({ body, conversationId, messageId });
 ```
@@ -20,11 +28,19 @@ available:
 const messages = useQuery({
   ...pdsQuery(pds.messages.list, { conversationId }),
   retry: 3,
-  select: (messages) => messages.filter((message) => message.body.length > 0),
+  select: (data) =>
+    mapPdsQueryData(data, (messages) =>
+      messages.filter((message) => message.body.length > 0),
+    ),
   staleTime: 30_000,
 });
 ```
 
+Query `data` is always an explicit state object: `loading`, `partial`,
+`success`, or `error`. The actual operation value lives in `result` for partial
+and successful states, so a successfully loaded `undefined` can never be
+confused with loading.
+
 Connect the decentralized transport once when creating an account session:
 
 ```ts
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index ff929a5e..52baec24 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -1,4 +1,6 @@
 export { decentralizedConvexPackage } from "../metadata.ts";
+export { mapPdsQueryData } from "@decentralized-convex/client";
+export type { PdsQueryData } from "@decentralized-convex/client";
 export { federatedQueryOptions } from "./options.ts";
 export type { FederatedTanStackQueryOptions } from "./options.ts";
 export {
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index 95b4db4d..d605b98a 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -4,6 +4,7 @@ import type {
   FederationConnection,
   FederationMutationReference,
   FederationQueryReference,
+  PdsQueryData,
   PdsRequest,
 } from "@decentralized-convex/client";
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
@@ -11,6 +12,7 @@ import {
   MutationObserver,
   QueryClient,
   QueryObserver,
+  useQuery,
 } from "@tanstack/react-query";
 import { DecentralizedConvexClient } from "@decentralized-convex/client";
 import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
@@ -61,20 +63,31 @@ void test("produces native TanStack query and mutation options", async () => {
   const disconnect = adapter.connect(queryClient);
 
   const query = pdsQuery(listNotes, { owner: "alice" });
-  assert.deepEqual(await queryClient.fetchQuery(query), [
-    { body: "https://a.test", id: "alice" },
-    { body: "https://b.test", id: "alice" },
-  ]);
+  const initialObserver = new QueryObserver(new QueryClient(), query);
+  assert.deepEqual(initialObserver.getCurrentResult().data, {
+    status: "loading",
+  });
+
+  assert.deepEqual(await queryClient.fetchQuery(query), {
+    result: [
+      { body: "https://a.test", id: "alice" },
+      { body: "https://b.test", id: "alice" },
+    ],
+    status: "success",
+  });
 
   const observer = new QueryObserver(queryClient, query);
   const unsubscribe = observer.subscribe(() => undefined);
   await nextTask();
   connections.get("https://a.test")?.emit("updated");
   await nextTask();
-  assert.deepEqual(queryClient.getQueryData(query.queryKey), [
-    { body: "updated", id: "alice" },
-    { body: "https://b.test", id: "alice" },
-  ]);
+  assert.deepEqual(queryClient.getQueryData(query.queryKey), {
+    result: [
+      { body: "updated", id: "alice" },
+      { body: "https://b.test", id: "alice" },
+    ],
+    status: "success",
+  });
 
   const mutation = new MutationObserver(queryClient, pdsMutation(createNote));
   assert.deepEqual(await mutation.mutate({ body: "hello" }), {
@@ -87,6 +100,14 @@ void test("produces native TanStack query and mutation options", async () => {
   await transport.close();
 });
 
+function usePdsQueryTypeTest() {
+  const query = useQuery(pdsQuery(listNotes, { owner: "alice" }));
+  const data: PdsQueryData<Note[]> = query.data;
+  return data;
+}
+
+void usePdsQueryTypeTest;
+
 class MemoryConnection implements FederationConnection {
   readonly #publishers = new Set<(body: string) => void>();
   readonly #url;
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
index e036e413..0e9dbac8 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -4,6 +4,7 @@ import type {
   DecentralizedConvexClient,
   DefaultCombinedPdsResult,
   FederatedQuerySnapshot,
+  PdsQueryData,
   PdsRequest,
   PdsRequestResult,
 } from "@decentralized-convex/client";
@@ -20,6 +21,7 @@ import {
   queryOptions,
   useQueryClient,
 } from "@tanstack/react-query";
+import { pdsQueryDataFromSnapshot } from "@decentralized-convex/client";
 
 const PDS_QUERY_META_KEY = "decentralizedConvexPdsQuery";
 const connectedClients = new WeakMap<QueryClient, PdsQueryClient>();
@@ -107,11 +109,14 @@ export class PdsQueryClient {
   async query<Request extends AnyPdsQueryRequest>(
     request: Request,
     queryKey: QueryKey,
-  ): Promise<DefaultCombinedPdsResult<Request>> {
-    const snapshot = await this.#client.pdsQuery(request);
-    this.#publish(hashKey(queryKey), snapshot);
-    if (snapshot.status === "error") throw allTargetsFailed(snapshot);
-    return snapshot.data;
+  ): Promise<PdsQueryData<DefaultCombinedPdsResult<Request>>> {
+    try {
+      const snapshot = await this.#client.pdsQuery(request);
+      this.#publish(hashKey(queryKey), snapshot);
+      return pdsQueryDataFromSnapshot(snapshot);
+    } catch (error) {
+      return { error: toError(error), status: "error" };
+    }
   }
 
   async mutate<Request extends AnyPdsMutationRequest>(
@@ -174,9 +179,10 @@ export class PdsQueryClient {
     const publish = () => {
       const snapshot = observer.getSnapshot();
       this.#publish(hashKey(query.queryKey), snapshot);
-      if (snapshot.status === "success" || snapshot.status === "partial") {
-        queryClient.setQueryData(query.queryKey, snapshot.data);
-      }
+      queryClient.setQueryData(
+        query.queryKey,
+        pdsQueryDataFromSnapshot(snapshot),
+      );
     };
     const unsubscribe = observer.subscribe(publish);
     active.close = () => {
@@ -213,12 +219,17 @@ export function pdsQuery<Args, Result>(
     "query",
     request,
   ];
+  const initialData: PdsQueryData<DefaultCombinedPdsResult<typeof request>> = {
+    status: "loading",
+  };
   return queryOptions({
+    initialData,
     meta: { [PDS_QUERY_META_KEY]: request },
     queryFn: ({ client }) =>
       connectedPdsClient(client).query(request, queryKey),
     queryKey,
-    staleTime: Infinity,
+    staleTime: (query) =>
+      query.state.data?.status === "loading" ? 0 : Infinity,
   });
 }
 
@@ -270,9 +281,6 @@ function pdsRequestFromMeta(meta: QueryMeta | undefined) {
   return request as AnyPdsQueryRequest;
 }
 
-function allTargetsFailed(snapshot: UnknownSnapshot) {
-  return new AggregateError(
-    snapshot.sources.flatMap((source) => source.error ?? []),
-    "Every PDS query target failed",
-  );
+function toError(error: unknown) {
+  return error instanceof Error ? error : new Error(String(error));
 }
diff --git a/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts b/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts
index b9ff0e62..2ad6fb4f 100644
--- a/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts
+++ b/packages/decentralized-convex-tanstack-query/src/useFederatedQuery.ts
@@ -55,7 +55,9 @@ export function useFederatedQuery<
       const snapshot = await client.query(options);
       if (snapshot.status === "error") {
         throw new AggregateError(
-          snapshot.sources.flatMap((source) => source.error ?? []),
+          snapshot.sources.flatMap((source) =>
+            source.status === "error" ? [source.error] : [],
+          ),
           "Every federation target failed",
         );
       }

From 1d30a0a334b723970f01c0a8766c7b264a52fe28 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 16:59:22 -0400
Subject: [PATCH 11/17] Add nested PDS TanStack query hook

---
 apps/web/README.md                            | 15 ++--
 .../features/conversation/useConversation.ts  | 14 ++--
 docs/architecture.md                          |  5 +-
 .../README.md                                 | 24 ++++---
 .../src/index.ts                              |  4 +-
 .../src/pds.test.ts                           | 11 ++-
 .../src/pds.ts                                | 38 +++++++---
 .../src/useQuery.ts                           | 72 +++++++++++++++++++
 8 files changed, 147 insertions(+), 36 deletions(-)
 create mode 100644 packages/decentralized-convex-tanstack-query/src/useQuery.ts

diff --git a/apps/web/README.md b/apps/web/README.md
index ec6f0504..8b5b9f51 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -68,14 +68,21 @@ definition. It does not declare a second plugin list or import either
 deployment's generated message API; both homes expose the same canonical
 `pds:dispatchQuery` and `pds:dispatchMutation` functions.
 
-The common read and write paths use the application's own TanStack hooks:
+The common read and write paths use the PDS query adapter with the
+application's TanStack Query instance:
 
 ```ts
-import { useMutation, useQuery } from "@tanstack/react-query";
-import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
+import { useMutation } from "@tanstack/react-query";
+import {
+  pdsMutation,
+  pdsQuery,
+  useQuery,
+} from "@decentralized-convex/tanstack-query";
 import { pds } from "@vera/backend/pds";
 
-const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
+const messages = useQuery({
+  query: pdsQuery(pds.messages.list, { conversationId }),
+});
 
 if (messages.data.status === "success") {
   messages.data.result; // Message[]
diff --git a/apps/web/src/features/conversation/useConversation.ts b/apps/web/src/features/conversation/useConversation.ts
index a0f58474..ae495a10 100644
--- a/apps/web/src/features/conversation/useConversation.ts
+++ b/apps/web/src/features/conversation/useConversation.ts
@@ -1,12 +1,12 @@
 import type { Message } from "@decentralized-convex/messages";
 import type { FormEvent } from "react";
 import { useEffect, useEffectEvent, useState } from "react";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 import {
   mapPdsQueryData,
   pdsMutation,
   pdsQuery,
-  usePdsQueryState,
+  useQuery,
 } from "@decentralized-convex/tanstack-query";
 import { pds } from "@vera/backend/pds";
 
@@ -14,15 +14,13 @@ import { prototypeConversation } from "../pds/model.ts";
 
 export function useConversation() {
   const conversation = useMutation(pdsMutation(pds.messages.putConversation));
-  const messageOptions = pdsQuery(pds.messages.list, {
-    conversationId: prototypeConversation.id,
-  });
   const query = useQuery({
-    ...messageOptions,
     enabled: conversation.isSuccess,
+    query: pdsQuery(pds.messages.list, {
+      conversationId: prototypeConversation.id,
+    }),
     select: (data) => mapPdsQueryData(data, combineMessages),
   });
-  const federation = usePdsQueryState(messageOptions);
   const sendMessage = useMutation(pdsMutation(pds.messages.send));
   const [draft, setDraft] = useState("");
   const saveConversation = useEffectEvent(() => {
@@ -62,7 +60,7 @@ export function useConversation() {
       setDraft,
       submit: send,
     },
-    messages: { ...query, federation },
+    messages: query,
   };
 }
 
diff --git a/docs/architecture.md b/docs/architecture.md
index 166fd1df..33615e92 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -67,7 +67,7 @@ the generated API of any particular independently hosted backend.
 A Messages read follows this path:
 
 ```text
-useQuery(pdsQuery(...))
+useQuery({ query: pdsQuery(...) })
   -> pds:dispatchQuery on the signed-in account's home
   -> typed data plus hidden conversation routing identities
   -> current PDS discovery for those identities
@@ -105,7 +105,8 @@ The default path intentionally needs only:
 
 - `definePdsApp` on the server;
 - one stable backend `pds` export inferred from that app definition;
-- `useQuery(pdsQuery(operation, args))` for reactive reads;
+- `useQuery({ query: pdsQuery(operation, args) })` for reactive reads and
+  federation diagnostics in one result;
 - `useMutation(pdsMutation(operation))` for writes.
 
 PDS query `data` is a discriminated `loading`, `partial`, `success`, or `error`
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
index fbca74d0..9c9e9378 100644
--- a/packages/decentralized-convex-tanstack-query/README.md
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -1,32 +1,39 @@
 # `@decentralized-convex/tanstack-query`
 
-A thin adapter for using typed PDS operations with an application's own
-TanStack Query hooks and version:
+A thin adapter for using typed PDS operations with an application's installed
+TanStack Query version:
 
 ```ts
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 import {
   mapPdsQueryData,
   pdsMutation,
   pdsQuery,
+  useQuery,
 } from "@decentralized-convex/tanstack-query";
 
-const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
+const messages = useQuery({
+  query: pdsQuery(pds.messages.list, { conversationId }),
+});
 
 if (messages.data.status === "success") {
   messages.data.result; // Message[]
 }
 
+messages.federation.status;
+messages.federation.sources;
+
 const sendMessage = useMutation(pdsMutation(pds.messages.send));
 await sendMessage.mutateAsync({ body, conversationId, messageId });
 ```
 
-Both helpers return normal TanStack options, so every TanStack override remains
-available:
+The adapter's `useQuery` delegates to the application's installed TanStack
+Query version. The nested `query` field carries the PDS query while the rest of
+the object accepts normal TanStack options:
 
 ```ts
 const messages = useQuery({
-  ...pdsQuery(pds.messages.list, { conversationId }),
+  query: pdsQuery(pds.messages.list, { conversationId }),
   retry: 3,
   select: (data) =>
     mapPdsQueryData(data, (messages) =>
@@ -52,4 +59,5 @@ const disconnect = pdsQueryClient.connect(queryClient);
 `PdsQueryClient` updates TanStack's cache from live Convex subscriptions. The
 core client owns home-first routing, PDS discovery, connection reuse, and
 author-home mutations; the TanStack adapter only bridges those results into the
-application's cache.
+application's cache. The adapter hook also returns the query's federation
+status and per-source diagnostics, so applications do not need a second hook.
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index 52baec24..a342a1fb 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -9,6 +9,8 @@ export {
   PdsQueryClient,
   usePdsQueryState,
 } from "./pds.ts";
-export type { PdsQueryKey } from "./pds.ts";
+export type { PdsQueryKey, PdsQueryOptions } from "./pds.ts";
+export { useQuery } from "./useQuery.ts";
+export type { PdsUseQueryOptions, PdsUseQueryResult } from "./useQuery.ts";
 export { useFederatedQuery } from "./useFederatedQuery.ts";
 export type { FederatedTanStackQueryResult } from "./useFederatedQuery.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index d605b98a..b29489bf 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -12,13 +12,13 @@ import {
   MutationObserver,
   QueryClient,
   QueryObserver,
-  useQuery,
 } from "@tanstack/react-query";
 import { DecentralizedConvexClient } from "@decentralized-convex/client";
 import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
 import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 
 import { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
+import { useQuery } from "./useQuery.ts";
 
 interface Note {
   body: string;
@@ -101,8 +101,15 @@ void test("produces native TanStack query and mutation options", async () => {
 });
 
 function usePdsQueryTypeTest() {
-  const query = useQuery(pdsQuery(listNotes, { owner: "alice" }));
+  const query = useQuery({
+    query: pdsQuery(listNotes, { owner: "alice" }),
+  });
   const data: PdsQueryData<Note[]> = query.data;
+  const source = query.federation.sources[0];
+  if (source?.status === "live") {
+    const notes: readonly Note[] = source.data;
+    void notes;
+  }
   return data;
 }
 
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
index 0e9dbac8..4aa4ea18 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -9,6 +9,7 @@ import type {
   PdsRequestResult,
 } from "@decentralized-convex/client";
 import type {
+  DefinedInitialDataOptions,
   Query,
   QueryClient,
   QueryKey,
@@ -18,7 +19,6 @@ import { useSyncExternalStore } from "react";
 import {
   hashKey,
   mutationOptions,
-  queryOptions,
   useQueryClient,
 } from "@tanstack/react-query";
 import { pdsQueryDataFromSnapshot } from "@decentralized-convex/client";
@@ -208,21 +208,27 @@ export type PdsQueryKey<Request extends AnyPdsQueryRequest> = readonly [
   Request,
 ];
 
+export type PdsQueryOptions<Request extends AnyPdsQueryRequest> = ReturnType<
+  typeof pdsQueryOptions<Request>
+>;
+
 export function pdsQuery<Args, Result>(
   operation: (args: Args) => PdsRequest<Result, "query">,
   args: Args,
 ) {
-  const request = operation(args);
+  return pdsQueryOptions(operation(args));
+}
+
+function pdsQueryOptions<Request extends AnyPdsQueryRequest>(request: Request) {
   const queryKey: PdsQueryKey<typeof request> = [
     "decentralized-convex",
     "pds",
     "query",
     request,
   ];
-  const initialData: PdsQueryData<DefaultCombinedPdsResult<typeof request>> = {
-    status: "loading",
-  };
-  return queryOptions({
+  const initialData =
+    loadingPdsQueryData<DefaultCombinedPdsResult<typeof request>>();
+  return {
     initialData,
     meta: { [PDS_QUERY_META_KEY]: request },
     queryFn: ({ client }) =>
@@ -230,7 +236,16 @@ export function pdsQuery<Args, Result>(
     queryKey,
     staleTime: (query) =>
       query.state.data?.status === "loading" ? 0 : Infinity,
-  });
+  } satisfies DefinedInitialDataOptions<
+    PdsQueryData<DefaultCombinedPdsResult<Request>>,
+    Error,
+    PdsQueryData<DefaultCombinedPdsResult<Request>>,
+    PdsQueryKey<Request>
+  >;
+}
+
+function loadingPdsQueryData<Result>(): PdsQueryData<Result> {
+  return { status: "loading" };
 }
 
 export function pdsMutation<Args, Result>(
@@ -242,10 +257,11 @@ export function pdsMutation<Args, Result>(
   });
 }
 
-export function usePdsQueryState<Request extends AnyPdsQueryRequest>(options: {
-  queryKey: PdsQueryKey<Request>;
-}) {
-  const queryClient = useQueryClient();
+export function usePdsQueryState<Request extends AnyPdsQueryRequest>(
+  options: { queryKey: PdsQueryKey<Request> },
+  queryClientOverride?: QueryClient,
+) {
+  const queryClient = useQueryClient(queryClientOverride);
   const client = connectedPdsClient(queryClient);
   const request = options.queryKey[3];
   return useSyncExternalStore(
diff --git a/packages/decentralized-convex-tanstack-query/src/useQuery.ts b/packages/decentralized-convex-tanstack-query/src/useQuery.ts
new file mode 100644
index 00000000..29613f23
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/useQuery.ts
@@ -0,0 +1,72 @@
+import type {
+  AnyPdsQueryRequest,
+  DefaultCombinedPdsResult,
+  FederatedQueryStatus,
+  FederationSourceSnapshot,
+  PdsQueryData,
+  PdsRequestResult,
+} from "@decentralized-convex/client";
+import type {
+  DefaultError,
+  DefinedUseQueryResult,
+  QueryClient,
+  UseQueryOptions,
+} from "@tanstack/react-query";
+import { useQuery as useTanStackQuery } from "@tanstack/react-query";
+
+import type { PdsQueryKey, PdsQueryOptions } from "./pds.ts";
+import { usePdsQueryState } from "./pds.ts";
+
+type QueryData<Request extends AnyPdsQueryRequest> = PdsQueryData<
+  DefaultCombinedPdsResult<Request>
+>;
+
+export type PdsUseQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+> = Omit<
+  UseQueryOptions<QueryData<Request>, DefaultError, Data, PdsQueryKey<Request>>,
+  "initialData" | "meta" | "queryFn" | "queryKey"
+> & {
+  readonly query: PdsQueryOptions<Request>;
+};
+
+export type PdsUseQueryResult<
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+> = DefinedUseQueryResult<Data, DefaultError> & {
+  readonly federation: {
+    readonly sources: readonly FederationSourceSnapshot<
+      PdsRequestResult<Request>
+    >[];
+    readonly status: FederatedQueryStatus;
+  };
+};
+
+/**
+ * Extends the application's TanStack useQuery with one nested PDS query and
+ * federation diagnostics in the result.
+ */
+export function useQuery<
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+>(
+  { query, ...options }: PdsUseQueryOptions<Request, Data>,
+  queryClient?: QueryClient,
+): PdsUseQueryResult<Request, Data> {
+  const result = useTanStackQuery<
+    QueryData<Request>,
+    DefaultError,
+    Data,
+    PdsQueryKey<Request>
+  >({ ...query, ...options }, queryClient);
+  const snapshot = usePdsQueryState(query, queryClient);
+
+  return {
+    ...result,
+    federation: {
+      sources: snapshot.sources,
+      status: snapshot.status,
+    },
+  };
+}

From cc40b3995143376302aed83259e674eed1a07d92 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 17:39:44 -0400
Subject: [PATCH 12/17] Use native TanStack hooks for PDS operations

---
 apps/web/README.md                            |  21 +-
 .../features/conversation/Conversation.tsx    |  13 +-
 .../features/conversation/useConversation.ts  |  26 ++-
 docs/architecture.md                          |  12 +-
 .../decentralized-convex-client/src/index.ts  |   2 +-
 .../src/query-data.test.ts                    |  37 +++-
 .../src/query-data.ts                         |  71 +++++--
 .../README.md                                 |  53 ++---
 .../src/index.ts                              |  19 +-
 .../src/pds.test.ts                           |  64 +++---
 .../src/pds.ts                                | 186 ++++++++----------
 .../src/useQuery.ts                           |  72 -------
 12 files changed, 290 insertions(+), 286 deletions(-)
 delete mode 100644 packages/decentralized-convex-tanstack-query/src/useQuery.ts

diff --git a/apps/web/README.md b/apps/web/README.md
index 8b5b9f51..46251b59 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -72,21 +72,22 @@ The common read and write paths use the PDS query adapter with the
 application's TanStack Query instance:
 
 ```ts
-import { useMutation } from "@tanstack/react-query";
-import {
-  pdsMutation,
-  pdsQuery,
-  useQuery,
-} from "@decentralized-convex/tanstack-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
 import { pds } from "@vera/backend/pds";
 
-const messages = useQuery({
-  query: pdsQuery(pds.messages.list, { conversationId }),
-});
+const messages = useQuery(
+  pdsQuery({
+    query: pds.messages.list,
+    args: { conversationId },
+  }),
+);
 
 if (messages.data.status === "success") {
   messages.data.result; // Message[]
 }
 
-const sendMessage = useMutation(pdsMutation(pds.messages.send));
+messages.data.federation.sources;
+
+const sendMessage = useMutation(pdsMutation({ mutation: pds.messages.send }));
 ```
diff --git a/apps/web/src/features/conversation/Conversation.tsx b/apps/web/src/features/conversation/Conversation.tsx
index e610684c..f1a85cc1 100644
--- a/apps/web/src/features/conversation/Conversation.tsx
+++ b/apps/web/src/features/conversation/Conversation.tsx
@@ -1,5 +1,4 @@
 import type {
-  FederatedQueryStatus,
   FederationSourceSnapshot,
   PdsQueryData,
 } from "@decentralized-convex/client";
@@ -87,7 +86,7 @@ function ConversationHeader({
   home: HomePds;
   messages: ConversationMessages;
 }) {
-  const { sources, status } = messages.federation;
+  const { sources, status } = messages.data.federation;
   const live = sources.filter((source) => source.status === "live").length;
   const complete = live === sources.length;
 
@@ -158,17 +157,13 @@ function MessageList({
 }: {
   home: HomePds;
   messages: {
-    data: PdsQueryData<readonly ChatMessage[]>;
-    federation: {
-      sources: readonly FederationSourceSnapshot<ChatMessage[]>[];
-      status: FederatedQueryStatus;
-    };
+    data: PdsQueryData<readonly ChatMessage[], readonly ChatMessage[]>;
   };
 }) {
-  const live = messages.federation.sources.filter(
+  const live = messages.data.federation.sources.filter(
     (source) => source.status === "live",
   ).length;
-  const total = messages.federation.sources.length;
+  const total = messages.data.federation.sources.length;
 
   return (
     <div className="message-list" aria-live="polite">
diff --git a/apps/web/src/features/conversation/useConversation.ts b/apps/web/src/features/conversation/useConversation.ts
index ae495a10..a1a38a26 100644
--- a/apps/web/src/features/conversation/useConversation.ts
+++ b/apps/web/src/features/conversation/useConversation.ts
@@ -1,27 +1,33 @@
 import type { Message } from "@decentralized-convex/messages";
 import type { FormEvent } from "react";
 import { useEffect, useEffectEvent, useState } from "react";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import {
   mapPdsQueryData,
   pdsMutation,
   pdsQuery,
-  useQuery,
 } from "@decentralized-convex/tanstack-query";
 import { pds } from "@vera/backend/pds";
 
 import { prototypeConversation } from "../pds/model.ts";
 
 export function useConversation() {
-  const conversation = useMutation(pdsMutation(pds.messages.putConversation));
-  const query = useQuery({
-    enabled: conversation.isSuccess,
-    query: pdsQuery(pds.messages.list, {
-      conversationId: prototypeConversation.id,
+  const conversation = useMutation(
+    pdsMutation({ mutation: pds.messages.putConversation }),
+  );
+  const query = useQuery(
+    pdsQuery({
+      args: {
+        conversationId: prototypeConversation.id,
+      },
+      options: {
+        enabled: conversation.isSuccess,
+        select: (data) => mapPdsQueryData(data, combineMessages),
+      },
+      query: pds.messages.list,
     }),
-    select: (data) => mapPdsQueryData(data, combineMessages),
-  });
-  const sendMessage = useMutation(pdsMutation(pds.messages.send));
+  );
+  const sendMessage = useMutation(pdsMutation({ mutation: pds.messages.send }));
   const [draft, setDraft] = useState("");
   const saveConversation = useEffectEvent(() => {
     conversation.mutate({
diff --git a/docs/architecture.md b/docs/architecture.md
index 33615e92..45524da2 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -67,7 +67,7 @@ the generated API of any particular independently hosted backend.
 A Messages read follows this path:
 
 ```text
-useQuery({ query: pdsQuery(...) })
+useQuery(pdsQuery({ query, args, options }))
   -> pds:dispatchQuery on the signed-in account's home
   -> typed data plus hidden conversation routing identities
   -> current PDS discovery for those identities
@@ -105,13 +105,15 @@ The default path intentionally needs only:
 
 - `definePdsApp` on the server;
 - one stable backend `pds` export inferred from that app definition;
-- `useQuery({ query: pdsQuery(operation, args) })` for reactive reads and
-  federation diagnostics in one result;
-- `useMutation(pdsMutation(operation))` for writes.
+- the application's native `useQuery(pdsQuery({ query, args, options }))` for
+  reactive reads and federation diagnostics in `data`;
+- the application's native `useMutation(pdsMutation({ mutation, options }))`
+  for writes.
 
 PDS query `data` is a discriminated `loading`, `partial`, `success`, or `error`
 object. Partial and successful states carry the operation value as `result`;
-loading is never represented by an ambiguous `undefined` value.
+loading is never represented by an ambiguous `undefined` value. Every state
+also carries federation status and per-source diagnostics.
 
 Applications may override:
 
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 45cd1b53..830f8d65 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -28,7 +28,7 @@ export {
 export { FederatedQueryObserver } from "./observer.ts";
 export { FederatedPdsQueryObserver } from "./pds-observer.ts";
 export { mapPdsQueryData, pdsQueryDataFromSnapshot } from "./query-data.ts";
-export type { PdsQueryData } from "./query-data.ts";
+export type { PdsQueryData, PdsQueryFederation } from "./query-data.ts";
 export { defaultCombine } from "./snapshot.ts";
 export { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 export type {
diff --git a/packages/decentralized-convex-client/src/query-data.test.ts b/packages/decentralized-convex-client/src/query-data.test.ts
index fe7f1a01..26fb94a2 100644
--- a/packages/decentralized-convex-client/src/query-data.test.ts
+++ b/packages/decentralized-convex-client/src/query-data.test.ts
@@ -4,6 +4,10 @@ import test from "node:test";
 import { mapPdsQueryData, pdsQueryDataFromSnapshot } from "./query-data.ts";
 
 const target = { ids: ["alice@example.com"], url: "https://example.com" };
+const successFederation = {
+  sources: [{ data: undefined, status: "live" as const, target }],
+  status: "success" as const,
+};
 
 void test("distinguishes a loaded undefined result from loading", () => {
   const data = pdsQueryDataFromSnapshot({
@@ -12,18 +16,37 @@ void test("distinguishes a loaded undefined result from loading", () => {
     status: "success",
   });
 
-  assert.deepEqual(data, { result: undefined, status: "success" });
+  assert.deepEqual(data, {
+    federation: successFederation,
+    result: undefined,
+    status: "success",
+  });
 });
 
-void test("maps only available query results", () => {
+void test("maps only available query results and preserves federation", () => {
   assert.deepEqual(
-    mapPdsQueryData({ result: [1, 2], status: "partial" }, (values) =>
-      values.map(String),
+    mapPdsQueryData(
+      {
+        federation: { ...successFederation, status: "partial" },
+        result: [1, 2],
+        status: "partial",
+      },
+      (values) => values.map(String),
     ),
-    { result: ["1", "2"], status: "partial" },
+    {
+      federation: { ...successFederation, status: "partial" },
+      result: ["1", "2"],
+      status: "partial",
+    },
   );
   assert.deepEqual(
-    mapPdsQueryData({ status: "loading" }, () => "unreachable"),
-    { status: "loading" },
+    mapPdsQueryData(
+      {
+        federation: { sources: [], status: "pending" },
+        status: "loading",
+      },
+      () => "unreachable",
+    ),
+    { federation: { sources: [], status: "pending" }, status: "loading" },
   );
 });
diff --git a/packages/decentralized-convex-client/src/query-data.ts b/packages/decentralized-convex-client/src/query-data.ts
index ef7e73e5..062fae87 100644
--- a/packages/decentralized-convex-client/src/query-data.ts
+++ b/packages/decentralized-convex-client/src/query-data.ts
@@ -1,21 +1,49 @@
-import type { FederatedQuerySnapshot } from "./types.ts";
+import type {
+  FederatedQuerySnapshot,
+  FederatedQueryStatus,
+  FederationSourceSnapshot,
+} from "./types.ts";
 
-export type PdsQueryData<Result> =
-  | { readonly status: "loading" }
-  | { readonly result: Result; readonly status: "partial" }
-  | { readonly result: Result; readonly status: "success" }
-  | { readonly error: Error; readonly status: "error" };
+export interface PdsQueryFederation<SourceResult> {
+  readonly sources: readonly FederationSourceSnapshot<SourceResult>[];
+  readonly status: FederatedQueryStatus;
+}
+
+export type PdsQueryData<Result, SourceResult = Result> =
+  | {
+      readonly federation: PdsQueryFederation<SourceResult>;
+      readonly status: "loading";
+    }
+  | {
+      readonly federation: PdsQueryFederation<SourceResult>;
+      readonly result: Result;
+      readonly status: "partial";
+    }
+  | {
+      readonly federation: PdsQueryFederation<SourceResult>;
+      readonly result: Result;
+      readonly status: "success";
+    }
+  | {
+      readonly error: Error;
+      readonly federation: PdsQueryFederation<SourceResult>;
+      readonly status: "error";
+    };
 
-export function pdsQueryDataFromSnapshot<Result>(
-  snapshot: FederatedQuerySnapshot<Result, unknown>,
-): PdsQueryData<Result> {
+export function pdsQueryDataFromSnapshot<Result, SourceResult>(
+  snapshot: FederatedQuerySnapshot<Result, SourceResult>,
+): PdsQueryData<Result, SourceResult> {
+  const federation = {
+    sources: snapshot.sources,
+    status: snapshot.status,
+  };
   switch (snapshot.status) {
     case "pending":
-      return { status: "loading" };
+      return { federation, status: "loading" };
     case "partial":
-      return { result: snapshot.data, status: "partial" };
+      return { federation, result: snapshot.data, status: "partial" };
     case "success":
-      return { result: snapshot.data, status: "success" };
+      return { federation, result: snapshot.data, status: "success" };
     case "error":
       return {
         error: new AggregateError(
@@ -24,22 +52,31 @@ export function pdsQueryDataFromSnapshot<Result>(
           ),
           "Every PDS query target failed",
         ),
+        federation,
         status: "error",
       };
   }
 }
 
-export function mapPdsQueryData<Input, Output>(
-  data: PdsQueryData<Input>,
+export function mapPdsQueryData<Input, Output, SourceResult>(
+  data: PdsQueryData<Input, SourceResult>,
   map: (result: Input) => Output,
-): PdsQueryData<Output> {
+): PdsQueryData<Output, SourceResult> {
   switch (data.status) {
     case "loading":
     case "error":
       return data;
     case "partial":
-      return { result: map(data.result), status: "partial" };
+      return {
+        federation: data.federation,
+        result: map(data.result),
+        status: "partial",
+      };
     case "success":
-      return { result: map(data.result), status: "success" };
+      return {
+        federation: data.federation,
+        result: map(data.result),
+        status: "success",
+      };
   }
 }
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
index 9c9e9378..5819496d 100644
--- a/packages/decentralized-convex-tanstack-query/README.md
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -4,49 +4,57 @@ A thin adapter for using typed PDS operations with an application's installed
 TanStack Query version:
 
 ```ts
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQuery } from "@tanstack/react-query";
 import {
   mapPdsQueryData,
   pdsMutation,
   pdsQuery,
-  useQuery,
 } from "@decentralized-convex/tanstack-query";
 
-const messages = useQuery({
-  query: pdsQuery(pds.messages.list, { conversationId }),
-});
+const messages = useQuery(
+  pdsQuery({
+    query: pds.messages.list,
+    args: { conversationId },
+  }),
+);
 
 if (messages.data.status === "success") {
   messages.data.result; // Message[]
 }
 
-messages.federation.status;
-messages.federation.sources;
+messages.data.federation.status;
+messages.data.federation.sources;
 
-const sendMessage = useMutation(pdsMutation(pds.messages.send));
+const sendMessage = useMutation(pdsMutation({ mutation: pds.messages.send }));
 await sendMessage.mutateAsync({ body, conversationId, messageId });
 ```
 
-The adapter's `useQuery` delegates to the application's installed TanStack
-Query version. The nested `query` field carries the PDS query while the rest of
-the object accepts normal TanStack options:
+The application uses its own TanStack hooks and installed TanStack Query
+version. `pdsQuery` creates native query options from one explicit object;
+ordinary TanStack options live under `options`:
 
 ```ts
-const messages = useQuery({
-  query: pdsQuery(pds.messages.list, { conversationId }),
-  retry: 3,
-  select: (data) =>
-    mapPdsQueryData(data, (messages) =>
-      messages.filter((message) => message.body.length > 0),
-    ),
-  staleTime: 30_000,
-});
+const messages = useQuery(
+  pdsQuery({
+    query: pds.messages.list,
+    args: { conversationId },
+    options: {
+      retry: 3,
+      select: (data) =>
+        mapPdsQueryData(data, (messages) =>
+          messages.filter((message) => message.body.length > 0),
+        ),
+      staleTime: 30_000,
+    },
+  }),
+);
 ```
 
 Query `data` is always an explicit state object: `loading`, `partial`,
 `success`, or `error`. The actual operation value lives in `result` for partial
 and successful states, so a successfully loaded `undefined` can never be
-confused with loading.
+confused with loading. The same data envelope includes federation status and
+per-source diagnostics, so applications do not need a second hook.
 
 Connect the decentralized transport once when creating an account session:
 
@@ -59,5 +67,4 @@ const disconnect = pdsQueryClient.connect(queryClient);
 `PdsQueryClient` updates TanStack's cache from live Convex subscriptions. The
 core client owns home-first routing, PDS discovery, connection reuse, and
 author-home mutations; the TanStack adapter only bridges those results into the
-application's cache. The adapter hook also returns the query's federation
-status and per-source diagnostics, so applications do not need a second hook.
+application's cache.
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index a342a1fb..d7e696d7 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -1,16 +1,17 @@
 export { decentralizedConvexPackage } from "../metadata.ts";
 export { mapPdsQueryData } from "@decentralized-convex/client";
-export type { PdsQueryData } from "@decentralized-convex/client";
+export type {
+  PdsQueryData,
+  PdsQueryFederation,
+} from "@decentralized-convex/client";
 export { federatedQueryOptions } from "./options.ts";
 export type { FederatedTanStackQueryOptions } from "./options.ts";
-export {
-  pdsMutation,
-  pdsQuery,
-  PdsQueryClient,
-  usePdsQueryState,
+export { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
+export type {
+  PdsMutationConfig,
+  PdsQueryConfig,
+  PdsQueryKey,
+  PdsQueryOptions,
 } from "./pds.ts";
-export type { PdsQueryKey, PdsQueryOptions } from "./pds.ts";
-export { useQuery } from "./useQuery.ts";
-export type { PdsUseQueryOptions, PdsUseQueryResult } from "./useQuery.ts";
 export { useFederatedQuery } from "./useFederatedQuery.ts";
 export type { FederatedTanStackQueryResult } from "./useFederatedQuery.ts";
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index b29489bf..c79b545f 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -12,13 +12,13 @@ import {
   MutationObserver,
   QueryClient,
   QueryObserver,
+  useQuery,
 } from "@tanstack/react-query";
 import { DecentralizedConvexClient } from "@decentralized-convex/client";
 import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
 import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 
 import { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
-import { useQuery } from "./useQuery.ts";
 
 interface Note {
   body: string;
@@ -62,34 +62,48 @@ void test("produces native TanStack query and mutation options", async () => {
   const adapter = new PdsQueryClient(transport);
   const disconnect = adapter.connect(queryClient);
 
-  const query = pdsQuery(listNotes, { owner: "alice" });
+  const query = pdsQuery({
+    args: { owner: "alice" },
+    query: listNotes,
+  });
   const initialObserver = new QueryObserver(new QueryClient(), query);
   assert.deepEqual(initialObserver.getCurrentResult().data, {
+    federation: { sources: [], status: "pending" },
     status: "loading",
   });
 
-  assert.deepEqual(await queryClient.fetchQuery(query), {
-    result: [
-      { body: "https://a.test", id: "alice" },
-      { body: "https://b.test", id: "alice" },
-    ],
-    status: "success",
-  });
+  const initial = await queryClient.fetchQuery(query);
+  assert.equal(initial.status, "success");
+  assert.deepEqual(initial.result, [
+    { body: "https://a.test", id: "alice" },
+    { body: "https://b.test", id: "alice" },
+  ]);
+  assert.equal(initial.federation.status, "success");
+  assert.deepEqual(
+    initial.federation.sources.map((source) => source.status),
+    ["live", "live"],
+  );
 
   const observer = new QueryObserver(queryClient, query);
   const unsubscribe = observer.subscribe(() => undefined);
   await nextTask();
   connections.get("https://a.test")?.emit("updated");
   await nextTask();
-  assert.deepEqual(queryClient.getQueryData(query.queryKey), {
-    result: [
-      { body: "updated", id: "alice" },
-      { body: "https://b.test", id: "alice" },
-    ],
-    status: "success",
-  });
-
-  const mutation = new MutationObserver(queryClient, pdsMutation(createNote));
+  const updated = queryClient.getQueryData<
+    PdsQueryData<Note[], readonly Note[]>
+  >(query.queryKey);
+  assert.ok(updated);
+  assert.equal(updated.status, "success");
+  assert.deepEqual(updated.result, [
+    { body: "updated", id: "alice" },
+    { body: "https://b.test", id: "alice" },
+  ]);
+  assert.equal(updated.federation.status, "success");
+
+  const mutation = new MutationObserver(
+    queryClient,
+    pdsMutation({ mutation: createNote }),
+  );
   assert.deepEqual(await mutation.mutate({ body: "hello" }), {
     body: "hello",
     id: "https://a.test",
@@ -101,11 +115,15 @@ void test("produces native TanStack query and mutation options", async () => {
 });
 
 function usePdsQueryTypeTest() {
-  const query = useQuery({
-    query: pdsQuery(listNotes, { owner: "alice" }),
-  });
-  const data: PdsQueryData<Note[]> = query.data;
-  const source = query.federation.sources[0];
+  const query = useQuery(
+    pdsQuery({
+      args: { owner: "alice" },
+      options: { enabled: true },
+      query: listNotes,
+    }),
+  );
+  const data: PdsQueryData<Note[], readonly Note[]> = query.data;
+  const source = query.data.federation.sources[0];
   if (source?.status === "live") {
     const notes: readonly Note[] = source.data;
     void notes;
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
index 4aa4ea18..f6afd64d 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -3,7 +3,6 @@ import type {
   AnyPdsQueryRequest,
   DecentralizedConvexClient,
   DefaultCombinedPdsResult,
-  FederatedQuerySnapshot,
   PdsQueryData,
   PdsRequest,
   PdsRequestResult,
@@ -12,15 +11,10 @@ import type {
   DefinedInitialDataOptions,
   Query,
   QueryClient,
-  QueryKey,
   QueryMeta,
+  UseMutationOptions,
 } from "@tanstack/react-query";
-import { useSyncExternalStore } from "react";
-import {
-  hashKey,
-  mutationOptions,
-  useQueryClient,
-} from "@tanstack/react-query";
+import { mutationOptions } from "@tanstack/react-query";
 import { pdsQueryDataFromSnapshot } from "@decentralized-convex/client";
 
 const PDS_QUERY_META_KEY = "decentralizedConvexPdsQuery";
@@ -31,8 +25,6 @@ interface ActiveQuery {
   close?: () => void;
 }
 
-type UnknownSnapshot = FederatedQuerySnapshot<unknown, unknown>;
-
 /**
  * Connects decentralized Convex transport to an application-owned TanStack
  * QueryClient. Application queries still use TanStack's own hooks.
@@ -41,8 +33,6 @@ export class PdsQueryClient {
   readonly #activeQueries = new Map<string, ActiveQuery>();
   readonly #client;
   readonly #connections = new Map<QueryClient, () => void>();
-  readonly #listeners = new Map<string, Set<() => void>>();
-  readonly #snapshots = new Map<string, UnknownSnapshot>();
 
   constructor(client: DecentralizedConvexClient) {
     this.#client = client;
@@ -108,14 +98,18 @@ export class PdsQueryClient {
 
   async query<Request extends AnyPdsQueryRequest>(
     request: Request,
-    queryKey: QueryKey,
-  ): Promise<PdsQueryData<DefaultCombinedPdsResult<Request>>> {
+  ): Promise<
+    PdsQueryData<DefaultCombinedPdsResult<Request>, PdsRequestResult<Request>>
+  > {
     try {
       const snapshot = await this.#client.pdsQuery(request);
-      this.#publish(hashKey(queryKey), snapshot);
       return pdsQueryDataFromSnapshot(snapshot);
     } catch (error) {
-      return { error: toError(error), status: "error" };
+      return {
+        error: toError(error),
+        federation: { sources: [], status: "error" },
+        status: "error",
+      };
     }
   }
 
@@ -125,48 +119,6 @@ export class PdsQueryClient {
     return this.#client.pdsMutation(request);
   }
 
-  getSnapshot<Request extends AnyPdsQueryRequest>(
-    request: Request,
-    queryKey: QueryKey,
-  ): FederatedQuerySnapshot<
-    DefaultCombinedPdsResult<Request>,
-    PdsRequestResult<Request>
-  > {
-    const queryHash = hashKey(queryKey);
-    let snapshot = this.#snapshots.get(queryHash);
-    if (snapshot === undefined) {
-      snapshot = {
-        data: [],
-        sources: [],
-        status: "pending",
-      };
-      this.#snapshots.set(queryHash, snapshot);
-    }
-
-    // Snapshots originate from the same typed request stored in this query key.
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return snapshot as FederatedQuerySnapshot<
-      DefaultCombinedPdsResult<Request>,
-      PdsRequestResult<Request>
-    >;
-  }
-
-  subscribe(queryKey: QueryKey, listener: () => void) {
-    const queryHash = hashKey(queryKey);
-    const listeners = this.#listeners.get(queryHash) ?? new Set<() => void>();
-    listeners.add(listener);
-    this.#listeners.set(queryHash, listeners);
-    return () => {
-      listeners.delete(listener);
-      if (listeners.size === 0) this.#listeners.delete(queryHash);
-    };
-  }
-
-  #publish(queryHash: string, snapshot: UnknownSnapshot) {
-    this.#snapshots.set(queryHash, snapshot);
-    for (const listener of this.#listeners.get(queryHash) ?? []) listener();
-  }
-
   #startQuery(queryClient: QueryClient, query: Query) {
     const request = pdsRequestFromMeta(query.meta);
     if (request === undefined || this.#activeQueries.has(query.queryHash)) {
@@ -176,14 +128,13 @@ export class PdsQueryClient {
     const active: ActiveQuery = { cancelled: false };
     this.#activeQueries.set(query.queryHash, active);
     const observer = this.#client.watchPdsQuery(request);
-    const publish = () => {
+    function publish() {
       const snapshot = observer.getSnapshot();
-      this.#publish(hashKey(query.queryKey), snapshot);
       queryClient.setQueryData(
         query.queryKey,
         pdsQueryDataFromSnapshot(snapshot),
       );
-    };
+    }
     const unsubscribe = observer.subscribe(publish);
     active.close = () => {
       unsubscribe();
@@ -208,67 +159,102 @@ export type PdsQueryKey<Request extends AnyPdsQueryRequest> = readonly [
   Request,
 ];
 
-export type PdsQueryOptions<Request extends AnyPdsQueryRequest> = ReturnType<
-  typeof pdsQueryOptions<Request>
+type QueryData<Request extends AnyPdsQueryRequest> = PdsQueryData<
+  DefaultCombinedPdsResult<Request>,
+  PdsRequestResult<Request>
+>;
+
+export type PdsQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+> = DefinedInitialDataOptions<
+  QueryData<Request>,
+  Error,
+  Data,
+  PdsQueryKey<Request>
 >;
 
-export function pdsQuery<Args, Result>(
-  operation: (args: Args) => PdsRequest<Result, "query">,
-  args: Args,
-) {
-  return pdsQueryOptions(operation(args));
+export interface PdsQueryConfig<
+  Args,
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+> {
+  readonly args: Args;
+  readonly options?: Omit<
+    PdsQueryOptions<Request, Data>,
+    "initialData" | "meta" | "queryFn" | "queryKey"
+  >;
+  readonly query: (args: Args) => Request;
+}
+
+export function pdsQuery<
+  Args,
+  Request extends PdsRequest<unknown, "query">,
+  Data = QueryData<Request>,
+>({ args, options, query }: PdsQueryConfig<Args, Request, Data>) {
+  return pdsQueryOptions(query(args), options);
 }
 
-function pdsQueryOptions<Request extends AnyPdsQueryRequest>(request: Request) {
+function pdsQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+>(
+  request: Request,
+  options?: PdsQueryConfig<unknown, Request, Data>["options"],
+): PdsQueryOptions<Request, Data> {
   const queryKey: PdsQueryKey<typeof request> = [
     "decentralized-convex",
     "pds",
     "query",
     request,
   ];
-  const initialData =
-    loadingPdsQueryData<DefaultCombinedPdsResult<typeof request>>();
+  const initialData = loadingPdsQueryData<
+    DefaultCombinedPdsResult<Request>,
+    PdsRequestResult<Request>
+  >();
   return {
     initialData,
     meta: { [PDS_QUERY_META_KEY]: request },
-    queryFn: ({ client }) =>
-      connectedPdsClient(client).query(request, queryKey),
+    queryFn: ({ client }) => connectedPdsClient(client).query(request),
     queryKey,
     staleTime: (query) =>
       query.state.data?.status === "loading" ? 0 : Infinity,
-  } satisfies DefinedInitialDataOptions<
-    PdsQueryData<DefaultCombinedPdsResult<Request>>,
-    Error,
-    PdsQueryData<DefaultCombinedPdsResult<Request>>,
-    PdsQueryKey<Request>
-  >;
+    ...options,
+  };
 }
 
-function loadingPdsQueryData<Result>(): PdsQueryData<Result> {
-  return { status: "loading" };
+function loadingPdsQueryData<Result, SourceResult>(): PdsQueryData<
+  Result,
+  SourceResult
+> {
+  return {
+    federation: { sources: [], status: "pending" },
+    status: "loading",
+  };
 }
 
-export function pdsMutation<Args, Result>(
-  operation: (args: Args) => PdsRequest<Result, "mutation">,
-) {
-  return mutationOptions({
-    mutationFn: (args: Args, { client }) =>
-      connectedPdsClient(client).mutate(operation(args)),
-  });
+export interface PdsMutationConfig<
+  Args,
+  Request extends AnyPdsMutationRequest,
+  Context = unknown,
+> {
+  readonly mutation: (args: Args) => Request;
+  readonly options?: Omit<
+    UseMutationOptions<PdsRequestResult<Request>, Error, Args, Context>,
+    "mutationFn"
+  >;
 }
 
-export function usePdsQueryState<Request extends AnyPdsQueryRequest>(
-  options: { queryKey: PdsQueryKey<Request> },
-  queryClientOverride?: QueryClient,
-) {
-  const queryClient = useQueryClient(queryClientOverride);
-  const client = connectedPdsClient(queryClient);
-  const request = options.queryKey[3];
-  return useSyncExternalStore(
-    (listener) => client.subscribe(options.queryKey, listener),
-    () => client.getSnapshot(request, options.queryKey),
-    () => client.getSnapshot(request, options.queryKey),
-  );
+export function pdsMutation<
+  Args,
+  Request extends PdsRequest<unknown, "mutation">,
+  Context = unknown,
+>({ mutation, options }: PdsMutationConfig<Args, Request, Context>) {
+  return mutationOptions<PdsRequestResult<Request>, Error, Args, Context>({
+    ...options,
+    mutationFn: (args: Args, { client }) =>
+      connectedPdsClient(client).mutate(mutation(args)),
+  });
 }
 
 function connectedPdsClient(queryClient: QueryClient) {
diff --git a/packages/decentralized-convex-tanstack-query/src/useQuery.ts b/packages/decentralized-convex-tanstack-query/src/useQuery.ts
deleted file mode 100644
index 29613f23..00000000
--- a/packages/decentralized-convex-tanstack-query/src/useQuery.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import type {
-  AnyPdsQueryRequest,
-  DefaultCombinedPdsResult,
-  FederatedQueryStatus,
-  FederationSourceSnapshot,
-  PdsQueryData,
-  PdsRequestResult,
-} from "@decentralized-convex/client";
-import type {
-  DefaultError,
-  DefinedUseQueryResult,
-  QueryClient,
-  UseQueryOptions,
-} from "@tanstack/react-query";
-import { useQuery as useTanStackQuery } from "@tanstack/react-query";
-
-import type { PdsQueryKey, PdsQueryOptions } from "./pds.ts";
-import { usePdsQueryState } from "./pds.ts";
-
-type QueryData<Request extends AnyPdsQueryRequest> = PdsQueryData<
-  DefaultCombinedPdsResult<Request>
->;
-
-export type PdsUseQueryOptions<
-  Request extends AnyPdsQueryRequest,
-  Data = QueryData<Request>,
-> = Omit<
-  UseQueryOptions<QueryData<Request>, DefaultError, Data, PdsQueryKey<Request>>,
-  "initialData" | "meta" | "queryFn" | "queryKey"
-> & {
-  readonly query: PdsQueryOptions<Request>;
-};
-
-export type PdsUseQueryResult<
-  Request extends AnyPdsQueryRequest,
-  Data = QueryData<Request>,
-> = DefinedUseQueryResult<Data, DefaultError> & {
-  readonly federation: {
-    readonly sources: readonly FederationSourceSnapshot<
-      PdsRequestResult<Request>
-    >[];
-    readonly status: FederatedQueryStatus;
-  };
-};
-
-/**
- * Extends the application's TanStack useQuery with one nested PDS query and
- * federation diagnostics in the result.
- */
-export function useQuery<
-  Request extends AnyPdsQueryRequest,
-  Data = QueryData<Request>,
->(
-  { query, ...options }: PdsUseQueryOptions<Request, Data>,
-  queryClient?: QueryClient,
-): PdsUseQueryResult<Request, Data> {
-  const result = useTanStackQuery<
-    QueryData<Request>,
-    DefaultError,
-    Data,
-    PdsQueryKey<Request>
-  >({ ...query, ...options }, queryClient);
-  const snapshot = usePdsQueryState(query, queryClient);
-
-  return {
-    ...result,
-    federation: {
-      sources: snapshot.sources,
-      status: snapshot.status,
-    },
-  };
-}

From 237c48d00814f0563f98a99bdcdf84999e717851 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Mon, 17 Aug 2026 23:16:33 -0400
Subject: [PATCH 13/17] Add configurable PDS partial result grace period

---
 apps/web/README.md                            |   5 +
 .../features/conversation/Conversation.tsx    |  17 +-
 docs/architecture.md                          |   8 +-
 .../src/client.test.ts                        | 176 ++++++++++++++++++
 .../decentralized-convex-client/src/client.ts |  41 +++-
 .../decentralized-convex-client/src/index.ts  |   6 +-
 .../src/observer.ts                           |  13 +-
 .../src/pds-observer.ts                       |  13 +-
 .../src/routed-pds-observer.ts                |  73 +++++++-
 .../src/snapshot.ts                           |  10 +-
 .../decentralized-convex-client/src/types.ts  |   8 +-
 .../README.md                                 |   8 +
 .../src/index.ts                              |   1 +
 .../src/pds.test.ts                           |   2 +
 .../src/pds.ts                                |  70 +++++--
 15 files changed, 406 insertions(+), 45 deletions(-)

diff --git a/apps/web/README.md b/apps/web/README.md
index 46251b59..5469f7df 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -91,3 +91,8 @@ messages.data.federation.sources;
 
 const sendMessage = useMutation(pdsMutation({ mutation: pds.messages.send }));
 ```
+
+PDS reads hide partial results for `500ms` by default while participant homes
+deliver their first snapshots. Set `options.revealPartialResultsAfter` in
+`pdsQuery` to override the delay. Complete data returns immediately, and a
+temporary disconnect retains the affected PDS's last known data.
diff --git a/apps/web/src/features/conversation/Conversation.tsx b/apps/web/src/features/conversation/Conversation.tsx
index f1a85cc1..379a54fb 100644
--- a/apps/web/src/features/conversation/Conversation.tsx
+++ b/apps/web/src/features/conversation/Conversation.tsx
@@ -88,17 +88,20 @@ function ConversationHeader({
 }) {
   const { sources, status } = messages.data.federation;
   const live = sources.filter((source) => source.status === "live").length;
-  const complete = live === sources.length;
+  const description =
+    messages.data.status === "loading"
+      ? "Connecting to participant home servers"
+      : messages.data.status === "partial"
+        ? `Incomplete history — ${live} of ${sources.length} homes connected`
+        : messages.data.status === "error"
+          ? "Unable to load conversation history"
+          : "Messages from every participant's home server";
 
   return (
     <header className="channel-header">
       <div>
         <h1>Prototype conversation</h1>
-        <p>
-          {complete
-            ? "Messages from every participant's home server"
-            : `Incomplete history — ${live} of ${sources.length} homes connected`}
-        </p>
+        <p>{description}</p>
       </div>
       <div className="channel-actions">
         <span className="connection-summary" data-status={status}>
@@ -167,7 +170,7 @@ function MessageList({
 
   return (
     <div className="message-list" aria-live="polite">
-      {live < total ? (
+      {messages.data.status === "partial" ? (
         <aside className="federation-warning" role="status">
           <strong>Showing partial history</strong>
           <p>
diff --git a/docs/architecture.md b/docs/architecture.md
index 45524da2..794c782c 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -115,6 +115,12 @@ object. Partial and successful states carry the operation value as `result`;
 loading is never represented by an ambiguous `undefined` value. Every state
 also carries federation status and per-source diagnostics.
 
+Initial partial data remains loading for `500ms` by default and can be tuned
+with `options.revealPartialResultsAfter`. Complete data bypasses the delay. Once
+every initial PDS has responded, the query remains successful: temporary
+disconnects retain last-known source data, and newly discovered PDSs load in
+the background instead of resetting the visible result.
+
 Applications may override:
 
 - ordinary Component install names and HTTP prefixes;
@@ -135,8 +141,6 @@ Still prototype-only:
 
 - the web app uses one explicit two-domain conversation fixture, but its
   routing is stored on each account's home and discovered through product data;
-- the initial loading grace period and partial-result reveal policy are not yet
-  implemented;
 - the UI holds one active account rather than concurrent accounts;
 - auth lacks scopes, revocation, replay limits, and resource-specific policy;
 - Component migration execution, persisted upgrade state, and large plugin
diff --git a/packages/decentralized-convex-client/src/client.test.ts b/packages/decentralized-convex-client/src/client.test.ts
index 52a73e92..407aa218 100644
--- a/packages/decentralized-convex-client/src/client.test.ts
+++ b/packages/decentralized-convex-client/src/client.test.ts
@@ -1,6 +1,7 @@
 import assert from "node:assert/strict";
 import test from "node:test";
 import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
 import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 import {
   defineOperation,
@@ -9,6 +10,7 @@ import {
 import { makeFunctionReference } from "convex/server";
 import { v } from "convex/values";
 
+import type { PdsRequest } from "./pds.ts";
 import type {
   FederationConnection,
   FederationMutationReference,
@@ -92,6 +94,101 @@ void test("federates typed PDS requests without a generated backend API", async
   await client.close();
 });
 
+void test("reveals initial partial PDS data after the grace period and retains stale data", async () => {
+  const connections = new Map<string, ControlledConnection>();
+  const client = new DecentralizedConvexClient({
+    connectionFactory: (url) => {
+      const connection = new ControlledConnection();
+      connections.set(url, connection);
+      return connection;
+    },
+    pds: {
+      discover: (domain) => Promise.resolve(discoveredPds(domain)),
+      home: discoveredPds("a.test"),
+    },
+  });
+  const observer = client.watchPdsQuery(listNotesRequest, {
+    revealPartialResultsAfter: 20,
+  });
+  const unsubscribe = observer.subscribe(() => undefined);
+
+  connections.get("https://a.test")?.emit([{ body: "a" }], ["b.test"]);
+  await nextTask();
+  assert.equal(observer.getSnapshot().status, "pending");
+
+  await wait(25);
+  assert.equal(observer.getSnapshot().status, "partial");
+  assert.deepEqual(observer.getSnapshot().data, [{ body: "a" }]);
+
+  connections.get("https://b.test")?.emit([{ body: "b" }]);
+  assert.equal(observer.getSnapshot().status, "success");
+  assert.deepEqual(observer.getSnapshot().data, [{ body: "a" }, { body: "b" }]);
+
+  connections.get("https://b.test")?.fail(new Error("temporarily offline"));
+  assert.equal(observer.getSnapshot().status, "success");
+  assert.deepEqual(observer.getSnapshot().data, [{ body: "a" }, { body: "b" }]);
+  assert.equal(
+    observer
+      .getSnapshot()
+      .sources.find((source) => source.target.url === "https://b.test")?.status,
+    "stale",
+  );
+
+  connections
+    .get("https://a.test")
+    ?.emit([{ body: "a2" }], ["b.test", "c.test"]);
+  await nextTask();
+  assert.equal(observer.getSnapshot().status, "success");
+  assert.deepEqual(observer.getSnapshot().data, [
+    { body: "a2" },
+    { body: "b" },
+  ]);
+  assert.equal(
+    observer
+      .getSnapshot()
+      .sources.find((source) => source.target.url === "https://c.test")?.status,
+    "pending",
+  );
+
+  unsubscribe();
+  observer.close();
+  await client.close();
+});
+
+void test("returns complete PDS data immediately during the partial grace period", async () => {
+  const connections = new Map<string, ControlledConnection>();
+  const client = new DecentralizedConvexClient({
+    connectionFactory: (url) => {
+      const connection = new ControlledConnection();
+      connections.set(url, connection);
+      return connection;
+    },
+    pds: {
+      discover: (domain) => Promise.resolve(discoveredPds(domain)),
+      home: discoveredPds("a.test"),
+    },
+  });
+  const observer = client.watchPdsQuery(listNotesRequest, {
+    revealPartialResultsAfter: 60_000,
+  });
+
+  connections.get("https://a.test")?.emit([{ body: "a" }], ["b.test"]);
+  await nextTask();
+  assert.equal(observer.getSnapshot().status, "pending");
+  connections.get("https://b.test")?.emit([{ body: "b" }]);
+  assert.equal(observer.getSnapshot().status, "success");
+
+  observer.close();
+  await client.close();
+});
+
+const listNotesRequest = {
+  lastChanged: corePackage.lastChanged,
+  operation: { args: {}, type: "list" },
+  plugin: "notes",
+  version: DECENTRALIZED_CONVEX_VERSION,
+} satisfies PdsRequest<readonly { body: string }[], "query">;
+
 class MemoryConnection implements FederationConnection {
   readonly #url;
 
@@ -131,6 +228,85 @@ class MemoryConnection implements FederationConnection {
   }
 }
 
+class ControlledConnection implements FederationConnection {
+  #fail?: (error: Error) => void;
+  #publish?: (
+    value: readonly { body: string }[],
+    routes: readonly string[],
+  ) => void;
+
+  close() {
+    return Promise.resolve();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(): Promise<
+    FunctionReturnType<Mutation>
+  > {
+    return Promise.reject(new Error("Not implemented"));
+  }
+
+  query<Query extends FederationQueryReference>(): Promise<
+    FunctionReturnType<Query>
+  > {
+    return Promise.reject(new Error("Not implemented"));
+  }
+
+  subscribe<Query extends FederationQueryReference>(
+    _query: Query,
+    _args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+    onError: (error: Error) => void,
+  ) {
+    this.#publish = (value, routes) => {
+      const result = { routes, value };
+      // The controlled connection only receives the PDS root query in this test.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      onResult(result as FunctionReturnType<Query>);
+    };
+    this.#fail = onError;
+    return () => {
+      this.#publish = undefined;
+      this.#fail = undefined;
+    };
+  }
+
+  emit(value: readonly { body: string }[], routes: readonly string[] = []) {
+    this.#publish?.(value, routes);
+  }
+
+  fail(error: Error) {
+    this.#fail?.(error);
+  }
+}
+
+function discoveredPds(domain: string) {
+  return {
+    domain,
+    manifest: {
+      accountDomain: domain,
+      capabilities: [
+        {
+          id: "notes",
+          lastChanged: corePackage.lastChanged,
+        },
+      ],
+      deploymentUrl: `https://${domain}`,
+      httpUrl: `https://${domain}`,
+      lastChanged: corePackage.lastChanged,
+      version: DECENTRALIZED_CONVEX_VERSION,
+    },
+    manifestUrl: `https://${domain}/.well-known/pds.json`,
+  };
+}
+
+function nextTask() {
+  return wait(0);
+}
+
+function wait(delay: number) {
+  return new Promise<void>((resolve) => setTimeout(resolve, delay));
+}
+
 function isPdsRequest(args: unknown) {
   return (
     typeof args === "object" &&
diff --git a/packages/decentralized-convex-client/src/client.ts b/packages/decentralized-convex-client/src/client.ts
index e6e23427..89cb0d13 100644
--- a/packages/decentralized-convex-client/src/client.ts
+++ b/packages/decentralized-convex-client/src/client.ts
@@ -26,6 +26,12 @@ import { RoutedPdsQueryObserver } from "./routed-pds-observer.ts";
 import { createFederatedSnapshot } from "./snapshot.ts";
 import { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 
+export const DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER = 500;
+
+export interface PdsQueryExecutionOptions {
+  readonly revealPartialResultsAfter?: number;
+}
+
 export class DecentralizedConvexClient {
   readonly #connectionFactory;
   readonly #connections = new Map<string, FederationConnection>();
@@ -62,13 +68,17 @@ export class DecentralizedConvexClient {
     );
   }
 
-  watchPdsQuery<Request extends AnyPdsQueryRequest>(request: Request) {
+  watchPdsQuery<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    options: PdsQueryExecutionOptions = {},
+  ) {
     const home = this.#requireHome();
     assertPdsRequestCompatibility(home, request);
     return new RoutedPdsQueryObserver({
       getConnection: (url) => this.#getConnection(url),
       home: pdsTarget(home.domain, home),
       request,
+      revealPartialResultsAfter: partialResultsDelay(options),
       resolveRoutes: (routes) => this.#resolveRoutes(routes, request),
     });
   }
@@ -135,7 +145,12 @@ export class DecentralizedConvexClient {
     );
   }
 
-  async pdsQuery<Request extends AnyPdsQueryRequest>(request: Request) {
+  async pdsQuery<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    options: PdsQueryExecutionOptions = {},
+  ) {
+    const startedAt = Date.now();
+    const revealPartialResultsAfter = partialResultsDelay(options);
     const home = this.#requireHome();
     assertPdsRequestCompatibility(home, request);
     const homeTarget = pdsTarget(home.domain, home);
@@ -167,10 +182,15 @@ export class DecentralizedConvexClient {
         }
       }),
     );
-    return createFederatedSnapshot<
+    const snapshot = createFederatedSnapshot<
       PdsRequestResult<Request>,
       DefaultCombinedPdsResult<Request>
     >(settled);
+    if (snapshot.status === "partial") {
+      const remaining = revealPartialResultsAfter - (Date.now() - startedAt);
+      if (remaining > 0) await wait(remaining);
+    }
+    return snapshot;
   }
 
   mutation<Mutation extends FederationMutationReference>(
@@ -273,3 +293,18 @@ function pdsTarget(id: string, pds: DiscoveredPds): FederationTarget {
 function toError(error: unknown) {
   return error instanceof Error ? error : new Error("Federation query failed");
 }
+
+function partialResultsDelay(options: PdsQueryExecutionOptions) {
+  const delay =
+    options.revealPartialResultsAfter ?? DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER;
+  if (!Number.isFinite(delay) || delay < 0) {
+    throw new RangeError(
+      "revealPartialResultsAfter must be a finite, non-negative number",
+    );
+  }
+  return delay;
+}
+
+function wait(delay: number) {
+  return new Promise<void>((resolve) => setTimeout(resolve, delay));
+}
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 830f8d65..53413fc3 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -1,5 +1,9 @@
 export { decentralizedConvexPackage } from "../metadata.ts";
-export { DecentralizedConvexClient } from "./client.ts";
+export {
+  DecentralizedConvexClient,
+  DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER,
+} from "./client.ts";
+export type { PdsQueryExecutionOptions } from "./client.ts";
 export {
   assertPdsCompatibility,
   assertPdsRequestCompatibility,
diff --git a/packages/decentralized-convex-client/src/observer.ts b/packages/decentralized-convex-client/src/observer.ts
index 1d2947b9..f87673c3 100644
--- a/packages/decentralized-convex-client/src/observer.ts
+++ b/packages/decentralized-convex-client/src/observer.ts
@@ -78,7 +78,18 @@ export class FederatedQueryObserver<
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
-    this.#sources.set(url, { ...update, target: source.target });
+    this.#sources.set(
+      url,
+      update.status === "error" &&
+        (source.status === "live" || source.status === "stale")
+        ? {
+            data: source.data,
+            error: update.error,
+            status: "stale",
+            target: source.target,
+          }
+        : { ...update, target: source.target },
+    );
     this.#snapshot = createFederatedSnapshot(
       [...this.#sources.values()],
       this.#options.combine,
diff --git a/packages/decentralized-convex-client/src/pds-observer.ts b/packages/decentralized-convex-client/src/pds-observer.ts
index 851514d4..9648712f 100644
--- a/packages/decentralized-convex-client/src/pds-observer.ts
+++ b/packages/decentralized-convex-client/src/pds-observer.ts
@@ -79,7 +79,18 @@ export class FederatedPdsQueryObserver<
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
-    this.#sources.set(url, { ...update, target: source.target });
+    this.#sources.set(
+      url,
+      update.status === "error" &&
+        (source.status === "live" || source.status === "stale")
+        ? {
+            data: source.data,
+            error: update.error,
+            status: "stale",
+            target: source.target,
+          }
+        : { ...update, target: source.target },
+    );
     this.#snapshot = createFederatedSnapshot(
       [...this.#sources.values()],
       this.#options.combine,
diff --git a/packages/decentralized-convex-client/src/routed-pds-observer.ts b/packages/decentralized-convex-client/src/routed-pds-observer.ts
index fe0ee9b9..1f861b63 100644
--- a/packages/decentralized-convex-client/src/routed-pds-observer.ts
+++ b/packages/decentralized-convex-client/src/routed-pds-observer.ts
@@ -21,6 +21,7 @@ export class RoutedPdsQueryObserver<
   readonly #home;
   readonly #listeners = new Set<() => void>();
   readonly #request;
+  readonly #revealPartialResultsAfter;
   readonly #resolveRoutes;
   readonly #sources = new Map<
     string,
@@ -28,13 +29,18 @@ export class RoutedPdsQueryObserver<
   >();
   readonly #unsubscribes = new Map<string, () => void>();
   #closed = false;
+  #completedInitialLoad = false;
+  #partialResultsTimer?: ReturnType<typeof setTimeout>;
+  #routesResolved = false;
   #routingGeneration = 0;
   #snapshot: FederatedQuerySnapshot<Combined, PdsRequestResult<Request>>;
+  readonly #startedAt = Date.now();
 
   constructor(options: {
     getConnection: (url: string) => PdsConnection;
     home: FederationTarget;
     request: Request;
+    revealPartialResultsAfter: number;
     resolveRoutes: (
       routes: readonly string[],
     ) => Promise<readonly FederationTarget[]>;
@@ -45,6 +51,7 @@ export class RoutedPdsQueryObserver<
       url: options.home.url,
     };
     this.#request = options.request;
+    this.#revealPartialResultsAfter = options.revealPartialResultsAfter;
     this.#resolveRoutes = options.resolveRoutes;
     this.#sources.set(this.#home.url, {
       status: "pending",
@@ -65,6 +72,9 @@ export class RoutedPdsQueryObserver<
     if (this.#closed) return;
     this.#closed = true;
     this.#routingGeneration += 1;
+    if (this.#partialResultsTimer !== undefined) {
+      clearTimeout(this.#partialResultsTimer);
+    }
     for (const unsubscribe of this.#unsubscribes.values()) unsubscribe();
     this.#unsubscribes.clear();
     this.#listeners.clear();
@@ -97,6 +107,7 @@ export class RoutedPdsQueryObserver<
       ...resolved,
     ]);
     this.#removeStaleTargets(targets);
+    this.#routesResolved = true;
     this.#addTargets(targets);
     this.#publish();
   }
@@ -117,11 +128,14 @@ export class RoutedPdsQueryObserver<
       readonly url: string;
     }[],
   ) {
-    for (const target of targets) {
-      if (target.url === this.#home.url || this.#sources.has(target.url)) {
-        continue;
-      }
+    const added = targets.filter(
+      (target) =>
+        target.url !== this.#home.url && !this.#sources.has(target.url),
+    );
+    for (const target of added) {
       this.#sources.set(target.url, { status: "pending", target });
+    }
+    for (const target of added) {
       const client = new PdsClient({
         connection: this.#getConnection(target.url),
       });
@@ -145,12 +159,59 @@ export class RoutedPdsQueryObserver<
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
-    this.#sources.set(url, { ...update, target: source.target });
+    this.#sources.set(
+      url,
+      update.status === "error" &&
+        (source.status === "live" || source.status === "stale")
+        ? {
+            data: source.data,
+            error: update.error,
+            status: "stale",
+            target: source.target,
+          }
+        : { ...update, target: source.target },
+    );
     this.#publish();
   }
 
   #publish() {
-    this.#snapshot = createFederatedSnapshot([...this.#sources.values()]);
+    let snapshot = createFederatedSnapshot<PdsRequestResult<Request>, Combined>(
+      [...this.#sources.values()],
+    );
+
+    if (!this.#routesResolved && snapshot.status !== "error") {
+      snapshot = { ...snapshot, status: "pending" };
+    }
+
+    if (snapshot.status === "success") {
+      this.#completedInitialLoad = true;
+      this.#clearPartialResultsTimer();
+    } else if (this.#completedInitialLoad) {
+      snapshot = { ...snapshot, status: "success" };
+    } else if (snapshot.status === "partial") {
+      const remaining =
+        this.#revealPartialResultsAfter - (Date.now() - this.#startedAt);
+      if (remaining > 0) {
+        this.#schedulePartialResults(remaining);
+        return;
+      }
+    }
+
+    this.#snapshot = snapshot;
     for (const listener of this.#listeners) listener();
   }
+
+  #schedulePartialResults(delay: number) {
+    if (this.#partialResultsTimer !== undefined) return;
+    this.#partialResultsTimer = setTimeout(() => {
+      this.#partialResultsTimer = undefined;
+      this.#publish();
+    }, delay);
+  }
+
+  #clearPartialResultsTimer() {
+    if (this.#partialResultsTimer === undefined) return;
+    clearTimeout(this.#partialResultsTimer);
+    this.#partialResultsTimer = undefined;
+  }
 }
diff --git a/packages/decentralized-convex-client/src/snapshot.ts b/packages/decentralized-convex-client/src/snapshot.ts
index 5e802ae9..2c621843 100644
--- a/packages/decentralized-convex-client/src/snapshot.ts
+++ b/packages/decentralized-convex-client/src/snapshot.ts
@@ -12,7 +12,7 @@ export function createFederatedSnapshot<Result, Combined>(
   ) => Combined,
 ): FederatedQuerySnapshot<Combined, Result> {
   const successful = sources.flatMap((source) =>
-    source.status === "live"
+    source.status === "live" || source.status === "stale"
       ? [{ data: source.data, target: source.target }]
       : [],
   );
@@ -48,10 +48,12 @@ function getStatus<Result>(
   sources: readonly FederationSourceSnapshot<Result>[],
 ) {
   if (sources.length === 0) return "success";
-  const live = sources.filter((source) => source.status === "live").length;
+  const available = sources.filter(
+    (source) => source.status === "live" || source.status === "stale",
+  ).length;
   const errors = sources.filter((source) => source.status === "error").length;
-  if (live === sources.length) return "success";
+  if (available === sources.length) return "success";
   if (errors === sources.length) return "error";
-  if (live > 0) return "partial";
+  if (available > 0) return "partial";
   return "pending";
 }
diff --git a/packages/decentralized-convex-client/src/types.ts b/packages/decentralized-convex-client/src/types.ts
index 9cc90fa4..f9a7381b 100644
--- a/packages/decentralized-convex-client/src/types.ts
+++ b/packages/decentralized-convex-client/src/types.ts
@@ -30,7 +30,7 @@ export interface FederationTargetGroup {
   url: string;
 }
 
-export type FederationSourceStatus = "pending" | "live" | "error";
+export type FederationSourceStatus = "pending" | "live" | "stale" | "error";
 export type FederatedQueryStatus = "pending" | "success" | "partial" | "error";
 
 export type FederationSourceSnapshot<Result> =
@@ -39,6 +39,12 @@ export type FederationSourceSnapshot<Result> =
       status: "live";
       target: FederationTargetGroup;
     }
+  | {
+      data: Result;
+      error: Error;
+      status: "stale";
+      target: FederationTargetGroup;
+    }
   | {
       error: Error;
       status: "error";
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
index 5819496d..75ac635a 100644
--- a/packages/decentralized-convex-tanstack-query/README.md
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -39,6 +39,7 @@ const messages = useQuery(
     query: pds.messages.list,
     args: { conversationId },
     options: {
+      revealPartialResultsAfter: 1_000,
       retry: 3,
       select: (data) =>
         mapPdsQueryData(data, (messages) =>
@@ -56,6 +57,13 @@ and successful states, so a successfully loaded `undefined` can never be
 confused with loading. The same data envelope includes federation status and
 per-source diagnostics, so applications do not need a second hook.
 
+Partial results are hidden for `500ms` by default so normally fast PDS
+responses appear together. `options.revealPartialResultsAfter` changes that
+delay; `0` reveals partial data immediately. A complete result is never delayed.
+After the initial result becomes complete, temporary disconnects retain each
+source's last known data. Newly discovered PDSs synchronize in the background
+without returning successful data to a loading or partial state.
+
 Connect the decentralized transport once when creating an account session:
 
 ```ts
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index d7e696d7..c8e49b1d 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -9,6 +9,7 @@ export type { FederatedTanStackQueryOptions } from "./options.ts";
 export { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
 export type {
   PdsMutationConfig,
+  PdsQueryBuilderOptions,
   PdsQueryConfig,
   PdsQueryKey,
   PdsQueryOptions,
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index c79b545f..136c378f 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -64,8 +64,10 @@ void test("produces native TanStack query and mutation options", async () => {
 
   const query = pdsQuery({
     args: { owner: "alice" },
+    options: { revealPartialResultsAfter: 0 },
     query: listNotes,
   });
+  assert.equal("revealPartialResultsAfter" in query, false);
   const initialObserver = new QueryObserver(new QueryClient(), query);
   assert.deepEqual(initialObserver.getCurrentResult().data, {
     federation: { sources: [], status: "pending" },
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
index f6afd64d..0e5be497 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -4,6 +4,7 @@ import type {
   DecentralizedConvexClient,
   DefaultCombinedPdsResult,
   PdsQueryData,
+  PdsQueryExecutionOptions,
   PdsRequest,
   PdsRequestResult,
 } from "@decentralized-convex/client";
@@ -98,11 +99,12 @@ export class PdsQueryClient {
 
   async query<Request extends AnyPdsQueryRequest>(
     request: Request,
+    options: PdsQueryExecutionOptions,
   ): Promise<
     PdsQueryData<DefaultCombinedPdsResult<Request>, PdsRequestResult<Request>>
   > {
     try {
-      const snapshot = await this.#client.pdsQuery(request);
+      const snapshot = await this.#client.pdsQuery(request, options);
       return pdsQueryDataFromSnapshot(snapshot);
     } catch (error) {
       return {
@@ -120,14 +122,14 @@ export class PdsQueryClient {
   }
 
   #startQuery(queryClient: QueryClient, query: Query) {
-    const request = pdsRequestFromMeta(query.meta);
-    if (request === undefined || this.#activeQueries.has(query.queryHash)) {
+    const config = pdsQueryConfigFromMeta(query.meta);
+    if (config === undefined || this.#activeQueries.has(query.queryHash)) {
       return;
     }
 
     const active: ActiveQuery = { cancelled: false };
     this.#activeQueries.set(query.queryHash, active);
-    const observer = this.#client.watchPdsQuery(request);
+    const observer = this.#client.watchPdsQuery(config.request, config.options);
     function publish() {
       const snapshot = observer.getSnapshot();
       queryClient.setQueryData(
@@ -174,16 +176,22 @@ export type PdsQueryOptions<
   PdsQueryKey<Request>
 >;
 
+export type PdsQueryBuilderOptions<
+  Request extends AnyPdsQueryRequest,
+  Data = QueryData<Request>,
+> = Omit<
+  PdsQueryOptions<Request, Data>,
+  "initialData" | "meta" | "queryFn" | "queryKey"
+> &
+  PdsQueryExecutionOptions;
+
 export interface PdsQueryConfig<
   Args,
   Request extends AnyPdsQueryRequest,
   Data = QueryData<Request>,
 > {
   readonly args: Args;
-  readonly options?: Omit<
-    PdsQueryOptions<Request, Data>,
-    "initialData" | "meta" | "queryFn" | "queryKey"
-  >;
+  readonly options?: PdsQueryBuilderOptions<Request, Data>;
   readonly query: (args: Args) => Request;
 }
 
@@ -202,6 +210,11 @@ function pdsQueryOptions<
   request: Request,
   options?: PdsQueryConfig<unknown, Request, Data>["options"],
 ): PdsQueryOptions<Request, Data> {
+  const { revealPartialResultsAfter, ...tanStackOptions } = options ?? {};
+  const executionOptions =
+    revealPartialResultsAfter === undefined
+      ? {}
+      : { revealPartialResultsAfter };
   const queryKey: PdsQueryKey<typeof request> = [
     "decentralized-convex",
     "pds",
@@ -214,12 +227,15 @@ function pdsQueryOptions<
   >();
   return {
     initialData,
-    meta: { [PDS_QUERY_META_KEY]: request },
-    queryFn: ({ client }) => connectedPdsClient(client).query(request),
+    meta: {
+      [PDS_QUERY_META_KEY]: { options: executionOptions, request },
+    },
+    queryFn: ({ client }) =>
+      connectedPdsClient(client).query(request, executionOptions),
     queryKey,
     staleTime: (query) =>
       query.state.data?.status === "loading" ? 0 : Infinity,
-    ...options,
+    ...tanStackOptions,
   };
 }
 
@@ -267,20 +283,36 @@ function connectedPdsClient(queryClient: QueryClient) {
   return client;
 }
 
-function pdsRequestFromMeta(meta: QueryMeta | undefined) {
-  const request = meta?.[PDS_QUERY_META_KEY];
+function pdsQueryConfigFromMeta(meta: QueryMeta | undefined) {
+  const config = meta?.[PDS_QUERY_META_KEY];
   if (
-    typeof request !== "object" ||
-    request === null ||
-    !("plugin" in request) ||
-    !("version" in request) ||
-    !("operation" in request)
+    !isRecord(config) ||
+    !("request" in config) ||
+    !isPdsQueryRequest(config.request) ||
+    !("options" in config) ||
+    !isRecord(config.options)
   ) {
     return undefined;
   }
   // Only pdsQuery writes this private metadata entry.
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return request as AnyPdsQueryRequest;
+  return config as {
+    options: PdsQueryExecutionOptions;
+    request: AnyPdsQueryRequest;
+  };
+}
+
+function isPdsQueryRequest(value: unknown): value is AnyPdsQueryRequest {
+  return (
+    isRecord(value) &&
+    "plugin" in value &&
+    "version" in value &&
+    "operation" in value
+  );
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
 }
 
 function toError(error: unknown) {

From c03821d5e78454e73a0e41f94de7377029e32116 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Tue, 18 Aug 2026 07:34:08 -0400
Subject: [PATCH 14/17] Add strict PDS query SSR support

---
 README.md                                     |  11 +-
 apps/web/src/features/pds/ssr-validation.ts   | 124 +++++++
 apps/web/src/routeTree.gen.ts                 |  81 +++--
 apps/web/src/routes/pds-ssr-validation.tsx    |  65 ++++
 .../decentralized-convex-client/src/client.ts |  45 ++-
 .../decentralized-convex-client/src/errors.ts |   9 +
 .../decentralized-convex-client/src/index.ts  |  14 +-
 .../src/query-data.ts                         |   5 +
 .../src/query-execution.ts                    |  46 +++
 .../src/routed-pds-observer.test.ts           | 119 +++++++
 .../src/routed-pds-observer.ts                |  37 ++
 .../README.md                                 |  32 ++
 .../src/index.ts                              |   7 +-
 .../src/pds-query-client.ts                   | 238 +++++++++++++
 .../src/pds-ssr.test.ts                       |  93 ++++++
 .../src/pds.test.ts                           |  70 +++-
 .../src/pds.ts                                | 315 ++++++------------
 17 files changed, 1042 insertions(+), 269 deletions(-)
 create mode 100644 apps/web/src/features/pds/ssr-validation.ts
 create mode 100644 apps/web/src/routes/pds-ssr-validation.tsx
 create mode 100644 packages/decentralized-convex-client/src/errors.ts
 create mode 100644 packages/decentralized-convex-client/src/query-execution.ts
 create mode 100644 packages/decentralized-convex-client/src/routed-pds-observer.test.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/src/pds-query-client.ts
 create mode 100644 packages/decentralized-convex-tanstack-query/src/pds-ssr.test.ts

diff --git a/README.md b/README.md
index 5a3efd35..ebc2f67b 100644
--- a/README.md
+++ b/README.md
@@ -54,8 +54,15 @@ import { useMutation, useQuery } from "@tanstack/react-query";
 import { pdsMutation, pdsQuery } from "@decentralized-convex/tanstack-query";
 import { pds } from "@vera/backend/pds";
 
-const messages = useQuery(pdsQuery(pds.messages.list, { conversationId }));
-const sendMessage = useMutation(pdsMutation(pds.messages.send));
+const messages = useQuery(
+  pdsQuery({
+    args: { conversationId },
+    query: pds.messages.list,
+  }),
+);
+const sendMessage = useMutation(
+  pdsMutation({ mutation: pds.messages.send }),
+);
 ```
 
 The backend's `pds` export derives its plugin names, versions, operations, and
diff --git a/apps/web/src/features/pds/ssr-validation.ts b/apps/web/src/features/pds/ssr-validation.ts
new file mode 100644
index 00000000..d7c8c8f9
--- /dev/null
+++ b/apps/web/src/features/pds/ssr-validation.ts
@@ -0,0 +1,124 @@
+import type {
+  DiscoveredPds,
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+} from "@decentralized-convex/client";
+import type { Message } from "@decentralized-convex/messages";
+import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import {
+  DecentralizedConvexClient,
+  pdsApiRequirements,
+} from "@decentralized-convex/client";
+import { pdsQuery, PdsQueryClient } from "@decentralized-convex/tanstack-query";
+import { pds } from "@vera/backend/pds";
+
+export type PdsSsrValidationMode = "error" | "success";
+
+const requirements = pdsApiRequirements(pds);
+
+export function pdsSsrValidationQuery(mode: PdsSsrValidationMode) {
+  return pdsQuery({
+    args: { conversationId: `ssr-validation-${mode}` },
+    options: { requireCompleteResults: true },
+    query: pds.messages.list,
+  });
+}
+
+export function createPdsSsrValidationClient(mode: PdsSsrValidationMode) {
+  const client = new DecentralizedConvexClient({
+    connectionFactory: (url) => new SsrValidationConnection(mode, url),
+    pds: {
+      discover: (domain) => Promise.resolve(validationPds(domain)),
+      home: validationPds("ssr-home.test"),
+    },
+  });
+  return { client, pdsQueryClient: new PdsQueryClient(client) };
+}
+
+class SsrValidationConnection implements FederationConnection {
+  readonly #mode;
+  readonly #url;
+
+  constructor(mode: PdsSsrValidationMode, url: string) {
+    this.#mode = mode;
+    this.#url = url;
+  }
+
+  close() {
+    return Promise.resolve();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(): Promise<
+    FunctionReturnType<Mutation>
+  > {
+    return Promise.reject(
+      new Error("The SSR validation connection is read-only"),
+    );
+  }
+
+  query<Query extends FederationQueryReference>(
+    _query: Query,
+    _args: FunctionArgs<Query>,
+  ): Promise<FunctionReturnType<Query>> {
+    if (this.#mode === "error" && this.#url === "https://ssr-remote.test") {
+      return new Promise(() => undefined);
+    }
+    return Promise.resolve(this.#result("SSR initial data"));
+  }
+
+  subscribe<Query extends FederationQueryReference>(
+    _query: Query,
+    _args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+  ) {
+    if (this.#mode === "error" && this.#url === "https://ssr-remote.test") {
+      return () => undefined;
+    }
+    onResult(this.#result("SSR initial data"));
+    const timer =
+      this.#url === "https://ssr-home.test"
+        ? setTimeout(() => onResult(this.#result("Hydrated live update")), 100)
+        : undefined;
+    return () => {
+      if (timer !== undefined) clearTimeout(timer);
+    };
+  }
+
+  #result(label: string) {
+    const domain = new URL(this.#url).hostname;
+    const result = {
+      routes: this.#url === "https://ssr-home.test" ? ["ssr-remote.test"] : [],
+      value: [validationMessage(`${label} from ${domain}`, domain)],
+    };
+    // This fixture implements the transport's single dispatcher query.
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+    return result as FunctionReturnType<FederationQueryReference>;
+  }
+}
+
+function validationMessage(body: string, domain: string): Message {
+  return {
+    authorId: `validator@${domain}`,
+    authorName: "SSR validator",
+    body,
+    conversationId: "ssr-validation",
+    messageId: `message-${domain}`,
+    sentAt: domain === "ssr-home.test" ? 1 : 2,
+  };
+}
+
+function validationPds(domain: string): DiscoveredPds {
+  return {
+    domain,
+    manifest: {
+      accountDomain: domain,
+      capabilities: requirements.capabilities,
+      deploymentUrl: `https://${domain}`,
+      httpUrl: `https://${domain}`,
+      lastChanged: requirements.lastChanged,
+      version: requirements.version,
+    },
+    manifestUrl: `https://${domain}/.well-known/pds.json`,
+  };
+}
diff --git a/apps/web/src/routeTree.gen.ts b/apps/web/src/routeTree.gen.ts
index dceedffd..22bf7eed 100644
--- a/apps/web/src/routeTree.gen.ts
+++ b/apps/web/src/routeTree.gen.ts
@@ -8,61 +8,80 @@
 // You should NOT make any changes in this file as it will be overwritten.
 // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.
 
-import { Route as rootRouteImport } from './routes/__root'
-import { Route as IndexRouteImport } from './routes/index'
+import type { createStart } from "@tanstack/react-start";
 
+import type { getRouter } from "./router.tsx";
+import { Route as rootRouteImport } from "./routes/__root";
+import { Route as IndexRouteImport } from "./routes/index";
+import { Route as PdsSsrValidationRouteImport } from "./routes/pds-ssr-validation";
+
+const PdsSsrValidationRoute = PdsSsrValidationRouteImport.update({
+  id: "/pds-ssr-validation",
+  path: "/pds-ssr-validation",
+  getParentRoute: () => rootRouteImport,
+} as any);
 const IndexRoute = IndexRouteImport.update({
-  id: '/',
-  path: '/',
+  id: "/",
+  path: "/",
   getParentRoute: () => rootRouteImport,
-} as any)
+} as any);
 
 export interface FileRoutesByFullPath {
-  '/': typeof IndexRoute
+  "/": typeof IndexRoute;
+  "/pds-ssr-validation": typeof PdsSsrValidationRoute;
 }
 export interface FileRoutesByTo {
-  '/': typeof IndexRoute
+  "/": typeof IndexRoute;
+  "/pds-ssr-validation": typeof PdsSsrValidationRoute;
 }
 export interface FileRoutesById {
-  __root__: typeof rootRouteImport
-  '/': typeof IndexRoute
+  __root__: typeof rootRouteImport;
+  "/": typeof IndexRoute;
+  "/pds-ssr-validation": typeof PdsSsrValidationRoute;
 }
 export interface FileRouteTypes {
-  fileRoutesByFullPath: FileRoutesByFullPath
-  fullPaths: '/'
-  fileRoutesByTo: FileRoutesByTo
-  to: '/'
-  id: '__root__' | '/'
-  fileRoutesById: FileRoutesById
+  fileRoutesByFullPath: FileRoutesByFullPath;
+  fullPaths: "/" | "/pds-ssr-validation";
+  fileRoutesByTo: FileRoutesByTo;
+  to: "/" | "/pds-ssr-validation";
+  id: "__root__" | "/" | "/pds-ssr-validation";
+  fileRoutesById: FileRoutesById;
 }
 export interface RootRouteChildren {
-  IndexRoute: typeof IndexRoute
+  IndexRoute: typeof IndexRoute;
+  PdsSsrValidationRoute: typeof PdsSsrValidationRoute;
 }
 
-declare module '@tanstack/react-router' {
+declare module "@tanstack/react-router" {
   interface FileRoutesByPath {
-    '/': {
-      id: '/'
-      path: '/'
-      fullPath: '/'
-      preLoaderRoute: typeof IndexRouteImport
-      parentRoute: typeof rootRouteImport
-    }
+    "/pds-ssr-validation": {
+      id: "/pds-ssr-validation";
+      path: "/pds-ssr-validation";
+      fullPath: "/pds-ssr-validation";
+      preLoaderRoute: typeof PdsSsrValidationRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
+    "/": {
+      id: "/";
+      path: "/";
+      fullPath: "/";
+      preLoaderRoute: typeof IndexRouteImport;
+      parentRoute: typeof rootRouteImport;
+    };
   }
 }
 
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
-}
+  PdsSsrValidationRoute: PdsSsrValidationRoute,
+};
 export const routeTree = rootRouteImport
   ._addFileChildren(rootRouteChildren)
-  ._addFileTypes<FileRouteTypes>()
+  ._addFileTypes<FileRouteTypes>();
 
-import type { getRouter } from './router.tsx'
-import type { createStart } from '@tanstack/react-start'
-declare module '@tanstack/react-start' {
+declare module "@tanstack/react-start" {
   interface Register {
-    ssr: true
-    router: Awaited<ReturnType<typeof getRouter>>
+    ssr: true;
+    router: Awaited<ReturnType<typeof getRouter>>;
   }
 }
diff --git a/apps/web/src/routes/pds-ssr-validation.tsx b/apps/web/src/routes/pds-ssr-validation.tsx
new file mode 100644
index 00000000..d58f9090
--- /dev/null
+++ b/apps/web/src/routes/pds-ssr-validation.tsx
@@ -0,0 +1,65 @@
+import { useEffect } from "react";
+import { useQueryClient, useSuspenseQuery } from "@tanstack/react-query";
+import { createFileRoute } from "@tanstack/react-router";
+
+import type { PdsSsrValidationMode } from "../features/pds/ssr-validation.ts";
+import {
+  createPdsSsrValidationClient,
+  pdsSsrValidationQuery,
+} from "../features/pds/ssr-validation.ts";
+
+export const Route = createFileRoute("/pds-ssr-validation")({
+  component: PdsSsrValidation,
+  errorComponent: PdsSsrValidationError,
+  validateSearch: (search): { mode: PdsSsrValidationMode } => ({
+    mode: search.mode === "error" ? "error" : "success",
+  }),
+  loaderDeps: ({ search }) => ({ mode: search.mode }),
+  loader: async ({ context, deps }) => {
+    const { client, pdsQueryClient } = createPdsSsrValidationClient(deps.mode);
+    const disconnect = pdsQueryClient.connect(context.queryClient);
+    try {
+      await context.queryClient.ensureQueryData(
+        pdsSsrValidationQuery(deps.mode),
+      );
+    } finally {
+      disconnect();
+      await client.close();
+    }
+  },
+});
+
+function PdsSsrValidation() {
+  const { mode } = Route.useSearch();
+  const queryClient = useQueryClient();
+  const query = useSuspenseQuery(pdsSsrValidationQuery(mode));
+
+  useEffect(() => {
+    const { client, pdsQueryClient } = createPdsSsrValidationClient(mode);
+    const disconnect = pdsQueryClient.connect(queryClient);
+    return () => {
+      disconnect();
+      void client.close();
+    };
+  }, [mode, queryClient]);
+
+  return (
+    <main data-pds-ssr-state={query.data.status}>
+      <h1>PDS SSR success</h1>
+      {query.data.result.map((message) => (
+        <p data-pds-message={message.messageId} key={message.messageId}>
+          {message.body}
+        </p>
+      ))}
+    </main>
+  );
+}
+
+function PdsSsrValidationError({ error }: { error: Error }) {
+  return (
+    <main data-pds-ssr-state="error">
+      <h1>PDS SSR error boundary</h1>
+      <p>{error.message}</p>
+    </main>
+  );
+}
diff --git a/packages/decentralized-convex-client/src/client.ts b/packages/decentralized-convex-client/src/client.ts
index 89cb0d13..605d94cf 100644
--- a/packages/decentralized-convex-client/src/client.ts
+++ b/packages/decentralized-convex-client/src/client.ts
@@ -9,6 +9,7 @@ import type {
   FederatedPdsQueryOptions,
   PdsRequestResult,
 } from "./pds.ts";
+import type { PdsQueryExecutionOptions } from "./query-execution.ts";
 import type {
   FederatedQueryOptions,
   FederationClientOptions,
@@ -22,16 +23,15 @@ import { createConvexFederationConnection } from "./connection.ts";
 import { FederatedQueryObserver } from "./observer.ts";
 import { FederatedPdsQueryObserver } from "./pds-observer.ts";
 import { PdsClient } from "./pds.ts";
+import {
+  initialResponseTimeout,
+  partialResultsDelay,
+  withInitialResponseTimeout,
+} from "./query-execution.ts";
 import { RoutedPdsQueryObserver } from "./routed-pds-observer.ts";
 import { createFederatedSnapshot } from "./snapshot.ts";
 import { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 
-export const DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER = 500;
-
-export interface PdsQueryExecutionOptions {
-  readonly revealPartialResultsAfter?: number;
-}
-
 export class DecentralizedConvexClient {
   readonly #connectionFactory;
   readonly #connections = new Map<string, FederationConnection>();
@@ -77,6 +77,7 @@ export class DecentralizedConvexClient {
     return new RoutedPdsQueryObserver({
       getConnection: (url) => this.#getConnection(url),
       home: pdsTarget(home.domain, home),
+      initialResponseTimeout: initialResponseTimeout(options),
       request,
       revealPartialResultsAfter: partialResultsDelay(options),
       resolveRoutes: (routes) => this.#resolveRoutes(routes, request),
@@ -150,15 +151,20 @@ export class DecentralizedConvexClient {
     options: PdsQueryExecutionOptions = {},
   ) {
     const startedAt = Date.now();
+    const responseTimeout = initialResponseTimeout(options);
     const revealPartialResultsAfter = partialResultsDelay(options);
     const home = this.#requireHome();
     assertPdsRequestCompatibility(home, request);
     const homeTarget = pdsTarget(home.domain, home);
     const homeGroup = groupFederationTargets([homeTarget])[0];
     if (homeGroup === undefined) throw new Error("PDS home is invalid");
-    const homeResult = await new PdsClient({
-      connection: this.#getConnection(homeTarget.url),
-    }).queryWithRouting(request);
+    const homeResult = await withInitialResponseTimeout(
+      new PdsClient({
+        connection: this.#getConnection(homeTarget.url),
+      }).queryWithRouting(request),
+      responseTimeout,
+      homeTarget.url,
+    );
     const targets = groupFederationTargets([
       homeTarget,
       ...(await this.#resolveRoutes(homeResult.routes, request)),
@@ -169,9 +175,13 @@ export class DecentralizedConvexClient {
           return { data: homeResult.data, status: "live" as const, target };
         }
         try {
-          const data = await new PdsClient({
-            connection: this.#getConnection(target.url),
-          }).query(request);
+          const data = await withInitialResponseTimeout(
+            new PdsClient({
+              connection: this.#getConnection(target.url),
+            }).query(request),
+            responseTimeout,
+            target.url,
+          );
           return { data, status: "live" as const, target };
         } catch (error) {
           return {
@@ -294,17 +304,6 @@ function toError(error: unknown) {
   return error instanceof Error ? error : new Error("Federation query failed");
 }
 
-function partialResultsDelay(options: PdsQueryExecutionOptions) {
-  const delay =
-    options.revealPartialResultsAfter ?? DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER;
-  if (!Number.isFinite(delay) || delay < 0) {
-    throw new RangeError(
-      "revealPartialResultsAfter must be a finite, non-negative number",
-    );
-  }
-  return delay;
-}
-
 function wait(delay: number) {
   return new Promise<void>((resolve) => setTimeout(resolve, delay));
 }
diff --git a/packages/decentralized-convex-client/src/errors.ts b/packages/decentralized-convex-client/src/errors.ts
new file mode 100644
index 00000000..40a24457
--- /dev/null
+++ b/packages/decentralized-convex-client/src/errors.ts
@@ -0,0 +1,9 @@
+export class PdsInitialResponseTimeoutError extends Error {
+  readonly targetUrl: string;
+
+  constructor(targetUrl: string) {
+    super(`PDS at ${targetUrl} did not return its initial result in time`);
+    this.name = "PdsInitialResponseTimeoutError";
+    this.targetUrl = targetUrl;
+  }
+}
diff --git a/packages/decentralized-convex-client/src/index.ts b/packages/decentralized-convex-client/src/index.ts
index 53413fc3..5790bb88 100644
--- a/packages/decentralized-convex-client/src/index.ts
+++ b/packages/decentralized-convex-client/src/index.ts
@@ -1,9 +1,11 @@
 export { decentralizedConvexPackage } from "../metadata.ts";
+export { DecentralizedConvexClient } from "./client.ts";
+export { PdsInitialResponseTimeoutError } from "./errors.ts";
 export {
-  DecentralizedConvexClient,
+  DEFAULT_INITIAL_RESPONSE_TIMEOUT,
   DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER,
-} from "./client.ts";
-export type { PdsQueryExecutionOptions } from "./client.ts";
+} from "./query-execution.ts";
+export type { PdsQueryExecutionOptions } from "./query-execution.ts";
 export {
   assertPdsCompatibility,
   assertPdsRequestCompatibility,
@@ -32,7 +34,11 @@ export {
 export { FederatedQueryObserver } from "./observer.ts";
 export { FederatedPdsQueryObserver } from "./pds-observer.ts";
 export { mapPdsQueryData, pdsQueryDataFromSnapshot } from "./query-data.ts";
-export type { PdsQueryData, PdsQueryFederation } from "./query-data.ts";
+export type {
+  PdsQueryData,
+  PdsQueryFederation,
+  SuccessfulPdsQueryData,
+} from "./query-data.ts";
 export { defaultCombine } from "./snapshot.ts";
 export { groupFederationTargets, normalizeFederationUrl } from "./targets.ts";
 export type {
diff --git a/packages/decentralized-convex-client/src/query-data.ts b/packages/decentralized-convex-client/src/query-data.ts
index 062fae87..6b890e35 100644
--- a/packages/decentralized-convex-client/src/query-data.ts
+++ b/packages/decentralized-convex-client/src/query-data.ts
@@ -30,6 +30,11 @@ export type PdsQueryData<Result, SourceResult = Result> =
       readonly status: "error";
     };
 
+export type SuccessfulPdsQueryData<Result, SourceResult = Result> = Extract<
+  PdsQueryData<Result, SourceResult>,
+  { readonly status: "success" }
+>;
+
 export function pdsQueryDataFromSnapshot<Result, SourceResult>(
   snapshot: FederatedQuerySnapshot<Result, SourceResult>,
 ): PdsQueryData<Result, SourceResult> {
diff --git a/packages/decentralized-convex-client/src/query-execution.ts b/packages/decentralized-convex-client/src/query-execution.ts
new file mode 100644
index 00000000..6f98f413
--- /dev/null
+++ b/packages/decentralized-convex-client/src/query-execution.ts
@@ -0,0 +1,46 @@
+import { PdsInitialResponseTimeoutError } from "./errors.ts";
+
+export const DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER = 500;
+export const DEFAULT_INITIAL_RESPONSE_TIMEOUT = 2_000;
+
+export interface PdsQueryExecutionOptions {
+  readonly initialResponseTimeout?: number;
+  readonly requireCompleteResults?: boolean;
+  readonly revealPartialResultsAfter?: number;
+}
+
+export function partialResultsDelay(options: PdsQueryExecutionOptions) {
+  const delay =
+    options.revealPartialResultsAfter ?? DEFAULT_REVEAL_PARTIAL_RESULTS_AFTER;
+  if (!Number.isFinite(delay) || delay < 0) {
+    throw new RangeError(
+      "revealPartialResultsAfter must be a finite, non-negative number",
+    );
+  }
+  return delay;
+}
+
+export function initialResponseTimeout(options: PdsQueryExecutionOptions) {
+  const timeout =
+    options.initialResponseTimeout ?? DEFAULT_INITIAL_RESPONSE_TIMEOUT;
+  if (!Number.isFinite(timeout) || timeout < 0) {
+    throw new RangeError(
+      "initialResponseTimeout must be a finite, non-negative number",
+    );
+  }
+  return timeout;
+}
+
+export function withInitialResponseTimeout<Result>(
+  promise: Promise<Result>,
+  timeout: number,
+  targetUrl: string,
+) {
+  return new Promise<Result>((resolve, reject) => {
+    const timer = setTimeout(
+      () => reject(new PdsInitialResponseTimeoutError(targetUrl)),
+      timeout,
+    );
+    void promise.then(resolve, reject).finally(() => clearTimeout(timer));
+  });
+}
diff --git a/packages/decentralized-convex-client/src/routed-pds-observer.test.ts b/packages/decentralized-convex-client/src/routed-pds-observer.test.ts
new file mode 100644
index 00000000..ceba93c7
--- /dev/null
+++ b/packages/decentralized-convex-client/src/routed-pds-observer.test.ts
@@ -0,0 +1,119 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type { FunctionArgs, FunctionReturnType } from "convex/server";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
+
+import type { PdsRequest } from "./pds.ts";
+import type {
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+} from "./types.ts";
+import { DecentralizedConvexClient } from "./client.ts";
+
+void test("times out an initial live source and recovers when it later responds", async () => {
+  const connections = new Map<string, ControlledConnection>();
+  const client = new DecentralizedConvexClient({
+    connectionFactory: (url) => {
+      const connection = new ControlledConnection();
+      connections.set(url, connection);
+      return connection;
+    },
+    pds: {
+      discover: (domain) => Promise.resolve(discoveredPds(domain)),
+      home: discoveredPds("a.test"),
+    },
+  });
+  const observer = client.watchPdsQuery(listNotesRequest, {
+    initialResponseTimeout: 20,
+    revealPartialResultsAfter: 0,
+  });
+
+  connections.get("https://a.test")?.emit([{ body: "a" }], ["b.test"]);
+  await wait(0);
+  await wait(25);
+  assert.equal(observer.getSnapshot().status, "partial");
+  assert.equal(
+    observer
+      .getSnapshot()
+      .sources.find((source) => source.target.url === "https://b.test")?.status,
+    "error",
+  );
+
+  connections.get("https://b.test")?.emit([{ body: "b" }]);
+  assert.equal(observer.getSnapshot().status, "success");
+  assert.deepEqual(observer.getSnapshot().data, [{ body: "a" }, { body: "b" }]);
+
+  observer.close();
+  await client.close();
+});
+
+const listNotesRequest = {
+  lastChanged: corePackage.lastChanged,
+  operation: { args: {}, type: "list" },
+  plugin: "notes",
+  version: DECENTRALIZED_CONVEX_VERSION,
+} satisfies PdsRequest<readonly { body: string }[], "query">;
+
+class ControlledConnection implements FederationConnection {
+  #publish?: (
+    value: readonly { body: string }[],
+    routes: readonly string[],
+  ) => void;
+
+  close() {
+    return Promise.resolve();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(): Promise<
+    FunctionReturnType<Mutation>
+  > {
+    return Promise.reject(new Error("Not implemented"));
+  }
+
+  query<Query extends FederationQueryReference>(): Promise<
+    FunctionReturnType<Query>
+  > {
+    return Promise.reject(new Error("Not implemented"));
+  }
+
+  subscribe<Query extends FederationQueryReference>(
+    _query: Query,
+    _args: FunctionArgs<Query>,
+    onResult: (result: FunctionReturnType<Query>) => void,
+  ) {
+    this.#publish = (value, routes) => {
+      const result = { routes, value };
+      // The controlled connection only receives the PDS root query in this test.
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      onResult(result as FunctionReturnType<Query>);
+    };
+    return () => {
+      this.#publish = undefined;
+    };
+  }
+
+  emit(value: readonly { body: string }[], routes: readonly string[] = []) {
+    this.#publish?.(value, routes);
+  }
+}
+
+function discoveredPds(domain: string) {
+  return {
+    domain,
+    manifest: {
+      accountDomain: domain,
+      capabilities: [{ id: "notes", lastChanged: corePackage.lastChanged }],
+      deploymentUrl: `https://${domain}`,
+      httpUrl: `https://${domain}`,
+      lastChanged: corePackage.lastChanged,
+      version: DECENTRALIZED_CONVEX_VERSION,
+    },
+    manifestUrl: `https://${domain}/.well-known/pds.json`,
+  };
+}
+
+function wait(delay: number) {
+  return new Promise<void>((resolve) => setTimeout(resolve, delay));
+}
diff --git a/packages/decentralized-convex-client/src/routed-pds-observer.ts b/packages/decentralized-convex-client/src/routed-pds-observer.ts
index 1f861b63..310900e5 100644
--- a/packages/decentralized-convex-client/src/routed-pds-observer.ts
+++ b/packages/decentralized-convex-client/src/routed-pds-observer.ts
@@ -9,6 +9,7 @@ import type {
   FederationSourceSnapshot,
   FederationTarget,
 } from "./types.ts";
+import { PdsInitialResponseTimeoutError } from "./errors.ts";
 import { PdsClient } from "./pds.ts";
 import { createFederatedSnapshot } from "./snapshot.ts";
 import { groupFederationTargets } from "./targets.ts";
@@ -19,6 +20,11 @@ export class RoutedPdsQueryObserver<
 > {
   readonly #getConnection;
   readonly #home;
+  readonly #initialResponseTimeout;
+  readonly #initialResponseTimers = new Map<
+    string,
+    ReturnType<typeof setTimeout>
+  >();
   readonly #listeners = new Set<() => void>();
   readonly #request;
   readonly #revealPartialResultsAfter;
@@ -39,6 +45,7 @@ export class RoutedPdsQueryObserver<
   constructor(options: {
     getConnection: (url: string) => PdsConnection;
     home: FederationTarget;
+    initialResponseTimeout: number;
     request: Request;
     revealPartialResultsAfter: number;
     resolveRoutes: (
@@ -50,6 +57,7 @@ export class RoutedPdsQueryObserver<
       ids: [options.home.id],
       url: options.home.url,
     };
+    this.#initialResponseTimeout = options.initialResponseTimeout;
     this.#request = options.request;
     this.#revealPartialResultsAfter = options.revealPartialResultsAfter;
     this.#resolveRoutes = options.resolveRoutes;
@@ -58,6 +66,7 @@ export class RoutedPdsQueryObserver<
       target: this.#home,
     });
     this.#snapshot = createFederatedSnapshot([...this.#sources.values()]);
+    this.#startInitialResponseTimer(this.#home.url);
     this.#watchHome();
   }
 
@@ -75,6 +84,10 @@ export class RoutedPdsQueryObserver<
     if (this.#partialResultsTimer !== undefined) {
       clearTimeout(this.#partialResultsTimer);
     }
+    for (const timer of this.#initialResponseTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.#initialResponseTimers.clear();
     for (const unsubscribe of this.#unsubscribes.values()) unsubscribe();
     this.#unsubscribes.clear();
     this.#listeners.clear();
@@ -118,6 +131,7 @@ export class RoutedPdsQueryObserver<
       if (url === this.#home.url || desiredUrls.has(url)) continue;
       this.#unsubscribes.get(url)?.();
       this.#unsubscribes.delete(url);
+      this.#clearInitialResponseTimer(url);
       this.#sources.delete(url);
     }
   }
@@ -134,6 +148,7 @@ export class RoutedPdsQueryObserver<
     );
     for (const target of added) {
       this.#sources.set(target.url, { status: "pending", target });
+      this.#startInitialResponseTimer(target.url);
     }
     for (const target of added) {
       const client = new PdsClient({
@@ -159,6 +174,7 @@ export class RoutedPdsQueryObserver<
     if (this.#closed) return;
     const source = this.#sources.get(url);
     if (source === undefined) return;
+    this.#clearInitialResponseTimer(url);
     this.#sources.set(
       url,
       update.status === "error" &&
@@ -214,4 +230,25 @@ export class RoutedPdsQueryObserver<
     clearTimeout(this.#partialResultsTimer);
     this.#partialResultsTimer = undefined;
   }
+
+  #startInitialResponseTimer(url: string) {
+    this.#initialResponseTimers.set(
+      url,
+      setTimeout(
+        () =>
+          this.#update(url, {
+            error: new PdsInitialResponseTimeoutError(url),
+            status: "error",
+          }),
+        this.#initialResponseTimeout,
+      ),
+    );
+  }
+
+  #clearInitialResponseTimer(url: string) {
+    const timer = this.#initialResponseTimers.get(url);
+    if (timer === undefined) return;
+    clearTimeout(timer);
+    this.#initialResponseTimers.delete(url);
+  }
 }
diff --git a/packages/decentralized-convex-tanstack-query/README.md b/packages/decentralized-convex-tanstack-query/README.md
index 75ac635a..c741fced 100644
--- a/packages/decentralized-convex-tanstack-query/README.md
+++ b/packages/decentralized-convex-tanstack-query/README.md
@@ -64,6 +64,38 @@ After the initial result becomes complete, temporary disconnects retain each
 source's last known data. Newly discovered PDSs synchronize in the background
 without returning successful data to a loading or partial state.
 
+For SSR routes that must not render until every initial PDS has responded, use
+the same strict options object in the route loader and component:
+
+```ts
+function messagesQuery(conversationId: string) {
+  return pdsQuery({
+    args: { conversationId },
+    options: { requireCompleteResults: true },
+    query: pds.messages.list,
+  });
+}
+
+export const Route = createFileRoute("/messages/$conversationId")({
+  loader: ({ context, params }) =>
+    context.queryClient.ensureQueryData(messagesQuery(params.conversationId)),
+  component: Messages,
+});
+
+function Messages() {
+  const { conversationId } = Route.useParams();
+  const messages = useSuspenseQuery(messagesQuery(conversationId));
+  messages.data.status; // "success"
+  messages.data.result; // Message[]
+}
+```
+
+Strict queries reject into the route error boundary if an initial PDS fails or
+does not respond within `2_000ms`. `options.initialResponseTimeout` changes
+that timeout. Once complete data is rendered, live subscriptions retain the
+last known source data through temporary disconnects and synchronize newly
+discovered PDSs in the background.
+
 Connect the decentralized transport once when creating an account session:
 
 ```ts
diff --git a/packages/decentralized-convex-tanstack-query/src/index.ts b/packages/decentralized-convex-tanstack-query/src/index.ts
index c8e49b1d..6f97d38a 100644
--- a/packages/decentralized-convex-tanstack-query/src/index.ts
+++ b/packages/decentralized-convex-tanstack-query/src/index.ts
@@ -1,13 +1,18 @@
 export { decentralizedConvexPackage } from "../metadata.ts";
 export { mapPdsQueryData } from "@decentralized-convex/client";
 export type {
+  SuccessfulPdsQueryData,
   PdsQueryData,
   PdsQueryFederation,
 } from "@decentralized-convex/client";
 export { federatedQueryOptions } from "./options.ts";
 export type { FederatedTanStackQueryOptions } from "./options.ts";
-export { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
+export { IncompletePdsQueryError, PdsQueryClient } from "./pds-query-client.ts";
+export { pdsMutation, pdsQuery } from "./pds.ts";
 export type {
+  CompletePdsQueryBuilderOptions,
+  CompletePdsQueryConfig,
+  CompletePdsQueryOptions,
   PdsMutationConfig,
   PdsQueryBuilderOptions,
   PdsQueryConfig,
diff --git a/packages/decentralized-convex-tanstack-query/src/pds-query-client.ts b/packages/decentralized-convex-tanstack-query/src/pds-query-client.ts
new file mode 100644
index 00000000..9d362608
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/pds-query-client.ts
@@ -0,0 +1,238 @@
+import type {
+  AnyPdsMutationRequest,
+  AnyPdsQueryRequest,
+  DecentralizedConvexClient,
+  DefaultCombinedPdsResult,
+  PdsQueryData,
+  PdsQueryExecutionOptions,
+  PdsRequestResult,
+  SuccessfulPdsQueryData,
+} from "@decentralized-convex/client";
+import type { Query, QueryClient, QueryMeta } from "@tanstack/react-query";
+import { pdsQueryDataFromSnapshot } from "@decentralized-convex/client";
+
+export const PDS_QUERY_META_KEY = "decentralizedConvexPdsQuery";
+const connectedClients = new WeakMap<QueryClient, PdsQueryClient>();
+
+export class IncompletePdsQueryError extends Error {
+  readonly data: PdsQueryData<unknown, unknown>;
+
+  constructor(data: PdsQueryData<unknown, unknown>) {
+    super(incompleteQueryMessage(data));
+    this.name = "IncompletePdsQueryError";
+    this.data = data;
+  }
+}
+
+interface ActiveQuery {
+  close?: () => void;
+}
+
+/** Bridges decentralized Convex transport into an application-owned QueryClient. */
+export class PdsQueryClient {
+  readonly #activeQueries = new Map<string, ActiveQuery>();
+  readonly #client;
+  readonly #connections = new Map<QueryClient, () => void>();
+
+  constructor(client: DecentralizedConvexClient) {
+    this.#client = client;
+  }
+
+  connect(queryClient: QueryClient) {
+    const connected = connectedClients.get(queryClient);
+    if (connected !== undefined && connected !== this) {
+      throw new Error(
+        "This TanStack QueryClient is already connected to another PdsQueryClient",
+      );
+    }
+    if (this.#connections.has(queryClient)) return () => undefined;
+    if (this.#connections.size > 0) {
+      throw new Error(
+        "A PdsQueryClient can connect to only one TanStack QueryClient",
+      );
+    }
+
+    connectedClients.set(queryClient, this);
+    const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
+      if (
+        (event.type === "observerAdded" ||
+          event.type === "observerOptionsUpdated") &&
+        event.query.isActive()
+      ) {
+        // TanStack's cache event intentionally erases each query's generics.
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        this.#startQuery(queryClient, event.query);
+      }
+      if (
+        ((event.type === "observerRemoved" ||
+          event.type === "observerOptionsUpdated") &&
+          !event.query.isActive()) ||
+        event.type === "removed"
+      ) {
+        this.#stopQuery(event.query.queryHash);
+      }
+    });
+    this.#connections.set(queryClient, unsubscribe);
+
+    for (const query of queryClient.getQueryCache().getAll()) {
+      if (query.isActive()) this.#startQuery(queryClient, query);
+    }
+
+    return () => this.disconnect(queryClient);
+  }
+
+  disconnect(queryClient: QueryClient) {
+    const unsubscribe = this.#connections.get(queryClient);
+    if (unsubscribe === undefined) return;
+    unsubscribe();
+    this.#connections.delete(queryClient);
+    if (connectedClients.get(queryClient) === this) {
+      connectedClients.delete(queryClient);
+    }
+    if (this.#connections.size === 0) {
+      for (const queryHash of this.#activeQueries.keys()) {
+        this.#stopQuery(queryHash);
+      }
+    }
+  }
+
+  async query<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    options: PdsQueryExecutionOptions,
+  ): Promise<
+    PdsQueryData<DefaultCombinedPdsResult<Request>, PdsRequestResult<Request>>
+  > {
+    try {
+      const snapshot = await this.#client.pdsQuery(request, options);
+      return pdsQueryDataFromSnapshot(snapshot);
+    } catch (error) {
+      return {
+        error: toError(error),
+        federation: { sources: [], status: "error" },
+        status: "error",
+      };
+    }
+  }
+
+  async queryComplete<Request extends AnyPdsQueryRequest>(
+    request: Request,
+    options: PdsQueryExecutionOptions,
+  ): Promise<
+    SuccessfulPdsQueryData<
+      DefaultCombinedPdsResult<Request>,
+      PdsRequestResult<Request>
+    >
+  > {
+    let data: PdsQueryData<
+      DefaultCombinedPdsResult<Request>,
+      PdsRequestResult<Request>
+    >;
+    try {
+      data = pdsQueryDataFromSnapshot(
+        await this.#client.pdsQuery(request, options),
+      );
+    } catch (error) {
+      data = {
+        error: toError(error),
+        federation: { sources: [], status: "error" },
+        status: "error",
+      };
+    }
+    if (data.status !== "success") throw new IncompletePdsQueryError(data);
+    return data;
+  }
+
+  async mutate<Request extends AnyPdsMutationRequest>(
+    request: Request,
+  ): Promise<PdsRequestResult<Request>> {
+    return this.#client.pdsMutation(request);
+  }
+
+  #startQuery(queryClient: QueryClient, query: Query) {
+    const config = pdsQueryConfigFromMeta(query.meta);
+    if (config === undefined || this.#activeQueries.has(query.queryHash))
+      return;
+
+    const active: ActiveQuery = {};
+    this.#activeQueries.set(query.queryHash, active);
+    const observer = this.#client.watchPdsQuery(config.request, config.options);
+    const requireCompleteResults = config.options.requireCompleteResults;
+    function publish() {
+      const snapshot = observer.getSnapshot();
+      if (requireCompleteResults && snapshot.status !== "success") return;
+      queryClient.setQueryData(
+        query.queryKey,
+        pdsQueryDataFromSnapshot(snapshot),
+      );
+    }
+    const unsubscribe = observer.subscribe(publish);
+    active.close = () => {
+      unsubscribe();
+      observer.close();
+    };
+    publish();
+  }
+
+  #stopQuery(queryHash: string) {
+    const active = this.#activeQueries.get(queryHash);
+    if (active === undefined) return;
+    active.close?.();
+    this.#activeQueries.delete(queryHash);
+  }
+}
+
+export function connectedPdsClient(queryClient: QueryClient) {
+  const client = connectedClients.get(queryClient);
+  if (client === undefined) {
+    throw new Error(
+      "Connect a PdsQueryClient to this TanStack QueryClient before using PDS options",
+    );
+  }
+  return client;
+}
+
+function pdsQueryConfigFromMeta(meta: QueryMeta | undefined) {
+  const config = meta?.[PDS_QUERY_META_KEY];
+  if (
+    !isRecord(config) ||
+    !("request" in config) ||
+    !isPdsQueryRequest(config.request) ||
+    !("options" in config) ||
+    !isRecord(config.options)
+  ) {
+    return undefined;
+  }
+  // Only pdsQuery writes this private metadata entry.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return config as {
+    options: PdsQueryExecutionOptions;
+    request: AnyPdsQueryRequest;
+  };
+}
+
+function isPdsQueryRequest(value: unknown): value is AnyPdsQueryRequest {
+  return (
+    isRecord(value) &&
+    "plugin" in value &&
+    "version" in value &&
+    "operation" in value
+  );
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function toError(error: unknown) {
+  return error instanceof Error ? error : new Error(String(error));
+}
+
+function incompleteQueryMessage(data: PdsQueryData<unknown, unknown>) {
+  if (data.status === "error") return data.error.message;
+  const errors = data.federation.sources.flatMap((source) =>
+    source.status === "error" ? [source.error.message] : [],
+  );
+  return errors.length === 0
+    ? "The initial PDS query did not return complete results"
+    : `The initial PDS query was incomplete: ${errors.join("; ")}`;
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/pds-ssr.test.ts b/packages/decentralized-convex-tanstack-query/src/pds-ssr.test.ts
new file mode 100644
index 00000000..d9c7f346
--- /dev/null
+++ b/packages/decentralized-convex-tanstack-query/src/pds-ssr.test.ts
@@ -0,0 +1,93 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import type {
+  FederationConnection,
+  FederationMutationReference,
+  FederationQueryReference,
+  PdsRequest,
+} from "@decentralized-convex/client";
+import type { FunctionReturnType } from "convex/server";
+import { QueryClient } from "@tanstack/react-query";
+import { DecentralizedConvexClient } from "@decentralized-convex/client";
+import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
+import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
+
+import { IncompletePdsQueryError, PdsQueryClient } from "./pds-query-client.ts";
+import { pdsQuery } from "./pds.ts";
+
+void test("strict queries reject when an initial PDS times out", async () => {
+  const transport = new DecentralizedConvexClient({
+    connectionFactory: () => new HangingConnection(),
+    pds: { home: discoveredPds("a.test") },
+  });
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  const adapter = new PdsQueryClient(transport);
+  const disconnect = adapter.connect(queryClient);
+
+  await assert.rejects(
+    queryClient.ensureQueryData(
+      pdsQuery({
+        args: { owner: "alice" },
+        options: {
+          initialResponseTimeout: 20,
+          requireCompleteResults: true,
+        },
+        query: listNotes,
+      }),
+    ),
+    (error: unknown) =>
+      error instanceof IncompletePdsQueryError &&
+      error.message.includes("did not return its initial result in time"),
+  );
+
+  disconnect();
+  await transport.close();
+});
+
+function listNotes(args: { owner: string }) {
+  return {
+    lastChanged: corePackage.lastChanged,
+    operation: { args, type: "list" },
+    plugin: "notes",
+    version: DECENTRALIZED_CONVEX_VERSION,
+  } satisfies PdsRequest<readonly { body: string; id: string }[], "query">;
+}
+
+class HangingConnection implements FederationConnection {
+  close() {
+    return Promise.resolve();
+  }
+
+  mutation<Mutation extends FederationMutationReference>(): Promise<
+    FunctionReturnType<Mutation>
+  > {
+    return Promise.reject(new Error("Not implemented"));
+  }
+
+  query<Query extends FederationQueryReference>(): Promise<
+    FunctionReturnType<Query>
+  > {
+    return new Promise(() => undefined);
+  }
+
+  subscribe() {
+    return () => undefined;
+  }
+}
+
+function discoveredPds(domain: string) {
+  return {
+    domain,
+    manifest: {
+      accountDomain: domain,
+      capabilities: [{ id: "notes", lastChanged: corePackage.lastChanged }],
+      deploymentUrl: `https://${domain}`,
+      httpUrl: `https://${domain}`,
+      lastChanged: corePackage.lastChanged,
+      version: DECENTRALIZED_CONVEX_VERSION,
+    },
+    manifestUrl: `https://${domain}/.well-known/pds.json`,
+  };
+}
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.test.ts b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
index 136c378f..287765f2 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.test.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.test.ts
@@ -13,12 +13,14 @@ import {
   QueryClient,
   QueryObserver,
   useQuery,
+  useSuspenseQuery,
 } from "@tanstack/react-query";
 import { DecentralizedConvexClient } from "@decentralized-convex/client";
 import { DECENTRALIZED_CONVEX_VERSION } from "@decentralized-convex/core";
 import { decentralizedConvexPackage as corePackage } from "@decentralized-convex/core/metadata";
 
-import { pdsMutation, pdsQuery, PdsQueryClient } from "./pds.ts";
+import { PdsQueryClient } from "./pds-query-client.ts";
+import { pdsMutation, pdsQuery } from "./pds.ts";
 
 interface Note {
   body: string;
@@ -116,6 +118,57 @@ void test("produces native TanStack query and mutation options", async () => {
   await transport.close();
 });
 
+void test("strict queries resolve only with complete initial data", async () => {
+  const connections = new Map<string, MemoryConnection>();
+  const transport = new DecentralizedConvexClient({
+    connectionFactory: (url) => {
+      const connection = new MemoryConnection(url);
+      connections.set(url, connection);
+      return connection;
+    },
+    pds: {
+      discover: (domain) => Promise.resolve(discoveredPds(domain)),
+      home: discoveredPds("a.test"),
+    },
+  });
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  const adapter = new PdsQueryClient(transport);
+  const disconnect = adapter.connect(queryClient);
+  const query = pdsQuery({
+    args: { owner: "alice" },
+    options: { requireCompleteResults: true },
+    query: listNotes,
+  });
+
+  assert.equal("initialData" in query, false);
+  const result = await queryClient.ensureQueryData(query);
+  assert.equal(result.status, "success");
+  assert.deepEqual(result.result, [
+    { body: "https://a.test", id: "alice" },
+    { body: "https://b.test", id: "alice" },
+  ]);
+
+  const observer = new QueryObserver(queryClient, query);
+  const unsubscribe = observer.subscribe(() => undefined);
+  assert.equal(observer.getCurrentResult().data?.status, "success");
+  await nextTask();
+  connections.get("https://a.test")?.emit("Hydrated live update");
+  await nextTask();
+  const updated = observer.getCurrentResult().data;
+  assert.ok(updated);
+  assert.equal(updated.status, "success");
+  assert.deepEqual(updated.result, [
+    { body: "Hydrated live update", id: "alice" },
+    { body: "https://b.test", id: "alice" },
+  ]);
+
+  unsubscribe();
+  disconnect();
+  await transport.close();
+});
+
 function usePdsQueryTypeTest() {
   const query = useQuery(
     pdsQuery({
@@ -135,6 +188,21 @@ function usePdsQueryTypeTest() {
 
 void usePdsQueryTypeTest;
 
+function useCompletePdsQueryTypeTest() {
+  const query = useSuspenseQuery(
+    pdsQuery({
+      args: { owner: "alice" },
+      options: { requireCompleteResults: true },
+      query: listNotes,
+    }),
+  );
+  const status: "success" = query.data.status;
+  const notes: Note[] = query.data.result;
+  return { notes, status };
+}
+
+void useCompletePdsQueryTypeTest;
+
 class MemoryConnection implements FederationConnection {
   readonly #publishers = new Set<(body: string) => void>();
   readonly #url;
diff --git a/packages/decentralized-convex-tanstack-query/src/pds.ts b/packages/decentralized-convex-tanstack-query/src/pds.ts
index 0e5be497..73a7a186 100644
--- a/packages/decentralized-convex-tanstack-query/src/pds.ts
+++ b/packages/decentralized-convex-tanstack-query/src/pds.ts
@@ -1,158 +1,23 @@
 import type {
   AnyPdsMutationRequest,
   AnyPdsQueryRequest,
-  DecentralizedConvexClient,
   DefaultCombinedPdsResult,
   PdsQueryData,
   PdsQueryExecutionOptions,
   PdsRequest,
   PdsRequestResult,
+  SuccessfulPdsQueryData,
 } from "@decentralized-convex/client";
 import type {
   DefinedInitialDataOptions,
   Query,
   QueryClient,
-  QueryMeta,
   UseMutationOptions,
+  UseSuspenseQueryOptions,
 } from "@tanstack/react-query";
 import { mutationOptions } from "@tanstack/react-query";
-import { pdsQueryDataFromSnapshot } from "@decentralized-convex/client";
 
-const PDS_QUERY_META_KEY = "decentralizedConvexPdsQuery";
-const connectedClients = new WeakMap<QueryClient, PdsQueryClient>();
-
-interface ActiveQuery {
-  cancelled: boolean;
-  close?: () => void;
-}
-
-/**
- * Connects decentralized Convex transport to an application-owned TanStack
- * QueryClient. Application queries still use TanStack's own hooks.
- */
-export class PdsQueryClient {
-  readonly #activeQueries = new Map<string, ActiveQuery>();
-  readonly #client;
-  readonly #connections = new Map<QueryClient, () => void>();
-
-  constructor(client: DecentralizedConvexClient) {
-    this.#client = client;
-  }
-
-  connect(queryClient: QueryClient) {
-    const connected = connectedClients.get(queryClient);
-    if (connected !== undefined && connected !== this) {
-      throw new Error(
-        "This TanStack QueryClient is already connected to another PdsQueryClient",
-      );
-    }
-    if (this.#connections.has(queryClient)) return () => undefined;
-    if (this.#connections.size > 0) {
-      throw new Error(
-        "A PdsQueryClient can connect to only one TanStack QueryClient",
-      );
-    }
-
-    connectedClients.set(queryClient, this);
-    const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
-      if (
-        (event.type === "observerAdded" ||
-          event.type === "observerOptionsUpdated") &&
-        event.query.isActive()
-      ) {
-        // TanStack's cache event intentionally erases each query's generics.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        this.#startQuery(queryClient, event.query);
-      }
-      if (
-        ((event.type === "observerRemoved" ||
-          event.type === "observerOptionsUpdated") &&
-          !event.query.isActive()) ||
-        event.type === "removed"
-      ) {
-        this.#stopQuery(event.query.queryHash);
-      }
-    });
-    this.#connections.set(queryClient, unsubscribe);
-
-    for (const query of queryClient.getQueryCache().getAll()) {
-      if (query.isActive()) this.#startQuery(queryClient, query);
-    }
-
-    return () => this.disconnect(queryClient);
-  }
-
-  disconnect(queryClient: QueryClient) {
-    const unsubscribe = this.#connections.get(queryClient);
-    if (unsubscribe === undefined) return;
-    unsubscribe();
-    this.#connections.delete(queryClient);
-    if (connectedClients.get(queryClient) === this) {
-      connectedClients.delete(queryClient);
-    }
-    if (this.#connections.size === 0) {
-      for (const queryHash of this.#activeQueries.keys()) {
-        this.#stopQuery(queryHash);
-      }
-    }
-  }
-
-  async query<Request extends AnyPdsQueryRequest>(
-    request: Request,
-    options: PdsQueryExecutionOptions,
-  ): Promise<
-    PdsQueryData<DefaultCombinedPdsResult<Request>, PdsRequestResult<Request>>
-  > {
-    try {
-      const snapshot = await this.#client.pdsQuery(request, options);
-      return pdsQueryDataFromSnapshot(snapshot);
-    } catch (error) {
-      return {
-        error: toError(error),
-        federation: { sources: [], status: "error" },
-        status: "error",
-      };
-    }
-  }
-
-  async mutate<Request extends AnyPdsMutationRequest>(
-    request: Request,
-  ): Promise<PdsRequestResult<Request>> {
-    return this.#client.pdsMutation(request);
-  }
-
-  #startQuery(queryClient: QueryClient, query: Query) {
-    const config = pdsQueryConfigFromMeta(query.meta);
-    if (config === undefined || this.#activeQueries.has(query.queryHash)) {
-      return;
-    }
-
-    const active: ActiveQuery = { cancelled: false };
-    this.#activeQueries.set(query.queryHash, active);
-    const observer = this.#client.watchPdsQuery(config.request, config.options);
-    function publish() {
-      const snapshot = observer.getSnapshot();
-      queryClient.setQueryData(
-        query.queryKey,
-        pdsQueryDataFromSnapshot(snapshot),
-      );
-    }
-    const unsubscribe = observer.subscribe(publish);
-    active.close = () => {
-      unsubscribe();
-      observer.close();
-    };
-    publish();
-  }
-
-  #stopQuery(queryHash: string) {
-    const active = this.#activeQueries.get(queryHash);
-    if (active === undefined) return;
-    active.cancelled = true;
-    active.close?.();
-    this.#activeQueries.delete(queryHash);
-  }
-}
+import { connectedPdsClient, PDS_QUERY_META_KEY } from "./pds-query-client.ts";
 
 export type PdsQueryKey<Request extends AnyPdsQueryRequest> = readonly [
   "decentralized-convex",
@@ -166,6 +31,12 @@ type QueryData<Request extends AnyPdsQueryRequest> = PdsQueryData<
   PdsRequestResult<Request>
 >;
 
+type CompleteQueryData<Request extends AnyPdsQueryRequest> =
+  SuccessfulPdsQueryData<
+    DefaultCombinedPdsResult<Request>,
+    PdsRequestResult<Request>
+  >;
+
 export type PdsQueryOptions<
   Request extends AnyPdsQueryRequest,
   Data = QueryData<Request>,
@@ -183,7 +54,30 @@ export type PdsQueryBuilderOptions<
   PdsQueryOptions<Request, Data>,
   "initialData" | "meta" | "queryFn" | "queryKey"
 > &
-  PdsQueryExecutionOptions;
+  Omit<PdsQueryExecutionOptions, "requireCompleteResults"> & {
+    readonly requireCompleteResults?: false;
+  };
+
+export type CompletePdsQueryOptions<
+  Request extends AnyPdsQueryRequest,
+  Data = CompleteQueryData<Request>,
+> = UseSuspenseQueryOptions<
+  CompleteQueryData<Request>,
+  Error,
+  Data,
+  PdsQueryKey<Request>
+>;
+
+export type CompletePdsQueryBuilderOptions<
+  Request extends AnyPdsQueryRequest,
+  Data = CompleteQueryData<Request>,
+> = Omit<
+  CompletePdsQueryOptions<Request, Data>,
+  "initialData" | "meta" | "queryFn" | "queryKey"
+> &
+  Omit<PdsQueryExecutionOptions, "requireCompleteResults"> & {
+    readonly requireCompleteResults: true;
+  };
 
 export interface PdsQueryConfig<
   Args,
@@ -195,48 +89,101 @@ export interface PdsQueryConfig<
   readonly query: (args: Args) => Request;
 }
 
+export interface CompletePdsQueryConfig<
+  Args,
+  Request extends AnyPdsQueryRequest,
+  Data = CompleteQueryData<Request>,
+> {
+  readonly args: Args;
+  readonly options: CompletePdsQueryBuilderOptions<Request, Data>;
+  readonly query: (args: Args) => Request;
+}
+
+export function pdsQuery<
+  Args,
+  Request extends PdsRequest<unknown, "query">,
+  Data = CompleteQueryData<Request>,
+>(
+  config: CompletePdsQueryConfig<Args, Request, Data>,
+): CompletePdsQueryOptions<Request, Data>;
 export function pdsQuery<
   Args,
   Request extends PdsRequest<unknown, "query">,
   Data = QueryData<Request>,
->({ args, options, query }: PdsQueryConfig<Args, Request, Data>) {
-  return pdsQueryOptions(query(args), options);
+>(config: PdsQueryConfig<Args, Request, Data>): PdsQueryOptions<Request, Data>;
+export function pdsQuery<
+  Args,
+  Request extends PdsRequest<unknown, "query">,
+  Data,
+>({
+  args,
+  options,
+  query,
+}:
+  | CompletePdsQueryConfig<Args, Request, Data>
+  | PdsQueryConfig<Args, Request, Data>):
+  | CompletePdsQueryOptions<Request, Data>
+  | PdsQueryOptions<Request, Data> {
+  // The overloads preserve whether the literal strict flag was supplied.
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  return pdsQueryOptions(query(args), options) as
+    | CompletePdsQueryOptions<Request, Data>
+    | PdsQueryOptions<Request, Data>;
 }
 
-function pdsQueryOptions<
-  Request extends AnyPdsQueryRequest,
-  Data = QueryData<Request>,
->(
+function pdsQueryOptions<Request extends AnyPdsQueryRequest>(
   request: Request,
-  options?: PdsQueryConfig<unknown, Request, Data>["options"],
-): PdsQueryOptions<Request, Data> {
-  const { revealPartialResultsAfter, ...tanStackOptions } = options ?? {};
-  const executionOptions =
-    revealPartialResultsAfter === undefined
+  options?:
+    | CompletePdsQueryBuilderOptions<Request, unknown>
+    | PdsQueryBuilderOptions<Request, unknown>,
+) {
+  const {
+    initialResponseTimeout,
+    requireCompleteResults,
+    revealPartialResultsAfter,
+    ...tanStackOptions
+  } = options ?? {};
+  const executionOptions: PdsQueryExecutionOptions = {
+    ...(initialResponseTimeout === undefined ? {} : { initialResponseTimeout }),
+    ...(requireCompleteResults === undefined ? {} : { requireCompleteResults }),
+    ...(revealPartialResultsAfter === undefined
       ? {}
-      : { revealPartialResultsAfter };
+      : { revealPartialResultsAfter }),
+  };
   const queryKey: PdsQueryKey<typeof request> = [
     "decentralized-convex",
     "pds",
     "query",
     request,
   ];
-  const initialData = loadingPdsQueryData<
-    DefaultCombinedPdsResult<Request>,
-    PdsRequestResult<Request>
-  >();
-  return {
-    initialData,
+  const sharedOptions = {
     meta: {
       [PDS_QUERY_META_KEY]: { options: executionOptions, request },
     },
-    queryFn: ({ client }) =>
-      connectedPdsClient(client).query(request, executionOptions),
     queryKey,
-    staleTime: (query) =>
-      query.state.data?.status === "loading" ? 0 : Infinity,
     ...tanStackOptions,
   };
+  if (requireCompleteResults) {
+    return {
+      ...sharedOptions,
+      queryFn: ({ client }: { client: QueryClient }) =>
+        connectedPdsClient(client).queryComplete(request, executionOptions),
+      staleTime: tanStackOptions.staleTime ?? Infinity,
+    };
+  }
+  return {
+    ...sharedOptions,
+    initialData: loadingPdsQueryData<
+      DefaultCombinedPdsResult<Request>,
+      PdsRequestResult<Request>
+    >(),
+    queryFn: ({ client }: { client: QueryClient }) =>
+      connectedPdsClient(client).query(request, executionOptions),
+    staleTime:
+      tanStackOptions.staleTime ??
+      ((query: Query<unknown, Error, QueryData<Request>>) =>
+        query.state.data?.status === "loading" ? 0 : Infinity),
+  };
 }
 
 function loadingPdsQueryData<Result, SourceResult>(): PdsQueryData<
@@ -272,49 +219,3 @@ export function pdsMutation<
       connectedPdsClient(client).mutate(mutation(args)),
   });
 }
-
-function connectedPdsClient(queryClient: QueryClient) {
-  const client = connectedClients.get(queryClient);
-  if (client === undefined) {
-    throw new Error(
-      "Connect a PdsQueryClient to this TanStack QueryClient before using PDS options",
-    );
-  }
-  return client;
-}
-
-function pdsQueryConfigFromMeta(meta: QueryMeta | undefined) {
-  const config = meta?.[PDS_QUERY_META_KEY];
-  if (
-    !isRecord(config) ||
-    !("request" in config) ||
-    !isPdsQueryRequest(config.request) ||
-    !("options" in config) ||
-    !isRecord(config.options)
-  ) {
-    return undefined;
-  }
-  // Only pdsQuery writes this private metadata entry.
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return config as {
-    options: PdsQueryExecutionOptions;
-    request: AnyPdsQueryRequest;
-  };
-}
-
-function isPdsQueryRequest(value: unknown): value is AnyPdsQueryRequest {
-  return (
-    isRecord(value) &&
-    "plugin" in value &&
-    "version" in value &&
-    "operation" in value
-  );
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}
-
-function toError(error: unknown) {
-  return error instanceof Error ? error : new Error(String(error));
-}

From cee29e59f4a07a80781e09d1feceae198e70d7ab Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Wed, 19 Aug 2026 13:58:57 -0400
Subject: [PATCH 15/17] Add Better Auth PDS adapter

---
 README.md                                     | 10 +--
 docs/architecture.md                          | 25 +++++---
 .../README.md                                 | 31 ++++++++++
 .../eslint.config.ts                          |  5 ++
 .../metadata.ts                               |  6 ++
 .../package.json                              | 42 +++++++++++++
 .../src/adapter.test.ts                       | 57 +++++++++++++++++
 .../src/adapter.ts                            | 61 +++++++++++++++++++
 .../src/federation-plugin.ts                  | 47 +++++++-------
 .../src/index.ts                              |  7 +++
 .../src/runtime.ts                            | 12 ++++
 .../tsconfig.json                             |  9 +++
 .../decentralized-convex-server/README.md     |  6 +-
 .../src/app.test.ts                           | 25 ++++++++
 .../decentralized-convex-server/src/app.ts    | 47 +++++++++++---
 .../decentralized-convex-server/src/index.ts  |  1 +
 pnpm-lock.yaml                                | 55 +++++++++++++++--
 services/backend/README.md                    | 15 +++--
 services/backend/convex/_generated/api.d.ts   | 12 ++--
 services/backend/convex/auth.ts               |  8 +--
 services/backend/convex/convex.config.ts      |  5 +-
 services/backend/convex/http.ts               |  4 --
 services/backend/package.json                 |  5 +-
 services/backend/pds-auth.ts                  | 14 +++++
 24 files changed, 432 insertions(+), 77 deletions(-)
 create mode 100644 packages/decentralized-convex-auth-better-auth/README.md
 create mode 100644 packages/decentralized-convex-auth-better-auth/eslint.config.ts
 create mode 100644 packages/decentralized-convex-auth-better-auth/metadata.ts
 create mode 100644 packages/decentralized-convex-auth-better-auth/package.json
 create mode 100644 packages/decentralized-convex-auth-better-auth/src/adapter.test.ts
 create mode 100644 packages/decentralized-convex-auth-better-auth/src/adapter.ts
 rename services/backend/convex/federationAuth.ts => packages/decentralized-convex-auth-better-auth/src/federation-plugin.ts (82%)
 create mode 100644 packages/decentralized-convex-auth-better-auth/src/index.ts
 create mode 100644 packages/decentralized-convex-auth-better-auth/src/runtime.ts
 create mode 100644 packages/decentralized-convex-auth-better-auth/tsconfig.json
 create mode 100644 services/backend/pds-auth.ts

diff --git a/README.md b/README.md
index ebc2f67b..95e5b9ed 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ Read these files in order to follow one request end to end:
 
 1. `packages/decentralized-convex-messages/protocol.ts` defines the typed
    Messages API and its dependency on Accounts.
-2. `services/backend/convex/convex.config.ts` installs Better Auth, Accounts,
-   and Messages in one validated PDS app.
+2. `services/backend/convex/convex.config.ts` installs the PDS auth adapter,
+   Accounts, and Messages in one validated PDS app.
 3. `services/backend/convex/pds.ts` exposes the canonical public dispatcher.
 4. `packages/decentralized-convex-messages/dispatcher.ts` implements the
    Messages operations inside its Component.
@@ -31,13 +31,13 @@ A PDS installs ordinary third-party Components and decentralized-convex
 plugins declaratively:
 
 ```ts
-import betterAuth from "@convex-dev/better-auth/convex.config";
 import accounts from "@decentralized-convex/accounts/convex.config";
 import messages from "@decentralized-convex/messages/convex.config";
 import { definePdsApp } from "@decentralized-convex/server";
+import { pdsAuth } from "../pds-auth";
 
 export default definePdsApp({
-  components: [betterAuth],
+  auth: pdsAuth,
   plugins: [accounts, messages],
 });
 ```
@@ -84,6 +84,8 @@ authentication remain available when an application needs control.
   last-changed release metadata
 - `packages/decentralized-convex-server` — PDS installation, root dispatch,
   Component dispatch, and discovery descriptors
+- `packages/decentralized-convex-auth-better-auth` — Better Auth adapter for
+  the public PDS auth protocol
 - `packages/decentralized-convex-client` — discovery, connections, typed calls,
   federation, and subscriptions
 - `packages/decentralized-convex-react` — client provider
diff --git a/docs/architecture.md b/docs/architecture.md
index 794c782c..ad75cb64 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -39,13 +39,14 @@ Each plugin exports a normal Convex Component whose TypeScript type carries its
 protocol. The host imports that single value through the `convex.config` path
 required by Convex and never manually pairs a Component with its protocol.
 
-The host calls `definePdsApp({ plugins, components })`. It:
+The host calls `definePdsApp({ auth, plugins, components })`. It:
 
 1. checks duplicate names, missing plugins, and incompatible ecosystem versions
    through the plugin tuple's TypeScript type;
 2. installs each plugin as a normal Convex Component;
-3. installs unrelated Components such as Better Auth without treating them as
-   PDS protocols.
+3. installs an optional auth adapter's Component and derives its public
+   descriptor metadata from that same adapter;
+4. installs unrelated Components without treating them as PDS protocols.
 
 The protocol marker is deliberately type-only. Convex replaces imported
 Component definitions while evaluating `convex.config.ts`, so runtime metadata
@@ -88,16 +89,24 @@ identity value across one Component boundary.
 `@decentralized-convex/plugin` knows about contracts, not React, authentication,
 Vera, or deployment routing.
 
-`@decentralized-convex/server` knows how to install and dispatch protocols, but
-not Vera's messaging policy or Better Auth.
+`@decentralized-convex/server` knows how to install and dispatch protocols and
+the generic shape of a PDS auth adapter, but not Vera's messaging policy or any
+specific auth vendor.
+
+`@decentralized-convex/auth-better-auth` bridges a normally configured Better
+Auth instance to the public PDS federation-auth endpoints. Better Auth remains
+a peer dependency, and its database, providers, sessions, callbacks, and UI
+remain entirely under the host's control. The config-time adapter is separated
+from its server-only runtime bridge so importing the generated PDS API does not
+bundle Better Auth into clients.
 
 `@decentralized-convex/client` knows deployments, connections, authentication
 token callbacks, subscriptions, and typed protocol requests. React and
 TanStack Query integrations remain optional packages.
 
 Accounts and Messages own their schemas and operation implementations. Vera's
-backend supplies authentication and federation credential exchange. Vera's web
-app supplies product-specific conversation selection and presentation.
+backend supplies its normal Better Auth configuration to the adapter. Vera's
+web app supplies product-specific conversation selection and presentation.
 
 ## Defaults and extension points
 
@@ -142,6 +151,8 @@ Still prototype-only:
 - the web app uses one explicit two-domain conversation fixture, but its
   routing is stored on each account's home and discovered through product data;
 - the UI holds one active account rather than concurrent accounts;
+- the Better Auth adapter covers the existing home-to-remote assertion
+  exchange, while universal client-to-home sign-in is the next auth slice;
 - auth lacks scopes, revocation, replay limits, and resource-specific policy;
 - Component migration execution, persisted upgrade state, and large plugin
   graphs still need a production design;
diff --git a/packages/decentralized-convex-auth-better-auth/README.md b/packages/decentralized-convex-auth-better-auth/README.md
new file mode 100644
index 00000000..bd90bf85
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/README.md
@@ -0,0 +1,31 @@
+# `@decentralized-convex/auth-better-auth`
+
+Adapts a normally configured Better Auth instance to the public decentralized
+Convex authentication protocol. The adapter does not own Better Auth's
+database, providers, sessions, callbacks, or UI.
+
+```ts
+import betterAuthComponent from "@convex-dev/better-auth/convex.config";
+import { betterAuthAdapter } from "@decentralized-convex/auth-better-auth";
+import { betterAuthPdsPlugin } from "@decentralized-convex/auth-better-auth/runtime";
+
+export const pdsAuth = betterAuthAdapter({
+  accountDomain: () => env.FEDERATION_DOMAIN,
+  component: betterAuthComponent,
+  issuer: () => env.CONVEX_SITE_URL,
+});
+
+export default definePdsApp({
+  auth: pdsAuth,
+  plugins: [accounts, messages],
+});
+
+export function createAuth(ctx: GenericCtx<DataModel>) {
+  return betterAuth({
+    // Every normal Better Auth option remains available.
+    database: authComponent.adapter(ctx),
+    emailAndPassword: { enabled: true },
+    plugins: [convex(...), betterAuthPdsPlugin(pdsAuth)],
+  });
+}
+```
diff --git a/packages/decentralized-convex-auth-better-auth/eslint.config.ts b/packages/decentralized-convex-auth-better-auth/eslint.config.ts
new file mode 100644
index 00000000..89678d01
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/eslint.config.ts
@@ -0,0 +1,5 @@
+import { defineConfig } from "eslint/config";
+
+import { baseConfig, strictConfig } from "@acme/eslint-config/base";
+
+export default defineConfig(baseConfig, strictConfig);
diff --git a/packages/decentralized-convex-auth-better-auth/metadata.ts b/packages/decentralized-convex-auth-better-auth/metadata.ts
new file mode 100644
index 00000000..dc6bd3c7
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/metadata.ts
@@ -0,0 +1,6 @@
+import { defineDecentralizedConvexPackage } from "@decentralized-convex/core";
+
+export const decentralizedConvexPackage = defineDecentralizedConvexPackage({
+  lastChanged: "0.1.0",
+  name: "@decentralized-convex/auth-better-auth",
+});
diff --git a/packages/decentralized-convex-auth-better-auth/package.json b/packages/decentralized-convex-auth-better-auth/package.json
new file mode 100644
index 00000000..5593050b
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@decentralized-convex/auth-better-auth",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts",
+    "./metadata": "./metadata.ts",
+    "./runtime": "./src/runtime.ts"
+  },
+  "scripts": {
+    "build": "tsgo --noEmit",
+    "clean": "git clean -xdf .cache .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "format:fix": "prettier --write . --ignore-path ../../.gitignore",
+    "lint": "eslint --flag unstable_native_nodejs_ts_config",
+    "test": "node --experimental-strip-types --test src/*.test.ts",
+    "typecheck": "tsgo --noEmit"
+  },
+  "dependencies": {
+    "@decentralized-convex/address": "workspace:0.1.0",
+    "@decentralized-convex/core": "workspace:0.1.0",
+    "@decentralized-convex/server": "workspace:0.1.0",
+    "jose": "catalog:",
+    "zod": "catalog:"
+  },
+  "peerDependencies": {
+    "better-auth": ">=1.6.15 <2"
+  },
+  "devDependencies": {
+    "@acme/eslint-config": "workspace:*",
+    "@acme/prettier-config": "workspace:*",
+    "@acme/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "better-auth": "~1.6.15",
+    "convex": "catalog:",
+    "eslint": "catalog:",
+    "prettier": "catalog:",
+    "typescript": "catalog:"
+  },
+  "prettier": "@acme/prettier-config"
+}
diff --git a/packages/decentralized-convex-auth-better-auth/src/adapter.test.ts b/packages/decentralized-convex-auth-better-auth/src/adapter.test.ts
new file mode 100644
index 00000000..e7a939e5
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/src/adapter.test.ts
@@ -0,0 +1,57 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { defineComponent } from "convex/server";
+
+import { betterAuthAdapter, betterAuthRuntimeConfig } from "./adapter.ts";
+import { betterAuthPdsPlugin } from "./runtime.ts";
+
+void test("keeps Better Auth configuration external and derives PDS integration", () => {
+  const component = defineComponent("betterAuth");
+  const adapter = betterAuthAdapter({
+    accountDomain: "accounts.example",
+    component,
+    issuer: "https://accounts.example",
+  });
+
+  assert.equal(adapter.component, component);
+  assert.deepEqual(adapter.descriptor(), {
+    issuer: "https://accounts.example",
+    jwksUrl: "https://accounts.example/api/auth/convex/jwks",
+  });
+  const runtimeConfig = adapter[betterAuthRuntimeConfig]();
+  assert.equal(runtimeConfig.accountDomain, "accounts.example");
+  assert.equal(runtimeConfig.issuer, "https://accounts.example");
+  assert.equal(
+    runtimeConfig.getAccountId({
+      email: "alice@accounts.example",
+      id: "alice",
+      name: "Alice",
+    }),
+    "alice@accounts.example",
+  );
+  assert.equal(
+    betterAuthPdsPlugin(adapter).id,
+    "decentralized-convex-federation-auth",
+  );
+});
+
+void test("resolves host environment only when runtime metadata is requested", () => {
+  let resolutions = 0;
+  const adapter = betterAuthAdapter({
+    accountDomain: () => {
+      resolutions += 1;
+      return "accounts.example";
+    },
+    component: defineComponent("betterAuth"),
+    issuer: () => {
+      resolutions += 1;
+      return "https://accounts.example";
+    },
+  });
+
+  assert.equal(resolutions, 0);
+  adapter.descriptor();
+  assert.equal(resolutions, 1);
+  betterAuthPdsPlugin(adapter);
+  assert.equal(resolutions, 3);
+});
diff --git a/packages/decentralized-convex-auth-better-auth/src/adapter.ts b/packages/decentralized-convex-auth-better-auth/src/adapter.ts
new file mode 100644
index 00000000..42f4b528
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/src/adapter.ts
@@ -0,0 +1,61 @@
+import type { PdsAuthAdapter } from "@decentralized-convex/server";
+
+type ResolvableString = string | (() => string);
+
+export const betterAuthRuntimeConfig = Symbol("betterAuthRuntimeConfig");
+
+export interface BetterAuthPdsUser {
+  readonly email: string;
+  readonly id: string;
+  readonly name: string;
+}
+
+export interface BetterAuthPdsAdapterOptions {
+  readonly accountDomain: ResolvableString;
+  readonly component: NonNullable<PdsAuthAdapter["component"]>;
+  readonly getAccountId?: (user: BetterAuthPdsUser) => string;
+  readonly issuer: ResolvableString;
+  readonly jwksUrl?: ResolvableString;
+}
+
+export interface BetterAuthPdsAdapter extends PdsAuthAdapter {
+  readonly [betterAuthRuntimeConfig]: () => BetterAuthPdsRuntimeConfig;
+}
+
+export interface BetterAuthPdsRuntimeConfig {
+  readonly accountDomain: string;
+  readonly getAccountId: (user: BetterAuthPdsUser) => string;
+  readonly issuer: string;
+}
+
+/**
+ * Adds the public PDS auth protocol around an otherwise normal Better Auth
+ * configuration. It does not own the host's database, providers, sessions,
+ * callbacks, or UI.
+ */
+export function betterAuthAdapter(
+  options: BetterAuthPdsAdapterOptions,
+): BetterAuthPdsAdapter {
+  return {
+    component: options.component,
+    descriptor: () => {
+      const issuer = resolve(options.issuer);
+      return {
+        issuer,
+        jwksUrl:
+          options.jwksUrl === undefined
+            ? new URL("/api/auth/convex/jwks", issuer).toString()
+            : resolve(options.jwksUrl),
+      };
+    },
+    [betterAuthRuntimeConfig]: () => ({
+      accountDomain: resolve(options.accountDomain),
+      getAccountId: options.getAccountId ?? ((user) => user.email),
+      issuer: resolve(options.issuer),
+    }),
+  };
+}
+
+function resolve(value: ResolvableString) {
+  return typeof value === "function" ? value() : value;
+}
diff --git a/services/backend/convex/federationAuth.ts b/packages/decentralized-convex-auth-better-auth/src/federation-plugin.ts
similarity index 82%
rename from services/backend/convex/federationAuth.ts
rename to packages/decentralized-convex-auth-better-auth/src/federation-plugin.ts
index 58d587ca..45f78fac 100644
--- a/services/backend/convex/federationAuth.ts
+++ b/packages/decentralized-convex-auth-better-auth/src/federation-plugin.ts
@@ -6,24 +6,15 @@ import { signJWT } from "better-auth/plugins/jwt";
 import { createRemoteJWKSet, decodeJwt, jwtVerify } from "jose";
 import { z } from "zod";
 
-import { actorFromEmail } from "./lib";
+import type { BetterAuthPdsRuntimeConfig } from "./adapter.ts";
 
-const assertionBody = z.object({
-  audience: z.string().min(1),
-});
+const assertionBody = z.object({ audience: z.string().min(1) });
+const exchangeBody = z.object({ assertion: z.string().min(1) });
 
-const exchangeBody = z.object({
-  assertion: z.string().min(1),
-});
-
-interface PdsFederationAuthOptions {
-  accountDomain: string;
-  issuer: string;
-}
-
-export function pdsFederationAuth(
-  options: PdsFederationAuthOptions,
+export function createFederationPlugin(
+  options: BetterAuthPdsRuntimeConfig,
 ): BetterAuthPlugin {
+  const accountDomain = normalizeDomain(options.accountDomain);
   const jwtOptions = {
     jwt: {
       audience: "convex",
@@ -40,7 +31,17 @@ export function pdsFederationAuth(
         { body: assertionBody, method: "POST", use: [sessionMiddleware] },
         async (ctx) => {
           const audience = normalizeDomain(ctx.body.audience);
-          const accountId = actorFromEmail(ctx.context.session.user.email);
+          const user = ctx.context.session.user;
+          const accountId = options.getAccountId({
+            email: user.email,
+            id: user.id,
+            name: user.name,
+          });
+          if (accountDomainFromId(accountId) !== accountDomain) {
+            throw new Error(
+              `Authenticated account ${accountId} does not belong to ${accountDomain}`,
+            );
+          }
           const issuedAt = nowInSeconds();
           const assertion = await signJWT(ctx, {
             options: {
@@ -54,12 +55,12 @@ export function pdsFederationAuth(
             payload: {
               accountId,
               aud: audience,
-              home: options.accountDomain,
+              home: accountDomain,
               iat: issuedAt,
               jti: crypto.randomUUID(),
-              name: ctx.context.session.user.name,
+              name: user.name,
               purpose: "pds-federation",
-              sub: ctx.context.session.user.id,
+              sub: user.id,
             },
           });
           return { assertion };
@@ -73,7 +74,7 @@ export function pdsFederationAuth(
           try {
             verifiedAssertion = await verifyAssertion(
               ctx.body.assertion,
-              options.accountDomain,
+              accountDomain,
             );
           } catch {
             throw ctx.error("UNAUTHORIZED", {
@@ -81,7 +82,6 @@ export function pdsFederationAuth(
             });
           }
           const { accountId, auth, homeDomain, payload } = verifiedAssertion;
-
           const issuedAt = nowInSeconds();
           const expiresAt = issuedAt + 15 * 60;
           const token = await signJWT(ctx, {
@@ -107,7 +107,7 @@ export function pdsFederationAuth(
         },
       ),
     },
-    id: "pds-federation-auth",
+    id: "decentralized-convex-federation-auth",
   } satisfies BetterAuthPlugin;
 }
 
@@ -128,7 +128,6 @@ async function verifyAssertion(
   if (unverified.purpose !== "pds-federation") {
     throw new Error("Invalid federation assertion purpose");
   }
-
   const discovery = await discoverPds(homeDomain);
   const auth = discovery.manifest.auth;
   if (auth === undefined) {
@@ -170,7 +169,7 @@ function normalizeDomain(value: string) {
 
 function requireClaim(value: unknown, name: string) {
   if (typeof value !== "string" || value.length === 0) {
-    throw new Error(`Federation assertion is missing ${name}`);
+    throw new Error(`PDS authentication assertion is missing ${name}`);
   }
   return value;
 }
diff --git a/packages/decentralized-convex-auth-better-auth/src/index.ts b/packages/decentralized-convex-auth-better-auth/src/index.ts
new file mode 100644
index 00000000..926c9170
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/src/index.ts
@@ -0,0 +1,7 @@
+export { decentralizedConvexPackage } from "../metadata.ts";
+export { betterAuthAdapter } from "./adapter.ts";
+export type {
+  BetterAuthPdsAdapter,
+  BetterAuthPdsAdapterOptions,
+  BetterAuthPdsUser,
+} from "./adapter.ts";
diff --git a/packages/decentralized-convex-auth-better-auth/src/runtime.ts b/packages/decentralized-convex-auth-better-auth/src/runtime.ts
new file mode 100644
index 00000000..77f910ec
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/src/runtime.ts
@@ -0,0 +1,12 @@
+import type { BetterAuthPlugin } from "better-auth";
+
+import type { BetterAuthPdsAdapter } from "./adapter.ts";
+import { betterAuthRuntimeConfig } from "./adapter.ts";
+import { createFederationPlugin } from "./federation-plugin.ts";
+
+/** Adds the PDS federation endpoints to a normal Better Auth configuration. */
+export function betterAuthPdsPlugin(
+  adapter: BetterAuthPdsAdapter,
+): BetterAuthPlugin {
+  return createFederationPlugin(adapter[betterAuthRuntimeConfig]());
+}
diff --git a/packages/decentralized-convex-auth-better-auth/tsconfig.json b/packages/decentralized-convex-auth-better-auth/tsconfig.json
new file mode 100644
index 00000000..eac79cac
--- /dev/null
+++ b/packages/decentralized-convex-auth-better-auth/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "@acme/tsconfig/base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true,
+    "lib": ["ES2022", "DOM"],
+    "types": ["node"]
+  },
+  "include": ["metadata.ts", "src/**/*.ts"]
+}
diff --git a/packages/decentralized-convex-server/README.md b/packages/decentralized-convex-server/README.md
index 3f829b74..f5dcb8f0 100644
--- a/packages/decentralized-convex-server/README.md
+++ b/packages/decentralized-convex-server/README.md
@@ -9,8 +9,10 @@ import accounts from "@decentralized-convex/accounts/convex.config";
 import messages from "@decentralized-convex/messages/convex.config";
 import { definePdsApp } from "@decentralized-convex/server";
 
+import { pdsAuth } from "./pds-auth";
+
 export default definePdsApp({
-  components: [betterAuth],
+  auth: pdsAuth,
   plugins: [accounts, messages],
 });
 ```
@@ -20,6 +22,8 @@ type. `definePdsApp` checks the complete tuple for missing, incompatible, or
 duplicate plugins without requiring a second protocol import. `components`
 accepts normal Convex Components or `{ component, options }` entries for custom
 install names and HTTP prefixes. `app: { httpPrefix }` configures the root app.
+`auth` accepts a vendor adapter, installs its Component when needed, and makes
+its public descriptor metadata part of the same app declaration.
 
 Plugin packages apply that type internally while preserving Convex's required
 single default export:
diff --git a/packages/decentralized-convex-server/src/app.test.ts b/packages/decentralized-convex-server/src/app.test.ts
index ec468ece..a8fbb55d 100644
--- a/packages/decentralized-convex-server/src/app.test.ts
+++ b/packages/decentralized-convex-server/src/app.test.ts
@@ -12,6 +12,7 @@ import { v } from "convex/values";
 import {
   definePdsApp,
   definePdsPluginComponent,
+  pdsDescriptorFromApp,
   pdsReleaseFromApp,
   protocolsFromPdsApp,
 } from "./app.ts";
@@ -66,3 +67,27 @@ void test("derives client protocols from the same local app declaration", () =>
     version: DECENTRALIZED_CONVEX_VERSION,
   });
 });
+
+void test("derives public auth metadata from the app auth adapter", () => {
+  const app = definePdsApp({
+    auth: {
+      descriptor: () => ({
+        issuer: "https://auth.example",
+        jwksUrl: "https://auth.example/jwks",
+      }),
+    },
+    plugins: [],
+  });
+
+  assert.deepEqual(
+    pdsDescriptorFromApp(app, {
+      accountDomain: "example.com",
+      deploymentUrl: "https://example.convex.cloud",
+      httpUrl: "https://example.com",
+    }).auth,
+    {
+      issuer: "https://auth.example",
+      jwksUrl: "https://auth.example/jwks",
+    },
+  );
+});
diff --git a/packages/decentralized-convex-server/src/app.ts b/packages/decentralized-convex-server/src/app.ts
index 6fc140da..9e379237 100644
--- a/packages/decentralized-convex-server/src/app.ts
+++ b/packages/decentralized-convex-server/src/app.ts
@@ -16,6 +16,7 @@ declare const pdsPluginProtocol: unique symbol;
 declare const pdsAppPlugins: unique symbol;
 
 const localComponentProtocols = new WeakMap<object, AnyPluginProtocol>();
+const localAppAuth = new WeakMap<object, PdsAuthAdapter>();
 const localAppProtocols = new WeakMap<object, readonly AnyPluginProtocol[]>();
 
 /**
@@ -66,10 +67,20 @@ export interface ComponentInstall {
   };
 }
 
+/**
+ * Connects a host's auth implementation to the public PDS auth protocol.
+ * Vendor-specific adapters own their runtime integration details.
+ */
+export interface PdsAuthAdapter {
+  readonly component?: ComponentDefinition | ComponentInstall;
+  descriptor(): NonNullable<FederationDescriptor["auth"]>;
+}
+
 export interface PdsAppOptions<
   Plugins extends readonly AnyPdsPluginComponent[],
 > {
   readonly app?: { readonly httpPrefix?: string };
+  readonly auth?: PdsAuthAdapter;
   readonly components?: readonly (ComponentDefinition | ComponentInstall)[];
   readonly plugins: Plugins & PdsPluginGraphDiagnostics<NoInfer<Plugins>>;
 }
@@ -118,18 +129,14 @@ export function definePdsApp<
   const Plugins extends readonly AnyPdsPluginComponent[],
 >({
   app: appOptions,
+  auth,
   components = [],
   plugins,
 }: PdsAppOptions<Plugins>): PdsAppDefinition<Plugins> {
   const app = defineApp(appOptions);
+  if (auth?.component !== undefined) installComponent(app, auth.component);
   for (const install of components) {
-    if (isComponentInstall(install)) {
-      if (isImportedComponent(install.component)) {
-        app.use(install.component, install.options);
-      }
-    } else if (isImportedComponent(install)) {
-      app.use(install);
-    }
+    installComponent(app, install);
   }
 
   const protocols: AnyPluginProtocol[] = [];
@@ -138,6 +145,7 @@ export function definePdsApp<
     if (protocol !== undefined) protocols.push(protocol);
     if (isImportedComponent(plugin)) app.use(plugin);
   }
+  if (auth !== undefined) localAppAuth.set(app, auth);
   localAppProtocols.set(app, Object.freeze(protocols));
   // Installed plugin types are retained for downstream generated/client typing only.
   // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -173,9 +181,30 @@ export function pdsDescriptorFromApp<
   App extends PdsAppDefinition<readonly AnyPdsPluginComponent[]>,
 >(
   app: App,
-  host: Omit<FederationDescriptor, "capabilities" | "lastChanged" | "version">,
+  host: Omit<
+    FederationDescriptor,
+    "auth" | "capabilities" | "lastChanged" | "version"
+  >,
 ): FederationDescriptor {
-  return { ...host, ...pdsReleaseFromApp(app) };
+  const auth = localAppAuth.get(app)?.descriptor();
+  return {
+    ...host,
+    ...(auth === undefined ? {} : { auth }),
+    ...pdsReleaseFromApp(app),
+  };
+}
+
+function installComponent(
+  app: AppDefinition,
+  install: ComponentDefinition | ComponentInstall,
+) {
+  if (isComponentInstall(install)) {
+    if (isImportedComponent(install.component)) {
+      app.use(install.component, install.options);
+    }
+  } else if (isImportedComponent(install)) {
+    app.use(install);
+  }
 }
 
 function isComponentInstall(
diff --git a/packages/decentralized-convex-server/src/index.ts b/packages/decentralized-convex-server/src/index.ts
index 55a73ef6..054f702c 100644
--- a/packages/decentralized-convex-server/src/index.ts
+++ b/packages/decentralized-convex-server/src/index.ts
@@ -10,6 +10,7 @@ export {
 export type {
   AnyPdsPluginComponent,
   ComponentInstall,
+  PdsAuthAdapter,
   PdsAppDefinition,
   PdsAppOptions,
   PdsPluginComponent,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4fda34a6..7763c6ac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -264,6 +264,52 @@ importers:
         specifier: 'catalog:'
         version: 5.9.3
 
+  packages/decentralized-convex-auth-better-auth:
+    dependencies:
+      '@decentralized-convex/address':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-address
+      '@decentralized-convex/core':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-core
+      '@decentralized-convex/server':
+        specifier: workspace:0.1.0
+        version: link:../decentralized-convex-server
+      jose:
+        specifier: 'catalog:'
+        version: 6.2.7
+      zod:
+        specifier: 'catalog:'
+        version: 3.25.76
+    devDependencies:
+      '@acme/eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint
+      '@acme/prettier-config':
+        specifier: workspace:*
+        version: link:../../tooling/prettier
+      '@acme/tsconfig':
+        specifier: workspace:*
+        version: link:../../tooling/typescript
+      '@types/node':
+        specifier: 'catalog:'
+        version: 24.12.2
+      better-auth:
+        specifier: ~1.6.15
+        version: 1.6.25(@tanstack/react-start@1.159.14(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(vite@7.3.2(@types/node@24.12.2)(jiti@2.6.1)(lightningcss@1.30.1)(tsx@4.21.0)(yaml@2.8.3)))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      convex:
+        specifier: 'catalog:'
+        version: 1.38.0(react@19.2.5)
+      eslint:
+        specifier: 'catalog:'
+        version: 9.39.4(jiti@2.6.1)
+      prettier:
+        specifier: 'catalog:'
+        version: 3.8.2
+      typescript:
+        specifier: 'catalog:'
+        version: 5.9.3
+
   packages/decentralized-convex-client:
     dependencies:
       '@decentralized-convex/address':
@@ -524,6 +570,9 @@ importers:
       '@decentralized-convex/address':
         specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-address
+      '@decentralized-convex/auth-better-auth':
+        specifier: workspace:0.1.0
+        version: link:../../packages/decentralized-convex-auth-better-auth
       '@decentralized-convex/client':
         specifier: workspace:0.1.0
         version: link:../../packages/decentralized-convex-client
@@ -539,12 +588,6 @@ importers:
       convex:
         specifier: 'catalog:'
         version: 1.38.0(react@19.2.5)
-      jose:
-        specifier: 'catalog:'
-        version: 6.2.7
-      zod:
-        specifier: 'catalog:'
-        version: 3.25.76
     devDependencies:
       '@acme/eslint-config':
         specifier: workspace:*
diff --git a/services/backend/README.md b/services/backend/README.md
index e291a150..29ba920c 100644
--- a/services/backend/README.md
+++ b/services/backend/README.md
@@ -5,11 +5,16 @@ single declaration in `convex/convex.config.ts`:
 
 ```ts
 export default definePdsApp({
-  components: [betterAuth],
+  auth: pdsAuth,
   plugins: [accounts, messages],
 });
 ```
 
+`pdsAuth` is the shared Better Auth adapter declaration. It installs the
+Better Auth Component, supplies the federation plugin to Vera's otherwise
+normal `betterAuth({...})` configuration, and contributes public auth metadata
+to PDS discovery without repeating it in the HTTP router.
+
 Messages explicitly requires Accounts. The app definition fails type-checking
 if that dependency is absent or incompatible. No custom development or deploy
 command is required; this is a normal Convex app definition.
@@ -43,10 +48,10 @@ pnpm --filter @vera/backend deploy:a
 pnpm --filter @vera/backend deploy:b
 ```
 
-Each deployment needs its own `FEDERATION_DOMAIN`. Better Auth is the current
-Vera authentication choice; the decentralized Convex packages remain auth
-provider agnostic. The same backend is currently deployed to the independent A
-and B development deployments.
+Each deployment needs its own `FEDERATION_DOMAIN`. Better Auth is Vera's
+current authentication choice through `@decentralized-convex/auth-better-auth`;
+other hosts can supply adapters for their own auth system. The same backend is
+currently deployed to the independent A and B development deployments.
 
 ## Public discovery
 
diff --git a/services/backend/convex/_generated/api.d.ts b/services/backend/convex/_generated/api.d.ts
index c38b6f31..7cc5d804 100644
--- a/services/backend/convex/_generated/api.d.ts
+++ b/services/backend/convex/_generated/api.d.ts
@@ -8,21 +8,19 @@
  * @module
  */
 
-import type * as auth from "../auth.js";
-import type * as federationAuth from "../federationAuth.js";
-import type * as http from "../http.js";
-import type * as lib from "../lib.js";
-import type * as pds from "../pds.js";
-
 import type {
   ApiFromModules,
   FilterApi,
   FunctionReference,
 } from "convex/server";
 
+import type * as auth from "../auth.js";
+import type * as http from "../http.js";
+import type * as lib from "../lib.js";
+import type * as pds from "../pds.js";
+
 declare const fullApi: ApiFromModules<{
   auth: typeof auth;
-  federationAuth: typeof federationAuth;
   http: typeof http;
   lib: typeof lib;
   pds: typeof pds;
diff --git a/services/backend/convex/auth.ts b/services/backend/convex/auth.ts
index cee6e539..1f3d2de1 100644
--- a/services/backend/convex/auth.ts
+++ b/services/backend/convex/auth.ts
@@ -1,13 +1,14 @@
 import type { GenericCtx } from "@convex-dev/better-auth";
 import { createClient } from "@convex-dev/better-auth";
 import { convex, crossDomain } from "@convex-dev/better-auth/plugins";
+import { betterAuthPdsPlugin } from "@decentralized-convex/auth-better-auth/runtime";
 import { betterAuth } from "better-auth/minimal";
 
 import type { DataModel } from "./_generated/dataModel";
+import { pdsAuth } from "../pds-auth";
 import { components } from "./_generated/api";
 import { query } from "./_generated/server";
 import authConfig from "./auth.config";
-import { pdsFederationAuth } from "./federationAuth";
 import { actorFromEmail, requireEnvironment } from "./lib";
 
 export const authComponent = createClient<DataModel>(components.betterAuth);
@@ -34,10 +35,7 @@ export function createAuth(ctx: GenericCtx<DataModel>) {
           }),
         },
       }),
-      pdsFederationAuth({
-        accountDomain: requireEnvironment("FEDERATION_DOMAIN"),
-        issuer: requireEnvironment("CONVEX_SITE_URL"),
-      }),
+      betterAuthPdsPlugin(pdsAuth),
     ],
     trustedOrigins: [siteUrl],
   });
diff --git a/services/backend/convex/convex.config.ts b/services/backend/convex/convex.config.ts
index 49b913dd..0fac2f3f 100644
--- a/services/backend/convex/convex.config.ts
+++ b/services/backend/convex/convex.config.ts
@@ -1,9 +1,10 @@
-import betterAuth from "@convex-dev/better-auth/convex.config";
 import accounts from "@decentralized-convex/accounts/convex.config";
 import messages from "@decentralized-convex/messages/convex.config";
 import { definePdsApp } from "@decentralized-convex/server";
 
+import { pdsAuth } from "../pds-auth";
+
 export default definePdsApp({
-  components: [betterAuth],
+  auth: pdsAuth,
   plugins: [accounts, messages],
 });
diff --git a/services/backend/convex/http.ts b/services/backend/convex/http.ts
index 39e1510a..0e0d5285 100644
--- a/services/backend/convex/http.ts
+++ b/services/backend/convex/http.ts
@@ -16,10 +16,6 @@ registerFederationRoutes(http, httpAction, {
   descriptor: () =>
     pdsDescriptorFromApp(app, {
       accountDomain: requireEnvironment("FEDERATION_DOMAIN"),
-      auth: {
-        issuer: requireEnvironment("CONVEX_SITE_URL"),
-        jwksUrl: `${requireEnvironment("CONVEX_SITE_URL")}/api/auth/convex/jwks`,
-      },
       deploymentUrl: requireEnvironment("CONVEX_CLOUD_URL"),
       httpUrl: requireEnvironment("CONVEX_SITE_URL"),
     }),
diff --git a/services/backend/package.json b/services/backend/package.json
index 4217aabd..30eea31e 100644
--- a/services/backend/package.json
+++ b/services/backend/package.json
@@ -20,13 +20,12 @@
     "@convex-dev/better-auth": "0.12.5",
     "@decentralized-convex/accounts": "workspace:0.1.0",
     "@decentralized-convex/address": "workspace:0.1.0",
+    "@decentralized-convex/auth-better-auth": "workspace:0.1.0",
     "@decentralized-convex/client": "workspace:0.1.0",
     "@decentralized-convex/messages": "workspace:0.1.0",
     "@decentralized-convex/server": "workspace:0.1.0",
     "better-auth": "~1.6.15",
-    "convex": "catalog:",
-    "jose": "catalog:",
-    "zod": "catalog:"
+    "convex": "catalog:"
   },
   "devDependencies": {
     "@acme/eslint-config": "workspace:*",
diff --git a/services/backend/pds-auth.ts b/services/backend/pds-auth.ts
new file mode 100644
index 00000000..3281bf5f
--- /dev/null
+++ b/services/backend/pds-auth.ts
@@ -0,0 +1,14 @@
+import betterAuthComponent from "@convex-dev/better-auth/convex.config";
+import { betterAuthAdapter } from "@decentralized-convex/auth-better-auth";
+
+import { actorFromEmail, requireEnvironment } from "./convex/lib";
+
+/** Shared by convex.config, the normal Better Auth factory, and PDS discovery. */
+export const pdsAuth = betterAuthAdapter({
+  accountDomain: () => requireEnvironment("FEDERATION_DOMAIN"),
+  // Convex replaces config-time Component imports with generated references.
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  component: betterAuthComponent,
+  getAccountId: (user) => actorFromEmail(user.email),
+  issuer: () => requireEnvironment("CONVEX_SITE_URL"),
+});

From 0dbba02d51c6e5d0067351f217b1fbe63a7ed1c7 Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Sun, 23 Aug 2026 11:07:01 -0400
Subject: [PATCH 16/17] Create UAV skill

---
 .agents/skills/uav/SKILL.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .agents/skills/uav/SKILL.md

diff --git a/.agents/skills/uav/SKILL.md b/.agents/skills/uav/SKILL.md
new file mode 100644
index 00000000..eb693944
--- /dev/null
+++ b/.agents/skills/uav/SKILL.md
@@ -0,0 +1,10 @@
+---
+name: uav
+description: Use uav for shared project memory and coordination at the start of every project-work session, and when preserving context or reporting outcomes.
+---
+
+# uav
+
+uav is shared memory for project work.
+
+Run `uav help` for commands and `uav workflow` for current usage guidance.

From f81010f1f0f002ac086c2ba0190f45dba4f8318d Mon Sep 17 00:00:00 2001
From: shawn <me@bentsignal.com>
Date: Sun, 23 Aug 2026 11:29:47 -0400
Subject: [PATCH 17/17] Add unslop writing skill

---
 .agents/skills/unslop/SKILL.md | 80 ++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 .agents/skills/unslop/SKILL.md

diff --git a/.agents/skills/unslop/SKILL.md b/.agents/skills/unslop/SKILL.md
new file mode 100644
index 00000000..2a93c06b
--- /dev/null
+++ b/.agents/skills/unslop/SKILL.md
@@ -0,0 +1,80 @@
+---
+name: unslop
+description: Cut AI tells from any writing. Must always apply.
+---
+
+# Unslop
+
+Edit text to remove AI patterns and add human voice.
+
+## Process
+
+1. Scan for the patterns below.
+2. Rewrite. Preserve meaning, match intended tone.
+3. Add soul (see next section).
+4. Self-audit: "What makes this obviously AI generated?" Fix remaining tells.
+
+## Adding soul
+
+Removing patterns is half the job. Sterile, voiceless writing is just as obvious.
+
+- **Have opinions.** React to facts instead of neutrally listing pros and cons.
+- **Vary rhythm.** Short sentences. Then longer ones that take their time. Mix it up.
+- **Acknowledge complexity.** "Impressive but also kind of unsettling" beats "impressive."
+- **Use "I" when it fits.** First person isn't unprofessional.
+- **Let some mess in.** Perfect structure looks machine-made.
+- **Be specific.** Not "this is concerning" but "there's something unsettling about agents churning away at 3am."
+
+## Patterns to detect and fix
+
+### Content
+
+1. **Puffery.** "pivotal moment", "testament to", "evolving landscape", "setting the stage for", "indelible mark", "deeply rooted". Cut puffery, state what happened.
+2. **Name-dropping.** Listing media outlets without context. Pick one, say what was said.
+3. **Superficial -ing phrases.** "highlighting...", "ensuring...", "reflecting...", "showcasing...", "fostering...". Delete or expand with real sources.
+4. **Promotional language.** "nestled", "vibrant", "breathtaking", "groundbreaking", "renowned", "stunning", "must-visit". Use neutral descriptions.
+5. **Vague attributions.** "Experts believe", "Industry reports suggest", "Some critics argue". Name the source or delete.
+6. **Formulaic challenges.** "Despite challenges... continues to thrive." Replace with specific facts.
+
+### Language
+
+7. **AI vocabulary.** Additionally, crucial, delve, enduring, enhance, fostering, garner, interplay, intricate, landscape (abstract), pivotal, showcase, tapestry (abstract), testament, underscore, vibrant. Replace with plain words.
+8. **Fancy ways to say "is".** "serves as", "stands as", "boasts", "features". Just say "is" or "has".
+9. **"Not just X, but Y."** State the point directly instead.
+10. **Rule of three.** Forcing ideas into groups of three. Use the natural number.
+11. **Synonym cycling.** Protagonist, main character, central figure, hero all in one paragraph. Pick one, repeat it.
+12. **False ranges.** "from X to Y" where X and Y aren't on a meaningful scale. List topics directly.
+
+### Style
+
+13. **Em dash overuse.** Avoid em dashes entirely. Use periods or commas only (no parentheses, no en dashes, no hyphen-as-dash substitutes). Em dashes are an AI tell, and reaching for parentheses instead just trades one tell for another. If a thought needs separation, end the sentence or use a comma.
+14. **Colon overuse.** Colons are fine before a list or example. Not as mid-sentence connectors. "If you're coming from traditional automation: instead of registering event handlers, you describe conditions" adds nothing with the colon. Rewrite to let the point stand on its own without comparison framing. "Describing when the scheduler should fire works best as plain English." Same meaning, no crutch punctuation.
+15. **Boldface overuse.** Don't bold every proper noun or acronym.
+16. **Inline-header lists.** The tell is a bold label and colon that restates the line: "**Performance:** Performance improved...". Convert those to prose. A bold lead-in that ends in a period, names the item, and is followed by genuinely new detail ("**Schema in TypeScript.** Tables live in one file.") is fine, not a tell.
+17. **Title case headings.** Use sentence case.
+18. **Decorative emojis.** Remove from headings and bullets.
+19. **Curly quotes.** Replace with straight quotes.
+
+### Communication artifacts
+
+20. **Chatbot phrases.** "I hope this helps!", "Let me know if...", "Of course!", "Certainly!", "Found the smoking gun!" Remove.
+21. **Cutoff disclaimers.** "While specific details are limited..." Find sources or remove.
+22. **Sycophantic tone.** "Great question! You're absolutely right!" Respond directly.
+
+### Filler
+
+23. **Filler phrases.** "In order to" becomes "To". "Due to the fact that" becomes "Because". "It is important to note that" gets deleted.
+24. **Excessive hedging.** "could potentially possibly be argued that it might" becomes "may".
+25. **Generic conclusions.** "The future looks bright." State specific plans or facts.
+
+### Jargon
+
+26. **Abstract metaphor nouns.** Substrate, wedge, vector, locus, vantage, nexus, primitive (as noun), harness (as metaphor), surface (as in "API surface"), bedrock, scaffolding (as metaphor), modality, paradigm, gold-plating, ratchet (as metaphor), evacuate (for moving code), endgame, north star, flywheel. These read as technical but usually have a plainer concrete word. "Substrate" becomes "base". "Wedge in" becomes "add". "Vector" becomes "way" or "method". "Gold-plating" becomes "more than the job needs". "Ratchet" becomes the mechanism's real name or "a limit that only tightens". "Evacuate" becomes "move out". "Endgame" becomes "the last phase". Pick the concrete word.
+
+### Plain speech
+
+27. **Say what it does, not how it feels.** "the database stays close at hand", "SQL you can read", "types that follow your schema" name a feeling. The fix names the mechanism or a number: "`.toSQL()` returns the exact string sent to the database", "a column rename fails the build". Ask what the sentence tells the reader to do or know, then write that. If you can't restate it as a concrete instruction, fact, or number, cut it. One more check: if the sentence could appear unchanged in another project's docs, it says nothing about this one. Cut it.
+28. **Shorten or split dense sentences.** If the reader has to backtrack to parse a sentence, break it in two or drop clauses. One idea per sentence.
+29. **Active voice.** Prefer it. Catch "is/are/was/were + past participle" and name the actor: "queries are validated" becomes "the compiler validates queries", "the file is parsed by the loader" becomes "the loader parses the file". Passive is fine only when the actor is unknown or genuinely doesn't matter.
+30. **Cut adverbs, or use a stronger verb.** "runs quickly" becomes "is fast" or the number. "significantly improves" becomes the measured delta. An adverb propping up a weak verb means the verb is wrong.
+31. **Prefer the plain word.** "utilize" becomes "use", "leverage" becomes "use", "facilitate" becomes "help", "numerous" becomes "many", "in the event that" becomes "if". The fancier synonym is rarely clearer.