From 2f0d553346e575c4508f7d221f2dac24cd95c16e Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Thu, 13 Aug 2026 23:03:51 +0100
Subject: [PATCH] refactor: adopt `@bsky/sdk` (#1943)

---
 app/components/BlueskyComment.vue             |   9 +-
 app/components/BlueskyComments.client.vue     |  14 +-
 app/components/admin/AmaAnswer.vue            |  15 +-
 app/components/admin/EntityForm.vue           |   6 +-
 app/components/admin/LocationForm.vue         |   6 +-
 app/components/admin/PostEditor.vue           |   5 +-
 app/components/admin/TalkDraggable.vue        |   5 +-
 app/components/admin/TalkForm.vue             |  10 +-
 app/components/admin/TalkGroupForm.vue        |   6 +-
 app/components/admin/UsesCategoryForm.vue     |   6 +-
 app/components/admin/UsesItemDraggable.vue    |   5 +-
 app/components/admin/UsesItemForm.vue         |  10 +-
 app/pages/admin/ama/[rkey].vue                |   8 +-
 app/pages/admin/ama/index.vue                 |   8 +-
 app/pages/admin/entities/[rkey].vue           |   7 +-
 app/pages/admin/entities/index.vue            |   4 +-
 app/pages/admin/entities/new.vue              |   5 +-
 app/pages/admin/location.vue                  |   7 +-
 app/pages/admin/talk-groups/[rkey].vue        |   7 +-
 app/pages/admin/talk-groups/new.vue           |   5 +-
 app/pages/admin/talks/[rkey].vue              |   7 +-
 app/pages/admin/talks/index.vue               |   5 +-
 app/pages/admin/talks/new.vue                 |   5 +-
 app/pages/admin/uses/categories/[rkey].vue    |   7 +-
 app/pages/admin/uses/categories/new.vue       |   5 +-
 app/pages/admin/uses/index.vue                |   7 +-
 app/pages/admin/uses/items/[rkey].vue         |   7 +-
 app/pages/admin/uses/items/new.vue            |   5 +-
 modules/atproto/index.ts                      |  12 +-
 modules/bsky-comments.ts                      |  20 +-
 modules/invites/index.ts                      |   4 +-
 modules/runtime/server/slides/[id].pdf.ts     |   3 +-
 modules/shared/atproto-read.ts                |  50 +-
 modules/shared/tid.ts                         |  23 +-
 modules/slides.ts                             |   4 +-
 .../runtime/server/_social/bluesky.get.ts     |  24 +-
 modules/sync/index.ts                         |   4 +-
 modules/sync/providers/gde-advocu.ts          |  31 +-
 modules/sync/providers/standard-site.ts       |  58 +-
 package.json                                  |   8 +-
 pnpm-lock.yaml                                | 355 ++++++++-
 pnpm-workspace.yaml                           |   1 +
 scripts/gen-lex.mjs                           | 131 ----
 scripts/publish-lex.ts                        |  30 +-
 server/api/admin/ama/[rkey].delete.ts         |   3 +-
 server/api/admin/ama/[rkey].get.ts            |   3 +-
 server/api/admin/ama/index.get.ts             |   6 +-
 server/api/admin/auth/callback.get.ts         |   6 +-
 server/api/admin/blobs.post.ts                |   8 +-
 server/api/admin/entities/[rkey].delete.ts    |   3 +-
 server/api/admin/entities/[rkey].get.ts       |   3 +-
 server/api/admin/entities/[rkey].put.ts       |   6 +-
 server/api/admin/entities/index.get.ts        |   3 +-
 server/api/admin/entities/index.post.ts       |   6 +-
 server/api/admin/github-releases.get.ts       |   4 +-
 server/api/admin/invites/[rkey].delete.ts     |   3 +-
 server/api/admin/invites/[rkey].get.ts        |   3 +-
 server/api/admin/invites/[rkey].put.ts        |   3 +-
 server/api/admin/invites/index.get.ts         |   6 +-
 server/api/admin/invites/index.post.ts        |   3 +-
 server/api/admin/location.get.ts              |   3 +-
 server/api/admin/location.put.ts              |   6 +-
 server/api/admin/stats.get.ts                 |  34 +-
 server/api/admin/talk-groups/[rkey].delete.ts |   3 +-
 server/api/admin/talk-groups/[rkey].get.ts    |   3 +-
 server/api/admin/talk-groups/[rkey].put.ts    |   6 +-
 server/api/admin/talk-groups/index.get.ts     |   3 +-
 server/api/admin/talk-groups/index.post.ts    |   6 +-
 server/api/admin/talks/[rkey].delete.ts       |   3 +-
 server/api/admin/talks/[rkey].get.ts          |   3 +-
 server/api/admin/talks/[rkey].put.ts          |   6 +-
 server/api/admin/talks/index.get.ts           |   3 +-
 server/api/admin/talks/index.post.ts          |   6 +-
 .../admin/uses-categories/[rkey].delete.ts    |   3 +-
 .../api/admin/uses-categories/[rkey].get.ts   |   3 +-
 .../api/admin/uses-categories/[rkey].put.ts   |   6 +-
 server/api/admin/uses-categories/index.get.ts |   3 +-
 .../api/admin/uses-categories/index.post.ts   |   6 +-
 server/api/admin/uses-items/[rkey].delete.ts  |   3 +-
 server/api/admin/uses-items/[rkey].get.ts     |   3 +-
 server/api/admin/uses-items/[rkey].put.ts     |   6 +-
 server/api/admin/uses-items/index.get.ts      |   3 +-
 server/api/admin/uses-items/index.post.ts     |   6 +-
 server/api/question.ts                        |  30 +-
 server/utils/admin/ama-mentions.ts            |  19 +-
 server/utils/admin/ama-publish.ts             |  37 +-
 server/utils/admin/ama-record.ts              |  93 ++-
 server/utils/admin/ama-resolve.ts             |   6 +-
 server/utils/admin/{agent.ts => client.ts}    |  13 +-
 server/utils/admin/crud.ts                    | 157 ++--
 server/utils/admin/invites.ts                 |   3 +-
 server/utils/atproto.ts                       | 175 ++---
 server/utils/cms/location.ts                  |  11 +-
 server/utils/cms/talks.ts                     |   7 +-
 server/utils/cms/uses.ts                      |   5 +-
 shared/cms/strict.ts                          |  10 +
 shared/cms/talk-mapper.ts                     |   6 +-
 shared/cms/talks.ts                           |   6 +-
 shared/cms/uses.ts                            |   6 +-
 shared/lex/com.ts                             |   5 +
 shared/lex/com/atproto.ts                     |   5 +
 shared/lex/com/atproto/repo.ts                |   5 +
 shared/lex/com/atproto/repo/strongRef.defs.ts |  48 ++
 shared/lex/com/atproto/repo/strongRef.ts      |   6 +
 shared/lex/dev.ts                             |   5 +
 shared/lex/dev/roe.ts                         |  14 +
 shared/lex/dev/roe/ama.defs.ts                | 220 ++++++
 shared/lex/dev/roe/ama.ts                     |   6 +
 shared/lex/dev/roe/defs.defs.ts               |  32 +
 shared/lex/dev/roe/defs.ts                    |   5 +
 shared/lex/dev/roe/entity.defs.ts             |  97 +++
 shared/lex/dev/roe/entity.ts                  |   6 +
 shared/lex/dev/roe/invite.defs.ts             |  60 ++
 shared/lex/dev/roe/invite.ts                  |   6 +
 shared/lex/dev/roe/location.defs.ts           |  70 ++
 shared/lex/dev/roe/location.ts                |   6 +
 shared/lex/dev/roe/sync.defs.ts               |  56 ++
 shared/lex/dev/roe/sync.ts                    |   6 +
 shared/lex/dev/roe/talk.defs.ts               | 159 ++++
 shared/lex/dev/roe/talk.ts                    |   6 +
 shared/lex/dev/roe/talkGroup.defs.ts          |  54 ++
 shared/lex/dev/roe/talkGroup.ts               |   6 +
 shared/lex/dev/roe/usesCategory.defs.ts       |  62 ++
 shared/lex/dev/roe/usesCategory.ts            |   6 +
 shared/lex/dev/roe/usesItem.defs.ts           | 113 +++
 shared/lex/dev/roe/usesItem.ts                |   6 +
 shared/lex/index.ts                           |  24 +-
 shared/lex/lexicons.ts                        | 679 ------------------
 .../lex/types/com/atproto/repo/strongRef.ts   |  31 -
 shared/lex/types/dev/roe/ama.ts               | 108 ---
 shared/lex/types/dev/roe/defs.ts              |  32 -
 shared/lex/types/dev/roe/entity.ts            |  60 --
 shared/lex/types/dev/roe/invite.ts            |  41 --
 shared/lex/types/dev/roe/location.ts          |  44 --
 shared/lex/types/dev/roe/sync.ts              |  40 --
 shared/lex/types/dev/roe/talk.ts              |  69 --
 shared/lex/types/dev/roe/talkGroup.ts         |  39 -
 shared/lex/types/dev/roe/usesCategory.ts      |  41 --
 shared/lex/types/dev/roe/usesItem.ts          |  63 --
 shared/lex/util.ts                            |  82 ---
 test/unit/bundle.spec.ts                      |  15 +-
 141 files changed, 2001 insertions(+), 2171 deletions(-)
 delete mode 100644 scripts/gen-lex.mjs
 rename server/utils/admin/{agent.ts => client.ts} (56%)
 create mode 100644 shared/lex/com.ts
 create mode 100644 shared/lex/com/atproto.ts
 create mode 100644 shared/lex/com/atproto/repo.ts
 create mode 100644 shared/lex/com/atproto/repo/strongRef.defs.ts
 create mode 100644 shared/lex/com/atproto/repo/strongRef.ts
 create mode 100644 shared/lex/dev.ts
 create mode 100644 shared/lex/dev/roe.ts
 create mode 100644 shared/lex/dev/roe/ama.defs.ts
 create mode 100644 shared/lex/dev/roe/ama.ts
 create mode 100644 shared/lex/dev/roe/defs.defs.ts
 create mode 100644 shared/lex/dev/roe/defs.ts
 create mode 100644 shared/lex/dev/roe/entity.defs.ts
 create mode 100644 shared/lex/dev/roe/entity.ts
 create mode 100644 shared/lex/dev/roe/invite.defs.ts
 create mode 100644 shared/lex/dev/roe/invite.ts
 create mode 100644 shared/lex/dev/roe/location.defs.ts
 create mode 100644 shared/lex/dev/roe/location.ts
 create mode 100644 shared/lex/dev/roe/sync.defs.ts
 create mode 100644 shared/lex/dev/roe/sync.ts
 create mode 100644 shared/lex/dev/roe/talk.defs.ts
 create mode 100644 shared/lex/dev/roe/talk.ts
 create mode 100644 shared/lex/dev/roe/talkGroup.defs.ts
 create mode 100644 shared/lex/dev/roe/talkGroup.ts
 create mode 100644 shared/lex/dev/roe/usesCategory.defs.ts
 create mode 100644 shared/lex/dev/roe/usesCategory.ts
 create mode 100644 shared/lex/dev/roe/usesItem.defs.ts
 create mode 100644 shared/lex/dev/roe/usesItem.ts
 delete mode 100644 shared/lex/lexicons.ts
 delete mode 100644 shared/lex/types/com/atproto/repo/strongRef.ts
 delete mode 100644 shared/lex/types/dev/roe/ama.ts
 delete mode 100644 shared/lex/types/dev/roe/defs.ts
 delete mode 100644 shared/lex/types/dev/roe/entity.ts
 delete mode 100644 shared/lex/types/dev/roe/invite.ts
 delete mode 100644 shared/lex/types/dev/roe/location.ts
 delete mode 100644 shared/lex/types/dev/roe/sync.ts
 delete mode 100644 shared/lex/types/dev/roe/talk.ts
 delete mode 100644 shared/lex/types/dev/roe/talkGroup.ts
 delete mode 100644 shared/lex/types/dev/roe/usesCategory.ts
 delete mode 100644 shared/lex/types/dev/roe/usesItem.ts
 delete mode 100644 shared/lex/util.ts

diff --git a/app/components/BlueskyComment.vue b/app/components/BlueskyComment.vue
index 1aef4155..9669c1ae 100644
--- a/app/components/BlueskyComment.vue
+++ b/app/components/BlueskyComment.vue
@@ -1,15 +1,12 @@
 <script setup lang="ts">
-import type {
-  AppBskyEmbedImages,
-  AppBskyEmbedExternal,
-} from '@atproto/api'
+import type { app } from '@bsky/sdk/lexicons'
 import type { Facet, BlueskyFacetFeature } from '#shared/utils/bluesky'
 import { segmentize, atUriToWebUrl } from '#shared/utils/bluesky'
 
 interface CommentEmbed {
   type: 'images' | 'external'
-  images?: AppBskyEmbedImages.ViewImage[]
-  external?: AppBskyEmbedExternal.ViewExternal
+  images?: app.bsky.embed.images.ViewImage[]
+  external?: app.bsky.embed.external.ViewExternal
 }
 
 interface Comment {
diff --git a/app/components/BlueskyComments.client.vue b/app/components/BlueskyComments.client.vue
index 97dd493f..a16dacb2 100644
--- a/app/components/BlueskyComments.client.vue
+++ b/app/components/BlueskyComments.client.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
-import type { AppBskyFeedDefs, AppBskyRichtextFacet, AppBskyEmbedImages, AppBskyEmbedExternal } from '@atproto/api'
+import type { app } from '@bsky/sdk/lexicons'
 
 const props = defineProps<{
   uri: string
 }>()
 
-type Facet = AppBskyRichtextFacet.Main
-type ThreadViewPost = AppBskyFeedDefs.ThreadViewPost
+type Facet = app.bsky.richtext.facet.Main
+type ThreadViewPost = app.bsky.feed.defs.ThreadViewPost
 
 interface CommentEmbed {
   type: 'images' | 'external'
-  images?: AppBskyEmbedImages.ViewImage[]
-  external?: AppBskyEmbedExternal.ViewExternal
+  images?: app.bsky.embed.images.ViewImage[]
+  external?: app.bsky.embed.external.ViewExternal
 }
 
 interface Comment {
@@ -50,14 +50,14 @@ function parseEmbed (embed: unknown): CommentEmbed | undefined {
   if (e.$type === 'app.bsky.embed.images#view' && Array.isArray(e.images)) {
     return {
       type: 'images',
-      images: e.images as AppBskyEmbedImages.ViewImage[],
+      images: e.images as app.bsky.embed.images.ViewImage[],
     }
   }
 
   if (e.$type === 'app.bsky.embed.external#view' && e.external) {
     return {
       type: 'external',
-      external: e.external as AppBskyEmbedExternal.ViewExternal,
+      external: e.external as app.bsky.embed.external.ViewExternal,
     }
   }
 
diff --git a/app/components/admin/AmaAnswer.vue b/app/components/admin/AmaAnswer.vue
index fed0c5ae..febf745b 100644
--- a/app/components/admin/AmaAnswer.vue
+++ b/app/components/admin/AmaAnswer.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import type { DevRoeAma, DevRoeEntity, ComAtprotoRepoStrongRef } from '#shared/lex'
+import type { com, dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 interface EntityEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeEntity.Record
+  value: Loose<dev.roe.entity.Main>
 }
 
 type AmaPlatform = 'bluesky' | 'mastodon' | 'linkedin' | 'youtubeShorts'
@@ -21,9 +22,9 @@ const props = defineProps<{
   rkey: string
   question: string
   createdAt: string
-  initialPosts?: DevRoeAma.Post[]
-  initialPlatforms?: DevRoeAma.Platforms
-  initialPublishedLinks?: DevRoeAma.PublishedLinks
+  initialPosts?: Loose<dev.roe.ama.Post>[]
+  initialPlatforms?: dev.roe.ama.Platforms
+  initialPublishedLinks?: dev.roe.ama.PublishedLinks
   /** Public URL of any already-published image, for the generator's initial preview. */
   initialImagePreviewUrl?: string | null
   initialImageDimensions?: { width: number, height: number }
@@ -37,13 +38,13 @@ const { data: entities } = useAdminFetch<EntityEntry[]>('/api/admin/entities', {
 
 interface DraftPost {
   text: string
-  mentions: ComAtprotoRepoStrongRef.Main[]
+  mentions: Loose<com.atproto.repo.strongRef.Main>[]
 }
 
 const posts = ref<DraftPost[]>(
   (props.initialPosts ?? [{ text: '' }]).map(p => ({
     text: p.text,
-    mentions: (p.mentions ?? []) as ComAtprotoRepoStrongRef.Main[],
+    mentions: (p.mentions ?? []) as Loose<com.atproto.repo.strongRef.Main>[],
   })),
 )
 if (!posts.value.length) posts.value = [{ text: '', mentions: [] }]
diff --git a/app/components/admin/EntityForm.vue b/app/components/admin/EntityForm.vue
index aca19e56..c5ce96a4 100644
--- a/app/components/admin/EntityForm.vue
+++ b/app/components/admin/EntityForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DevRoeEntity } from '#shared/lex'
-import type { Strict } from '#shared/cms/strict'
+import type { dev } from '#shared/lex'
+import type { Loose, Strict } from '#shared/cms/strict'
 
-type EntityValue = Omit<Strict<DevRoeEntity.Record>, '$type'>
+type EntityValue = Omit<Loose<Strict<dev.roe.entity.Main>>, '$type'>
 
 const props = defineProps<{
   initial?: Partial<EntityValue>
diff --git a/app/components/admin/LocationForm.vue b/app/components/admin/LocationForm.vue
index d66e4834..23f0dab7 100644
--- a/app/components/admin/LocationForm.vue
+++ b/app/components/admin/LocationForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DevRoeLocation } from '#shared/lex'
-import type { Strict } from '#shared/cms/strict'
+import type { dev } from '#shared/lex'
+import type { Loose, Strict } from '#shared/cms/strict'
 
-type LocationValue = Omit<Strict<DevRoeLocation.Record>, '$type'>
+type LocationValue = Omit<Loose<Strict<dev.roe.location.Main>>, '$type'>
 
 const props = defineProps<{
   initial?: Partial<LocationValue>
diff --git a/app/components/admin/PostEditor.vue b/app/components/admin/PostEditor.vue
index 91e4b941..949d64fc 100644
--- a/app/components/admin/PostEditor.vue
+++ b/app/components/admin/PostEditor.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { serialiseEditor } from './post-editor-serialise'
-import type { DevRoeEntity } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 /**
  * contenteditable post editor for AMA threads. Stores text in a flat
@@ -18,7 +19,7 @@ interface EntityEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeEntity.Record
+  value: Loose<dev.roe.entity.Main>
 }
 
 const props = defineProps<{
diff --git a/app/components/admin/TalkDraggable.vue b/app/components/admin/TalkDraggable.vue
index 4091100d..86aa8995 100644
--- a/app/components/admin/TalkDraggable.vue
+++ b/app/components/admin/TalkDraggable.vue
@@ -6,13 +6,14 @@
  * the canonical date-sorted order; this component is a UI shell.
  */
 import { useDragAndDrop } from '@formkit/drag-and-drop/vue'
-import type { DevRoeTalk } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 export interface TalkEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeTalk.Record
+  value: Loose<dev.roe.talk.Main>
 }
 
 const props = defineProps<{
diff --git a/app/components/admin/TalkForm.vue b/app/components/admin/TalkForm.vue
index 4c1b5bf0..c949ca4b 100644
--- a/app/components/admin/TalkForm.vue
+++ b/app/components/admin/TalkForm.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-import type { DevRoeTalk, DevRoeTalkGroup, ComAtprotoRepoStrongRef } from '#shared/lex'
+import type { com, dev } from '#shared/lex'
 import { ref } from 'vue'
 import { blobUrlFor, cidFromBlob } from '#shared/cms/blob'
-import type { Strict } from '#shared/cms/strict'
+import type { Loose, Strict } from '#shared/cms/strict'
 
-type TalkValue = Omit<Strict<DevRoeTalk.Record>, '$type'>
+type TalkValue = Omit<Loose<Strict<dev.roe.talk.Main>>, '$type'>
 
 interface TalkGroupEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeTalkGroup.Record
+  value: dev.roe.talkGroup.Main
 }
 
 interface GitHubRelease {
@@ -128,7 +128,7 @@ async function onSubmit () {
   submitting.value = true
   try {
     const group = (groups.value ?? []).find(g => g.uri === form.groupUri)
-    const groupRef: ComAtprotoRepoStrongRef.Main | undefined = group
+    const groupRef: Loose<com.atproto.repo.strongRef.Main> | undefined = group
       ? { uri: group.uri, cid: group.cid }
       : undefined
 
diff --git a/app/components/admin/TalkGroupForm.vue b/app/components/admin/TalkGroupForm.vue
index 26cd33f6..e3b4aabe 100644
--- a/app/components/admin/TalkGroupForm.vue
+++ b/app/components/admin/TalkGroupForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DevRoeTalkGroup } from '#shared/lex'
-import type { Strict } from '#shared/cms/strict'
+import type { dev } from '#shared/lex'
+import type { Loose, Strict } from '#shared/cms/strict'
 
-type TalkGroupValue = Omit<Strict<DevRoeTalkGroup.Record>, '$type'>
+type TalkGroupValue = Omit<Loose<Strict<dev.roe.talkGroup.Main>>, '$type'>
 
 const props = defineProps<{
   initial?: Partial<TalkGroupValue>
diff --git a/app/components/admin/UsesCategoryForm.vue b/app/components/admin/UsesCategoryForm.vue
index 72fb4a30..8c11f0f6 100644
--- a/app/components/admin/UsesCategoryForm.vue
+++ b/app/components/admin/UsesCategoryForm.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { DevRoeUsesCategory } from '#shared/lex'
-import type { Strict } from '#shared/cms/strict'
+import type { dev } from '#shared/lex'
+import type { Loose, Strict } from '#shared/cms/strict'
 
-type UsesCategoryValue = Omit<Strict<DevRoeUsesCategory.Record>, '$type'>
+type UsesCategoryValue = Omit<Loose<Strict<dev.roe.usesCategory.Main>>, '$type'>
 
 const props = defineProps<{
   initial?: Partial<UsesCategoryValue>
diff --git a/app/components/admin/UsesItemDraggable.vue b/app/components/admin/UsesItemDraggable.vue
index aeea3d12..40dc504b 100644
--- a/app/components/admin/UsesItemDraggable.vue
+++ b/app/components/admin/UsesItemDraggable.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { useDragAndDrop } from '@formkit/drag-and-drop/vue'
-import type { DevRoeUsesItem } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 interface ItemEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeUsesItem.Record
+  value: Loose<dev.roe.usesItem.Main>
 }
 
 const props = defineProps<{
diff --git a/app/components/admin/UsesItemForm.vue b/app/components/admin/UsesItemForm.vue
index 921b9f87..48368e51 100644
--- a/app/components/admin/UsesItemForm.vue
+++ b/app/components/admin/UsesItemForm.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-import type { DevRoeUsesItem, DevRoeUsesCategory, ComAtprotoRepoStrongRef } from '#shared/lex'
+import type { com, dev } from '#shared/lex'
 import { ref } from 'vue'
 import { blobUrlFor, cidFromBlob } from '#shared/cms/blob'
-import type { Strict } from '#shared/cms/strict'
+import type { Loose, Strict } from '#shared/cms/strict'
 
-type UsesItemValue = Omit<Strict<DevRoeUsesItem.Record>, '$type'>
+type UsesItemValue = Omit<Loose<Strict<dev.roe.usesItem.Main>>, '$type'>
 
 interface UsesCategoryEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeUsesCategory.Record
+  value: dev.roe.usesCategory.Main
 }
 
 const props = defineProps<{
@@ -113,7 +113,7 @@ async function onSubmit () {
       submitting.value = false
       return
     }
-    const categoryRef: ComAtprotoRepoStrongRef.Main = { uri: category.uri, cid: category.cid }
+    const categoryRef: Loose<com.atproto.repo.strongRef.Main> = { uri: category.uri, cid: category.cid }
 
     const value: UsesItemValue = {
       category: categoryRef,
diff --git a/app/pages/admin/ama/[rkey].vue b/app/pages/admin/ama/[rkey].vue
index 112ccfb6..dff32a07 100644
--- a/app/pages/admin/ama/[rkey].vue
+++ b/app/pages/admin/ama/[rkey].vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { DevRoeAma } from '#shared/lex'
+import type { dev } from '#shared/lex'
 
 definePageMeta({ layout: false })
 useHead({ title: 'AMA - admin - Daniel Roe' })
@@ -20,9 +20,9 @@ interface AmaEntry {
   cid: string
   status: 'unanswered' | 'answered'
   question: string
-  posts: DevRoeAma.Post[]
-  platforms?: DevRoeAma.Platforms
-  publishedLinks?: DevRoeAma.PublishedLinks
+  posts: dev.roe.ama.Post[]
+  platforms?: dev.roe.ama.Platforms
+  publishedLinks?: dev.roe.ama.PublishedLinks
   image?: unknown
   imageDimensions?: { width: number, height: number }
   backgroundStyle?: string
diff --git a/app/pages/admin/ama/index.vue b/app/pages/admin/ama/index.vue
index 00dc2de9..4a6e8049 100644
--- a/app/pages/admin/ama/index.vue
+++ b/app/pages/admin/ama/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { DevRoeAma } from '#shared/lex'
+import type { dev } from '#shared/lex'
 
 definePageMeta({ layout: false })
 useHead({ title: 'AMA - admin - Daniel Roe' })
@@ -10,9 +10,9 @@ interface AmaEntry {
   cid: string
   status: 'unanswered' | 'answered'
   question: string
-  posts: DevRoeAma.Post[]
-  platforms?: DevRoeAma.Platforms
-  publishedLinks?: DevRoeAma.PublishedLinks
+  posts: dev.roe.ama.Post[]
+  platforms?: dev.roe.ama.Platforms
+  publishedLinks?: dev.roe.ama.PublishedLinks
   createdAt: string
   answeredAt?: string
 }
diff --git a/app/pages/admin/entities/[rkey].vue b/app/pages/admin/entities/[rkey].vue
index 022a59a8..eb76fc00 100644
--- a/app/pages/admin/entities/[rkey].vue
+++ b/app/pages/admin/entities/[rkey].vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeEntity } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Edit entity - admin - Daniel Roe' })
@@ -14,13 +15,13 @@ if (!rkey.value) {
   throw createError({ statusCode: 404, statusMessage: 'Missing rkey.' })
 }
 
-type EntityValue = Omit<DevRoeEntity.Record, '$type'>
+type EntityValue = Omit<Loose<dev.roe.entity.Main>, '$type'>
 
 interface EntityEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeEntity.Record
+  value: dev.roe.entity.Main
 }
 
 const { data, loading } = useAdminFetch<EntityEntry>(`/api/admin/entities/${rkey.value}`, {
diff --git a/app/pages/admin/entities/index.vue b/app/pages/admin/entities/index.vue
index 4bfd3ed9..faa6dfc9 100644
--- a/app/pages/admin/entities/index.vue
+++ b/app/pages/admin/entities/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { DevRoeEntity } from '#shared/lex'
+import type { dev } from '#shared/lex'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Entities - admin - Daniel Roe' })
@@ -8,7 +8,7 @@ interface EntityEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeEntity.Record
+  value: dev.roe.entity.Main
 }
 
 const { data, refresh, loading } = useAdminFetch<EntityEntry[]>('/api/admin/entities', { default: () => [] })
diff --git a/app/pages/admin/entities/new.vue b/app/pages/admin/entities/new.vue
index 4ee7d7b2..81333ebb 100644
--- a/app/pages/admin/entities/new.vue
+++ b/app/pages/admin/entities/new.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { DevRoeEntity } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'New entity - admin - Daniel Roe' })
 
-type EntityValue = Omit<DevRoeEntity.Record, '$type'>
+type EntityValue = Omit<Loose<dev.roe.entity.Main>, '$type'>
 
 async function save (value: EntityValue) {
   await $fetch('/api/admin/entities', { method: 'POST', body: value })
diff --git a/app/pages/admin/location.vue b/app/pages/admin/location.vue
index e6184b4b..970d4ecb 100644
--- a/app/pages/admin/location.vue
+++ b/app/pages/admin/location.vue
@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import type { DevRoeLocation } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Location - admin - Daniel Roe' })
 
-type LocationValue = Omit<DevRoeLocation.Record, '$type'>
+type LocationValue = Omit<Loose<dev.roe.location.Main>, '$type'>
 
 interface LocationEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeLocation.Record
+  value: dev.roe.location.Main
 }
 
 const { data, refresh, loading } = useAdminFetch<LocationEntry | null>('/api/admin/location')
diff --git a/app/pages/admin/talk-groups/[rkey].vue b/app/pages/admin/talk-groups/[rkey].vue
index 08f1a44d..4276a4ea 100644
--- a/app/pages/admin/talk-groups/[rkey].vue
+++ b/app/pages/admin/talk-groups/[rkey].vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeTalkGroup } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Edit talk group - admin - Daniel Roe' })
@@ -14,13 +15,13 @@ if (!rkey.value) {
   throw createError({ statusCode: 404, statusMessage: 'Missing rkey.' })
 }
 
-type TalkGroupValue = Omit<DevRoeTalkGroup.Record, '$type'>
+type TalkGroupValue = Omit<Loose<dev.roe.talkGroup.Main>, '$type'>
 
 interface TalkGroupEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeTalkGroup.Record
+  value: dev.roe.talkGroup.Main
 }
 
 // `watch: false` stops useFetch firing one last `/.../undefined` request
diff --git a/app/pages/admin/talk-groups/new.vue b/app/pages/admin/talk-groups/new.vue
index f5435a36..c1ba18d4 100644
--- a/app/pages/admin/talk-groups/new.vue
+++ b/app/pages/admin/talk-groups/new.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { DevRoeTalkGroup } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'New talk group - admin - Daniel Roe' })
 
-type TalkGroupValue = Omit<DevRoeTalkGroup.Record, '$type'>
+type TalkGroupValue = Omit<Loose<dev.roe.talkGroup.Main>, '$type'>
 
 async function save (value: TalkGroupValue) {
   await $fetch('/api/admin/talk-groups', { method: 'POST', body: value })
diff --git a/app/pages/admin/talks/[rkey].vue b/app/pages/admin/talks/[rkey].vue
index 4b1905cb..676ab3ea 100644
--- a/app/pages/admin/talks/[rkey].vue
+++ b/app/pages/admin/talks/[rkey].vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeTalk } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 
@@ -11,13 +12,13 @@ const rkey = computed(() => {
 
 useHead({ title: () => `Edit talk · admin` })
 
-type TalkValue = Omit<DevRoeTalk.Record, '$type'>
+type TalkValue = Omit<Loose<dev.roe.talk.Main>, '$type'>
 
 interface TalkEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeTalk.Record
+  value: dev.roe.talk.Main
 }
 
 if (!rkey.value) {
diff --git a/app/pages/admin/talks/index.vue b/app/pages/admin/talks/index.vue
index 85395572..039e8832 100644
--- a/app/pages/admin/talks/index.vue
+++ b/app/pages/admin/talks/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeTalkGroup } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 import type { TalkEntry } from '~~/app/components/admin/TalkDraggable.vue'
 
 definePageMeta({ layout: false })
@@ -9,7 +10,7 @@ interface TalkGroupEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeTalkGroup.Record
+  value: Loose<dev.roe.talkGroup.Main>
 }
 
 const { data: talksData, refresh: refreshTalks, loading: talksLoading } = useAdminFetch<TalkEntry[]>('/api/admin/talks', { default: () => [] })
diff --git a/app/pages/admin/talks/new.vue b/app/pages/admin/talks/new.vue
index dec1a455..00138d2a 100644
--- a/app/pages/admin/talks/new.vue
+++ b/app/pages/admin/talks/new.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { DevRoeTalk } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'New talk - admin - Daniel Roe' })
 
-type TalkValue = Omit<DevRoeTalk.Record, '$type'>
+type TalkValue = Omit<Loose<dev.roe.talk.Main>, '$type'>
 
 async function save (value: TalkValue) {
   const res = await $fetch<{ rkey: string }>('/api/admin/talks', {
diff --git a/app/pages/admin/uses/categories/[rkey].vue b/app/pages/admin/uses/categories/[rkey].vue
index dfe2ceab..6e44dc0d 100644
--- a/app/pages/admin/uses/categories/[rkey].vue
+++ b/app/pages/admin/uses/categories/[rkey].vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeUsesCategory } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Edit uses category - admin - Daniel Roe' })
@@ -14,13 +15,13 @@ if (!rkey.value) {
   throw createError({ statusCode: 404, statusMessage: 'Missing rkey.' })
 }
 
-type UsesCategoryValue = Omit<DevRoeUsesCategory.Record, '$type'>
+type UsesCategoryValue = Omit<Loose<dev.roe.usesCategory.Main>, '$type'>
 
 interface CategoryEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeUsesCategory.Record
+  value: dev.roe.usesCategory.Main
 }
 
 // `watch: false` stops useFetch firing one last `/.../undefined` request
diff --git a/app/pages/admin/uses/categories/new.vue b/app/pages/admin/uses/categories/new.vue
index 07781df2..7ed60e61 100644
--- a/app/pages/admin/uses/categories/new.vue
+++ b/app/pages/admin/uses/categories/new.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { DevRoeUsesCategory } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'New uses category - admin - Daniel Roe' })
 
-type UsesCategoryValue = Omit<DevRoeUsesCategory.Record, '$type'>
+type UsesCategoryValue = Omit<Loose<dev.roe.usesCategory.Main>, '$type'>
 
 async function save (value: UsesCategoryValue) {
   await $fetch('/api/admin/uses-categories', { method: 'POST', body: value })
diff --git a/app/pages/admin/uses/index.vue b/app/pages/admin/uses/index.vue
index a37505c8..dafff438 100644
--- a/app/pages/admin/uses/index.vue
+++ b/app/pages/admin/uses/index.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeUsesCategory, DevRoeUsesItem } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Uses - admin - Daniel Roe' })
@@ -8,14 +9,14 @@ interface CategoryEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeUsesCategory.Record
+  value: Loose<dev.roe.usesCategory.Main>
 }
 
 interface ItemEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeUsesItem.Record
+  value: Loose<dev.roe.usesItem.Main>
 }
 
 const { data: categoriesData, refresh: refreshCategories, loading: categoriesLoading } = useAdminFetch<CategoryEntry[]>('/api/admin/uses-categories', { default: () => [] })
diff --git a/app/pages/admin/uses/items/[rkey].vue b/app/pages/admin/uses/items/[rkey].vue
index 694bab72..0f437ff5 100644
--- a/app/pages/admin/uses/items/[rkey].vue
+++ b/app/pages/admin/uses/items/[rkey].vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DevRoeUsesItem } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'Edit uses item - admin - Daniel Roe' })
@@ -14,13 +15,13 @@ if (!rkey.value) {
   throw createError({ statusCode: 404, statusMessage: 'Missing rkey.' })
 }
 
-type UsesItemValue = Omit<DevRoeUsesItem.Record, '$type'>
+type UsesItemValue = Omit<Loose<dev.roe.usesItem.Main>, '$type'>
 
 interface ItemEntry {
   rkey: string
   uri: string
   cid: string
-  value: DevRoeUsesItem.Record
+  value: dev.roe.usesItem.Main
 }
 
 // `watch: false` stops useFetch firing one last `/.../undefined` request
diff --git a/app/pages/admin/uses/items/new.vue b/app/pages/admin/uses/items/new.vue
index e0a81ce1..4f6e13c9 100644
--- a/app/pages/admin/uses/items/new.vue
+++ b/app/pages/admin/uses/items/new.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { DevRoeUsesItem } from '#shared/lex'
+import type { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 definePageMeta({ layout: false })
 useHead({ title: 'New uses item - admin - Daniel Roe' })
 
-type UsesItemValue = Omit<DevRoeUsesItem.Record, '$type'>
+type UsesItemValue = Omit<Loose<dev.roe.usesItem.Main>, '$type'>
 
 async function save (value: UsesItemValue) {
   await $fetch('/api/admin/uses-items', { method: 'POST', body: value })
diff --git a/modules/atproto/index.ts b/modules/atproto/index.ts
index c8948b65..39cb0027 100644
--- a/modules/atproto/index.ts
+++ b/modules/atproto/index.ts
@@ -6,7 +6,9 @@
  * `social.networks.bluesky.identifier`; the PDS endpoint is read from the
  * `#atproto_pds` service entry of the resolved DID document.
  */
-import { AtpAgent } from '@atproto/api'
+import { Client, asStringFormat } from '@atproto/lex'
+import { api } from '@bsky/sdk'
+import { com } from '@bsky/sdk/lexicons'
 import { defineNuxtModule, useNuxt } from 'nuxt/kit'
 
 interface DidDocument {
@@ -46,10 +48,10 @@ export default defineNuxtModule({
 
     try {
       if (!cfg.did) {
-        const agent = new AtpAgent({ service: 'https://public.api.bsky.app' })
-        const { data } = await agent.resolveHandle({ handle })
-        cfg.did = data.did
-        publicCfg.did = data.did
+        const client = new Client(api.app.urlPublic)
+        const { did } = await client.call(com.atproto.identity.resolveHandle, { handle: asStringFormat(handle, 'handle') })
+        cfg.did = did
+        publicCfg.did = did
       }
 
       if (!publicCfg.service) {
diff --git a/modules/bsky-comments.ts b/modules/bsky-comments.ts
index 244c7a7d..b601ad8d 100644
--- a/modules/bsky-comments.ts
+++ b/modules/bsky-comments.ts
@@ -4,7 +4,9 @@ import { existsSync } from 'node:fs'
 import { addServerHandler, addServerTemplate, addTemplate, addTypeTemplate, createResolver, defineNuxtModule, useNuxt } from 'nuxt/kit'
 import { joinURL, withoutTrailingSlash } from 'ufo'
 import { join } from 'pathe'
-import { AtpAgent, AppBskyFeedPost } from '@atproto/api'
+import { Client, asStringFormat } from '@atproto/lex'
+import { api } from '@bsky/sdk'
+import { app, com } from '@bsky/sdk/lexicons'
 import { toValue } from 'vue'
 
 // when I created my Bluesky account - don't judge me for hard coding it!
@@ -46,7 +48,7 @@ declare module '#build/bsky-runtime-discovery.mjs' {
     }
 
     const resolver = createResolver(import.meta.url)
-    const agent = new AtpAgent({ service: 'https://public.api.bsky.app' })
+    const client = new Client(api.app.urlPublic)
 
     const cacheDir = join(nuxt.options.rootDir, 'node_modules', '.cache', 'bluesky-comments')
     if (!existsSync(cacheDir)) {
@@ -66,7 +68,7 @@ declare module '#build/bsky-runtime-discovery.mjs' {
       if (!siteURL) {
         return
       }
-      const feedIterator = createFeedIterator(agent, blueskyHandle)
+      const feedIterator = createFeedIterator(client, blueskyHandle)
 
       for (const entry of entries) {
         if (!entry.date) continue
@@ -102,8 +104,8 @@ declare module '#build/bsky-runtime-discovery.mjs' {
             if (match) {
               const [, handle, rkey] = match
               try {
-                const { data: resolved } = await agent.resolveHandle({ handle: handle! })
-                const uri = `at://${resolved.did}/app.bsky.feed.post/${rkey}`
+                const { did } = await client.call(com.atproto.identity.resolveHandle, { handle: asStringFormat(handle!, 'handle') })
+                const uri = `at://${did}/app.bsky.feed.post/${rkey}`
                 await saveCache(cacheFile, uri)
                 return uri
               }
@@ -190,7 +192,7 @@ async function saveCache (cacheFile: string, uri: string | null) {
   }
 }
 
-function createFeedIterator (agent: AtpAgent, actor: string) {
+function createFeedIterator (client: Client, actor: string) {
   const posts: ParsedPost[] = []
   let cursor: string | undefined
   let exhausted = false
@@ -200,8 +202,8 @@ function createFeedIterator (agent: AtpAgent, actor: string) {
     if (exhausted) return false
 
     try {
-      const { data } = await agent.getAuthorFeed({
-        actor,
+      const data = await client.call(app.bsky.feed.getAuthorFeed, {
+        actor: asStringFormat(actor, 'at-identifier'),
         limit: 100,
         cursor,
       })
@@ -211,7 +213,7 @@ function createFeedIterator (agent: AtpAgent, actor: string) {
         if (item.reason) continue
 
         const post = item.post
-        if (!AppBskyFeedPost.isRecord(post.record)) continue
+        if (!app.bsky.feed.post.$matches(post.record)) continue
 
         const record = post.record
         const postDate = new Date(record.createdAt as string)
diff --git a/modules/invites/index.ts b/modules/invites/index.ts
index e7d6010c..17e9a1e8 100644
--- a/modules/invites/index.ts
+++ b/modules/invites/index.ts
@@ -12,7 +12,7 @@ import { defu } from 'defu'
 
 import { listAllRecords } from '../shared/atproto-read'
 import { decryptJSON } from '../../server/utils/admin/encryption'
-import type { DevRoeInvite } from '../../shared/lex'
+import { dev } from '../../shared/lex/index.ts'
 
 export default defineNuxtModule({
   meta: {
@@ -35,7 +35,7 @@ export default defineNuxtModule({
 
     if (process.env.NUXT_PDS_ENCRYPTION_KEY) {
       try {
-        const records = await listAllRecords<DevRoeInvite.Record>('dev.roe.invite')
+        const records = await listAllRecords(dev.roe.invite.main)
         for (const r of records) {
           if (!r.value.isActive) continue
           try {
diff --git a/modules/runtime/server/slides/[id].pdf.ts b/modules/runtime/server/slides/[id].pdf.ts
index c0c10b91..2d81fed2 100644
--- a/modules/runtime/server/slides/[id].pdf.ts
+++ b/modules/runtime/server/slides/[id].pdf.ts
@@ -2,6 +2,7 @@
  * Dev-only handler for `/slides/:id.pdf`.
  */
 import { listRecords } from '#server/utils/atproto'
+import { dev } from '#shared/lex'
 
 interface GitHubReleaseAsset {
   id: number
@@ -16,7 +17,7 @@ let knownIds: Set<string> | null = null
 
 async function getKnownSlideIds (event: Parameters<typeof listRecords>[0]): Promise<Set<string>> {
   if (knownIds) return knownIds
-  const records = await listRecords(event, 'dev.roe.talk')
+  const records = await listRecords(event, dev.roe.talk.main)
   knownIds = new Set(
     records
       .map(r => r.value.slides)
diff --git a/modules/shared/atproto-read.ts b/modules/shared/atproto-read.ts
index 55599c65..2009d940 100644
--- a/modules/shared/atproto-read.ts
+++ b/modules/shared/atproto-read.ts
@@ -9,57 +9,43 @@
  * Service URL and DID come from `runtimeConfig.atproto`, populated by the
  * shared `modules/atproto` module.
  */
-import { AtpAgent } from '@atproto/api'
+import { Client, asStringFormat } from '@atproto/lex'
+import type { AtUriString, CidString, DidString, Infer, RecordSchema } from '@atproto/lex'
 import { useNuxt } from 'nuxt/kit'
 
-function cfg () {
-  return useNuxt().options.runtimeConfig.atproto
+let client: Client | null = null
+function getClient (): Client {
+  if (client) return client
+  client = new Client(useNuxt().options.runtimeConfig.public.atproto.service)
+  return client
 }
 
-let agent: AtpAgent | null = null
-function getAgent (): AtpAgent {
-  if (agent) return agent
-  agent = new AtpAgent({ service: useNuxt().options.runtimeConfig.public.atproto.service })
-  return agent
-}
-
-let didPromise: Promise<string> | null = null
-async function getDid (): Promise<string> {
+let didPromise: Promise<DidString> | null = null
+function getDid (): Promise<DidString> {
   if (didPromise) return didPromise
-  const { did } = cfg()
+  const { did } = useNuxt().options.runtimeConfig.atproto
   if (!did) {
     throw new Error(
       'runtimeConfig.atproto.did is not set; the build-time atproto module did not resolve it from social.networks.bluesky.identifier.',
     )
   }
-  didPromise = Promise.resolve(did)
+  didPromise = Promise.resolve(asStringFormat(did, 'did'))
   return didPromise
 }
 
 export interface FetchedRecord<T> {
-  uri: string
-  cid: string
+  uri: AtUriString
+  cid: CidString
   value: T
 }
 
 /** Paginate through every record in `collection` on our PDS. */
-export async function listAllRecords<T> (collection: string): Promise<FetchedRecord<T>[]> {
-  const a = getAgent()
+export async function listAllRecords<T extends RecordSchema> (schema: T): Promise<FetchedRecord<Infer<T>>[]> {
+  const c = getClient()
   const did = await getDid()
-  const out: FetchedRecord<T>[] = []
-  let cursor: string | undefined
-  while (true) {
-    const res = await a.com.atproto.repo.listRecords({
-      repo: did,
-      collection,
-      limit: 100,
-      cursor,
-    })
-    for (const r of res.data.records) {
-      out.push({ uri: r.uri, cid: r.cid, value: r.value as T })
-    }
-    if (!res.data.cursor || res.data.records.length < 100) break
-    cursor = res.data.cursor
+  const out: FetchedRecord<Infer<T>>[] = []
+  for await (const r of c.listAll(schema, { repo: did, limit: 100 })) {
+    out.push({ uri: r.uri, cid: r.cid, value: r.value as Infer<T> })
   }
   return out
 }
diff --git a/modules/shared/tid.ts b/modules/shared/tid.ts
index f239752f..cba2c95a 100644
--- a/modules/shared/tid.ts
+++ b/modules/shared/tid.ts
@@ -1,9 +1,19 @@
-import { TID } from '@atproto/common-web'
-
 /** Fixed clock ID for deterministic TID generation from dates. */
 const CLOCK_ID = 3
 const MS_TO_MICROSECONDS = 1000
 
+const S32_ALPHABET = '234567abcdefghijklmnopqrstuvwxyz'
+
+function s32 (value: number, length: number): string {
+  let out = ''
+  let n = value
+  for (let i = 0; i < length; i++) {
+    out = S32_ALPHABET[n % 32] + out
+    n = Math.floor(n / 32)
+  }
+  return out
+}
+
 /**
  * Generate a deterministic TID from a date string.
  *
@@ -11,11 +21,16 @@ const MS_TO_MICROSECONDS = 1000
  * combined with a fixed clock ID to ensure the same date always
  * produces the same TID.
  *
+ * A TID is 13 base32-sortable characters: a leading zero bit, a 53-bit
+ * microsecond timestamp, then a 10-bit clock ID. Encoding the timestamp and
+ * the clock ID separately keeps every intermediate value inside the safe
+ * integer range, which a single 64-bit shift would not.
+ *
  * @see https://atproto.com/specs/tid
  */
 export function tidFromDate (date: string | Date): string {
-  const timestamp = (typeof date === 'string' ? new Date(date) : date).getTime() * MS_TO_MICROSECONDS
-  return TID.fromTime(timestamp, CLOCK_ID).toString()
+  const micros = (typeof date === 'string' ? new Date(date) : date).getTime() * MS_TO_MICROSECONDS
+  return s32(micros, 11) + s32(CLOCK_ID, 2)
 }
 
 /** Stable TID for the site's publication record, derived from the first commit date. */
diff --git a/modules/slides.ts b/modules/slides.ts
index 534b91a9..8598ee52 100644
--- a/modules/slides.ts
+++ b/modules/slides.ts
@@ -3,7 +3,7 @@ import { $fetch } from 'ofetch'
 import { put, head } from '@vercel/blob'
 
 import { listAllRecords } from './shared/atproto-read'
-import type { DevRoeTalk } from '../shared/lex'
+import { dev } from '../shared/lex/index.ts'
 
 export default defineNuxtModule({
   meta: {
@@ -74,7 +74,7 @@ export default defineNuxtModule({
 })
 
 async function fetchSlideReleases (): Promise<string[]> {
-  const records = await listAllRecords<DevRoeTalk.Record>('dev.roe.talk')
+  const records = await listAllRecords(dev.roe.talk.main)
   return records
     .map(r => r.value.slides)
     .filter((s): s is string => Boolean(s))
diff --git a/modules/social/runtime/server/_social/bluesky.get.ts b/modules/social/runtime/server/_social/bluesky.get.ts
index 5e0e6f32..9754dc05 100644
--- a/modules/social/runtime/server/_social/bluesky.get.ts
+++ b/modules/social/runtime/server/_social/bluesky.get.ts
@@ -1,26 +1,27 @@
-import { AppBskyEmbedImages, AppBskyFeedPost, AppBskyRichtextFacet, AtpAgent } from '@atproto/api'
-import type { AppBskyFeedDefs } from '@atproto/api'
+import { Client, asStringFormat } from '@atproto/lex'
+import { api } from '@bsky/sdk'
+import { app } from '@bsky/sdk/lexicons'
 import MagicString from 'magic-string'
 
 export default defineEventHandler(async event => {
-  const agent = new AtpAgent({ service: 'https://public.api.bsky.app' })
+  const client = new Client(api.app.urlPublic)
   const { identifier } = useRuntimeConfig(event).social.networks.bluesky
 
-  const feed: AppBskyFeedDefs.FeedViewPost[] = []
+  const feed: app.bsky.feed.defs.FeedViewPost[] = []
   let cursor: string | undefined
   do {
-    const result = await agent.getAuthorFeed({ actor: identifier, limit: 100, cursor })
-    for (const p of result.data.feed) {
-      if (AppBskyFeedPost.isRecord(p.post.record) && p.post.author.handle === identifier && !p.reply && (!p.post.embed || AppBskyEmbedImages.isMain(p.post.embed))) {
+    const result = await client.call(app.bsky.feed.getAuthorFeed, { actor: asStringFormat(identifier, 'at-identifier'), limit: 100, cursor })
+    for (const p of result.feed) {
+      if (app.bsky.feed.post.$matches(p.post.record) && p.post.author.handle === identifier && !p.reply && (!p.post.embed || app.bsky.embed.images.view.$matches(p.post.embed))) {
         feed.push(p)
       }
-      cursor = result.data.cursor
+      cursor = result.cursor
     }
   } while (cursor && feed.length < 20)
 
   return Promise.all(feed.map((p): BlueskyFeedItem => {
-    const post = p.post.record as AppBskyFeedPost.Record
-    const embed = AppBskyEmbedImages.isMain(p.post.embed) ? p.post.embed : undefined
+    const post = p.post.record as app.bsky.feed.post.Main
+    const embed = app.bsky.embed.images.view.$matches(p.post.embed) ? p.post.embed : undefined
     const text = new MagicString(post.text)
     for (const facet of post.facets || []) {
       const startIndex = [...post.text].findIndex(
@@ -34,7 +35,7 @@ export default defineEventHandler(async event => {
           >= facet.index.byteEnd,
       )
       for (const feature of facet.features) {
-        if (AppBskyRichtextFacet.isLink(feature)) {
+        if (app.bsky.richtext.facet.link.$matches(feature)) {
           text.appendRight(startIndex, `<a href="${feature.uri}">`)
           text.appendLeft(endIndex === -1 ? post.text.length : endIndex + 1, '</a>')
           continue
@@ -65,7 +66,6 @@ export default defineEventHandler(async event => {
               `https://bsky.app/profile/${p.post.author.handle}/post`
               + p.post.uri.match(/(\/[^/]+)$/)?.[1],
       html: text.toString().replace(/\n/g, '<br>'),
-      // @ts-expect-error TODO: fix typings
       media: embed?.images?.map(i => ({
         url: i.fullsize,
         alt: i.alt,
diff --git a/modules/sync/index.ts b/modules/sync/index.ts
index 6d8c5602..4c75257e 100644
--- a/modules/sync/index.ts
+++ b/modules/sync/index.ts
@@ -4,7 +4,7 @@ import { defineNuxtModule, useNuxt } from 'nuxt/kit'
 import { syncAll } from './providers'
 import type { SyncItem } from './providers'
 import { listAllRecords } from '../shared/atproto-read'
-import type { DevRoeTalk } from '../../shared/lex'
+import { dev } from '../../shared/lex/index.ts'
 
 const TALK_TYPE_MAP: Record<string, SyncItem['type']> = {
   podcast: 'video',
@@ -44,7 +44,7 @@ export default defineNuxtModule({
 
 async function fetchTalks (): Promise<SyncItem[]> {
   try {
-    const records = await listAllRecords<DevRoeTalk.Record>('dev.roe.talk')
+    const records = await listAllRecords(dev.roe.talk.main)
     const now = new Date().toISOString()
     return records
       .map(r => r.value)
diff --git a/modules/sync/providers/gde-advocu.ts b/modules/sync/providers/gde-advocu.ts
index e43270d6..74b10337 100644
--- a/modules/sync/providers/gde-advocu.ts
+++ b/modules/sync/providers/gde-advocu.ts
@@ -1,10 +1,10 @@
 import { $fetch } from 'ofetch'
-import { AtpAgent } from '@atproto/api'
-import { TID } from '@atproto/common-web'
+import { Client, asStringFormat, currentDatetimeString } from '@atproto/lex'
+import { PasswordSession } from '@atproto/lex-password-session'
 import { useNuxt } from 'nuxt/kit'
 
 import { listAllRecords } from '../../shared/atproto-read'
-import type { DevRoeSync } from '../../../shared/lex'
+import { dev } from '../../../shared/lex/index.ts'
 import type { SyncItem, SyncOptions, SyncProvider } from './index'
 
 const PROVIDER = 'gde-advocu'
@@ -49,15 +49,14 @@ export class GdeAdvocuProvider implements SyncProvider {
       throw new Error('atproto identity / credentials not configured for Advocu dedupe tracking (PDS resolved at build time; check NUXT_ATPROTO_PASSWORD and social.networks.bluesky.identifier).')
     }
 
-    const synced = new Set(
-      (await listAllRecords<DevRoeSync.Record>('dev.roe.sync'))
+    const synced = new Set<string>(
+      (await listAllRecords(dev.roe.sync.main))
         .filter(r => r.value.provider === PROVIDER)
         .map(r => r.value.canonicalUrl),
     )
 
-    const agent = new AtpAgent({ service: pdsUrl })
-    await agent.login({ identifier: handle, password })
-    const did = agent.session!.did
+    const session = await PasswordSession.login({ service: pdsUrl, identifier: handle, password })
+    const client = new Client(session)
 
     const $advocu = $fetch.create({
       baseURL: 'https://api.advocu.com/personal-api/v1/gde',
@@ -107,17 +106,11 @@ export class GdeAdvocuProvider implements SyncProvider {
         continue
       }
 
-      await agent.com.atproto.repo.putRecord({
-        repo: did,
-        collection: 'dev.roe.sync',
-        rkey: TID.nextStr(),
-        record: {
-          $type: 'dev.roe.sync',
-          provider: PROVIDER,
-          canonicalUrl: item.canonical_url,
-          syncedAt: new Date().toISOString(),
-        } satisfies DevRoeSync.Record,
-      })
+      await client.create(dev.roe.sync.main, {
+        provider: PROVIDER,
+        canonicalUrl: asStringFormat(item.canonical_url, 'uri'),
+        syncedAt: currentDatetimeString(),
+      }, { validateRequest: true })
       count++
     }
 
diff --git a/modules/sync/providers/standard-site.ts b/modules/sync/providers/standard-site.ts
index 9ddca41e..d31ae25e 100644
--- a/modules/sync/providers/standard-site.ts
+++ b/modules/sync/providers/standard-site.ts
@@ -1,4 +1,6 @@
-import { AtpAgent } from '@atproto/api'
+import { Client } from '@atproto/lex'
+import type { LexMap } from '@atproto/lex'
+import { PasswordSession } from '@atproto/lex-password-session'
 import { useNuxt } from 'nuxt/kit'
 
 import type { SyncItem, SyncOptions, SyncProvider } from './index'
@@ -31,31 +33,22 @@ export class StandardSiteProvider implements SyncProvider {
       throw new Error('atproto identity / credentials not configured (PDS resolved at build time; check NUXT_ATPROTO_PASSWORD and social.networks.bluesky.identifier).')
     }
 
-    const agent = new AtpAgent({ service: pdsUrl })
-    await agent.login({ identifier: handle, password })
+    const session = await PasswordSession.login({ service: pdsUrl, identifier: handle, password })
+    const client = new Client(session)
 
-    const did = agent.session!.did
+    const did = client.assertDid
 
-    await agent.com.atproto.repo.putRecord({
-      repo: did,
-      collection: 'site.standard.publication',
-      rkey: publicationRkey,
-      record: {
-        $type: 'site.standard.publication',
-        url: 'https://roe.dev',
-        name: 'Daniel Roe',
-        description: 'The personal website of Daniel Roe',
-        preferences: { showInDiscover: true },
-      },
-    })
+    await client.putRecord({
+      $type: 'site.standard.publication',
+      url: 'https://roe.dev',
+      name: 'Daniel Roe',
+      description: 'The personal website of Daniel Roe',
+      preferences: { showInDiscover: true },
+    }, publicationRkey)
 
     // Delete legacy 'self' rkey publication record if it exists
     try {
-      await agent.com.atproto.repo.deleteRecord({
-        repo: did,
-        collection: 'site.standard.publication',
-        rkey: 'self',
-      })
+      await client.deleteRecord('site.standard.publication', 'self')
       console.info('[sync:standard-site] Deleted legacy publication record with rkey: self')
     }
     catch {
@@ -71,20 +64,12 @@ export class StandardSiteProvider implements SyncProvider {
 
     // Delete any existing records that don't match a current blog post's TID
     try {
-      const existing = await agent.com.atproto.repo.listRecords({
-        repo: did,
-        collection: 'site.standard.document',
-        limit: 100,
-      })
-      for (const record of existing.data.records) {
+      const existing = await client.listRecords('site.standard.document', { repo: did, limit: 100 })
+      for (const record of existing.body.records) {
         const rkey = record.uri.split('/').pop()!
         if (!expectedRkeys.has(rkey)) {
           console.info(`[sync:standard-site] Deleting stale record with rkey: ${rkey}`)
-          await agent.com.atproto.repo.deleteRecord({
-            repo: did,
-            collection: 'site.standard.document',
-            rkey,
-          })
+          await client.deleteRecord('site.standard.document', rkey)
         }
       }
     }
@@ -100,7 +85,7 @@ export class StandardSiteProvider implements SyncProvider {
 
       const rkey = tidFromDate(item.date)
 
-      const record: Record<string, unknown> = {
+      const record: LexMap = {
         $type: 'site.standard.document',
         site: `at://${did}/site.standard.publication/${publicationRkey}`,
         path: `/blog/${slug}`,
@@ -113,12 +98,7 @@ export class StandardSiteProvider implements SyncProvider {
       if (item.tags?.length) record.tags = item.tags
       if (item.text_content) record.textContent = item.text_content
 
-      await agent.com.atproto.repo.putRecord({
-        repo: did,
-        collection: 'site.standard.document',
-        rkey,
-        record,
-      })
+      await client.putRecord(record as LexMap & { $type: 'site.standard.document' }, rkey)
 
       updated++
     }
diff --git a/package.json b/package.json
index f7f58f38..267cd1f9 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "auth:linkedin": "node --env-file=.env scripts/linkedin-auth.ts",
     "auth:youtube": "node --env-file=.env scripts/youtube-auth.ts",
     "auth:youtube:refresh": "node --env-file=.env scripts/youtube-auth.ts refresh",
-    "lex:gen": "node scripts/gen-lex.mjs",
+    "lex:gen": "lex build --lexicons ./lexicons --out ./shared/lex --clear --index-file --import-ext .ts",
     "lex:publish": "node --env-file=.env scripts/publish-lex.ts"
   },
   "nano-staged": {
@@ -30,9 +30,10 @@
   },
   "dependencies": {
     "@atcute/bluesky-richtext-segmenter": "^3.0.2",
-    "@atproto/api": "^0.20.34",
-    "@atproto/lexicon": "^0.7.7",
+    "@atproto/lex": "0.3.5",
+    "@atproto/lex-password-session": "0.2.0",
     "@atproto/oauth-client-node": "0.5.3",
+    "@bsky/sdk": "1.0.0",
     "@comark/nuxt": "0.6.2",
     "@formkit/drag-and-drop": "0.6.1",
     "@iconify-json/ri": "^1.2.10",
@@ -92,7 +93,6 @@
     "vue-router": "5.2.0"
   },
   "devDependencies": {
-    "@atproto/common-web": "0.5.9",
     "@commitlint/cli": "21.2.1",
     "@commitlint/config-conventional": "21.2.0",
     "@nuxt/test-utils": "4.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bb730d2b..d1620bab 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,15 +15,18 @@ importers:
       '@atcute/bluesky-richtext-segmenter':
         specifier: ^3.0.2
         version: 3.0.2
-      '@atproto/api':
-        specifier: ^0.20.34
-        version: 0.20.38
-      '@atproto/lexicon':
-        specifier: ^0.7.7
-        version: 0.7.11
+      '@atproto/lex':
+        specifier: 0.3.5
+        version: 0.3.5
+      '@atproto/lex-password-session':
+        specifier: 0.2.0
+        version: 0.2.0
       '@atproto/oauth-client-node':
         specifier: 0.5.3
         version: 0.5.3
+      '@bsky/sdk':
+        specifier: 1.0.0
+        version: 1.0.0(@atproto/lex@0.3.5)
       '@comark/nuxt':
         specifier: 0.6.2
         version: 0.6.2(magic-string@1.1.0)(magicast@0.5.4)(nuxt@4.5.2(4df9b6b6cfc2cff577d4811e18b85791))(oxc-parser@0.131.0)(rolldown@1.2.3)(shiki@4.4.2)(unplugin@3.3.0(esbuild@0.28.0)(rolldown@1.2.3)(rollup@4.62.4)(vite@8.2.1(@types/node@25.6.0)(esbuild@0.28.0)(jiti@2.7.0)(terser@5.49.0)(yaml@2.9.0))(webpack@5.105.2(cssnano@8.0.2(postcss@8.5.26))(csso@5.0.5)(esbuild@0.28.0)(lightningcss@1.33.0)(postcss@8.5.26)))(vue@3.5.41(typescript@6.0.3))
@@ -196,9 +199,6 @@ importers:
         specifier: 5.2.0
         version: 5.2.0(@vue/compiler-sfc@3.5.41)(esbuild@0.28.0)(rolldown@1.2.3)(rollup@4.62.4)(vite@8.2.1(@types/node@25.6.0)(esbuild@0.28.0)(jiti@2.7.0)(terser@5.49.0)(yaml@2.9.0))(vue@3.5.41(typescript@6.0.3))(webpack@5.105.2(cssnano@8.0.2(postcss@8.5.26))(csso@5.0.5)(esbuild@0.28.0)(lightningcss@1.33.0)(postcss@8.5.26))
     devDependencies:
-      '@atproto/common-web':
-        specifier: 0.5.9
-        version: 0.5.9
       '@commitlint/cli':
         specifier: 21.2.1
         version: 21.2.1(@types/node@25.6.0)(conventional-commits-parser@7.1.1)(typescript@6.0.3)
@@ -322,14 +322,18 @@ packages:
     resolution: {integrity: sha512-vfvoDhu6ds6BT3Pqe+d2/LBU1WpDRtt69y6zltlfMCoucPm82m1j50/Wb6xTvv+oZ+2j0JyZVXsmXQ12SWYQJg==}
     engines: {node: '>=22'}
 
-  '@atproto/api@0.20.38':
-    resolution: {integrity: sha512-bKDVNr1uW2MW9ZSXdQoyEoQO3ieX3Id35KuVNpEmgjOmeOS20sx94dav98MQ7hUUaFok31jYSgAildJ/lA27NA==}
-    engines: {node: '>=22'}
-
   '@atproto/common-web@0.5.9':
     resolution: {integrity: sha512-2c5C6YV8352JJz9Z5fNfcsstllaKGAb3cQW9aO7unMAGh/FzTGFq+xOwNMW2lTeagO6z530uxYm8AiSRM6O+DQ==}
     engines: {node: '>=22'}
 
+  '@atproto/common@0.7.6':
+    resolution: {integrity: sha512-xRge0hFyBG9H5912JlILR0eKQ1Upo/aq9ZLYQy4qtCiYaWXZHXNitdKb5IViYeXjONRVMgAVp8KtNkthsKgSYg==}
+    engines: {node: '>=22'}
+
+  '@atproto/crypto@0.5.4':
+    resolution: {integrity: sha512-UR0BkuYNYuFtw+dA+y/oPPxzX0SWRnGJ+1Cfh/jGP1BvjRUyezK3omjpeLms5fYrXbM9vnfX+ckJFJqkBgLOdw==}
+    engines: {node: '>=22'}
+
   '@atproto/did@0.5.4':
     resolution: {integrity: sha512-BlnwQ+obL+4ZA71KH/EzZ3TY+cpSxnLiUI85mjBJIQwvDF/oN2sQA18wIj9jpduviIt2b/cMtlJuzHjzBkfXvw==}
     engines: {node: '>=22'}
@@ -346,14 +350,51 @@ packages:
     resolution: {integrity: sha512-tq7TUDmNfe1yDfpRgdGQMJdl9TUlJmREQNCag9yg5w8Evu+TOiFiLgiOCbo7X4ouRPSgd1DpOzXbUa8UyKKMZA==}
     engines: {node: '>=22'}
 
+  '@atproto/lex-builder@0.1.12':
+    resolution: {integrity: sha512-uo3mcdoOgqBfQnf+PhYYLNEBdUTgoNe2ARYb3cUaiec8O0oritOeZndUDgmths06ACrlqFkZNTV1YJX6CsH71g==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-cbor@0.1.6':
+    resolution: {integrity: sha512-PxLQy7jzV8u9zTGURNF8ZczLPk+ZH+WNx/2z/z7RacJbu7sWNpx26U2pC7cIkWtt4jyDaruaLhssw3w3atLotA==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-client@0.3.3':
+    resolution: {integrity: sha512-sWChe7Jukm9uxDfxT6ElICp6vMTqAFmwcHdSLdMDtsKBZSrwO7vWL9F6rpoMPyxS29Ob9nNAhMg30kKfZrb+uw==}
+    engines: {node: '>=22'}
+
   '@atproto/lex-data@0.1.7':
     resolution: {integrity: sha512-kW/dPLqo/WgCLV+XESR4JKwV6c1rZWJGOfuPupZGTjEDAKoBbKXdaEzX9/1vKQYbZ9U3j0DS/n7OFFK7wBugyQ==}
     engines: {node: '>=22'}
 
+  '@atproto/lex-document@0.1.9':
+    resolution: {integrity: sha512-TmpwttQ9pKCXlvwUlJ/5HMZPtJMFBvgZ1bunEeQD5JfU6n/sgK/fob8tfjhTdL2QrpZMtM6opMEk3w5STm1RDQ==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-installer@0.1.14':
+    resolution: {integrity: sha512-P2TAMvrWQmPrdOlfWFKg/qlvnGsGvot/6wXL25M57ObNoUpE1TE3sMO+H0eSl6u5UYjcSYl6byrVe+HhOJwfdA==}
+    engines: {node: '>=22'}
+
   '@atproto/lex-json@0.1.6':
     resolution: {integrity: sha512-mvrAd0lbyuecIHjyld8QN6MN6CBf4j0GCxLzegsvLh0SvDf+GbYWklkcQqmITL44yFQOwmA/QNIQj0Uvh7+R/g==}
     engines: {node: '>=22'}
 
+  '@atproto/lex-password-session@0.2.0':
+    resolution: {integrity: sha512-u958Etax/bPVr9FWko+/B5nRcU1klQHvrdiVtYb4lkgrM6uvV7BvaFJZYEu5DzlEeqNAZ9a65PmbC1F5oyUBjQ==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-resolver@0.2.7':
+    resolution: {integrity: sha512-7zxI3VW+63WoE9s34lBxpXt+uhF3XUeoMmuxntU4j2W5Eq8ioMRXvsk24qKHp/86bysnnODAF0+y/Qr662j+UQ==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex-schema@0.2.5':
+    resolution: {integrity: sha512-/tP3dRqaZu0EIoq0BSVzhvFGL6u0uu2KFDV21i73DpFsg6TXOTddKJ9bvgK83XdAJYL7PWi703XsaR31v9u5Qg==}
+    engines: {node: '>=22'}
+
+  '@atproto/lex@0.3.5':
+    resolution: {integrity: sha512-4HiYgkEb4OgA+GSZQFafDTUfq/zYrSl8Z1zhR6W5qk809pIU43oAJy6INaFvAbLlUMibCdkPNyT54O81wq00Mw==}
+    engines: {node: '>=22'}
+    hasBin: true
+
   '@atproto/lexicon@0.7.11':
     resolution: {integrity: sha512-ukCZMCWmiu7fAlssBbLs+IMaf2K2R9mADaTKz2jEeC/xeZ3jT77Ka0S2G+ELBB+Dc9ijBACU0iPMQLhquOkuzQ==}
     engines: {node: '>=22'}
@@ -370,6 +411,10 @@ packages:
     resolution: {integrity: sha512-x75O0HsKB1IGfBikAQrrTX6EL8Rt4Q0+wMcwhZQRGPk/N/WqbYbsW3Powj4R8ZJKSfWCpVfaw32Piu1pTi891Q==}
     engines: {node: '>=22'}
 
+  '@atproto/repo@0.10.10':
+    resolution: {integrity: sha512-+PHEbksplSTxU4prfNF1HLUN/1/uc3uYuPfYecsNH2E9Ky6rerhlKG46DUIAV72j/6/i6wsQdP180TsnmiCXVg==}
+    engines: {node: '>=22'}
+
   '@atproto/syntax@0.7.4':
     resolution: {integrity: sha512-EHsEHtasH/DGPljBYecVDjweGMQ5eTu6Ns0GZ5z0qdqpOI8ipBvldWnMIxWkA+5HfZ9Dsu4V1MX0WP7wgL8cuA==}
     engines: {node: '>=22'}
@@ -531,6 +576,12 @@ packages:
       commander:
         optional: true
 
+  '@bsky/sdk@1.0.0':
+    resolution: {integrity: sha512-nnVYpbESETN5R/dyBLWE+5u52HkJO0+EWMv+bLDRZUkHEQtHV2RX3kLMqXaEWVJgijagziLPXb6179mkml8WZA==}
+    engines: {node: '>=22.12.0'}
+    peerDependencies:
+      '@atproto/lex': ^0.3.0
+
   '@cacheable/memory@2.2.0':
     resolution: {integrity: sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==}
 
@@ -1734,6 +1785,14 @@ packages:
       '@emnapi/core': ^1.7.1 || ^2.0.0-alpha.3
       '@emnapi/runtime': ^1.7.1 || ^2.0.0-alpha.3
 
+  '@noble/curves@1.9.7':
+    resolution: {integrity: sha512-gbKGcRUYIjA3/zCCNaWDciTMFI0dCkvou3TL8Zmy5Nc7sJ47a0jtOeZoTaMxkuqRo9cRhjOdZJXegxYE5FN/xw==}
+    engines: {node: ^14.21.3 || >=16}
+
+  '@noble/hashes@1.8.0':
+    resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==}
+    engines: {node: ^14.21.3 || >=16}
+
   '@noble/hashes@2.2.0':
     resolution: {integrity: sha512-IYqDGiTXab6FniAgnSdZwgWbomxpy9FtYvLKs7wCUs2a8RkITG+DFGO1DM9cr+E3/RgADRpFjrKVaJ1z6sjtEg==}
     engines: {node: '>= 20.19.0'}
@@ -2463,6 +2522,9 @@ packages:
     resolution: {integrity: sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==}
     engines: {node: '>= 10.0.0'}
 
+  '@pinojs/redact@0.4.0':
+    resolution: {integrity: sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==}
+
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
@@ -2946,6 +3008,9 @@ packages:
       react:
         optional: true
 
+  '@ts-morph/common@0.28.1':
+    resolution: {integrity: sha512-W74iWf7ILp1ZKNYXY5qbddNaml7e9Sedv5lvU1V8lftlitkc9Pq1A+jlH23ltDgWYeZFFEqGCD1Ies9hqu3O+g==}
+
   '@tybys/wasm-util@0.10.3':
     resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
 
@@ -3684,6 +3749,10 @@ packages:
   async@3.2.6:
     resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
 
+  atomic-sleep@1.0.0:
+    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
+    engines: {node: '>=8.0.0'}
+
   autoprefixer@10.5.4:
     resolution: {integrity: sha512-MaU0U/za7N3r6brxD4YB/l4NSrFzLPlANv6wEuQVaIPlD3L4W9rFcQPbL/EilY9BHhHvhfcz3gInDLrEtWT4EA==}
     engines: {node: ^10 || ^12 || >=14}
@@ -3691,9 +3760,6 @@ packages:
     peerDependencies:
       postcss: ^8.1.0
 
-  await-lock@3.0.0:
-    resolution: {integrity: sha512-eO6fLiSnrJrMdjWMNK8zbVRXPs2TKJg78iKZd9wDpN3na5tcoV6EoeiOlMgk2QaAQ1gIrK1YuMsJHXWqz89tSA==}
-
   b4a@1.8.0:
     resolution: {integrity: sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==}
     peerDependencies:
@@ -3857,6 +3923,10 @@ packages:
   capnp-ts@0.7.0:
     resolution: {integrity: sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==}
 
+  cborg@4.5.8:
+    resolution: {integrity: sha512-6/viltD51JklRhq4L7jC3zgy6gryuG5xfZ3kzpE+PravtyeQLeQmCYLREhQH7pWENg5pY4Yu/XCd6a7dKScVlw==}
+    hasBin: true
+
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
@@ -3919,6 +3989,9 @@ packages:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
     engines: {node: '>=0.10.0'}
 
+  code-block-writer@13.0.3:
+    resolution: {integrity: sha512-Oofo0pq3IKnsFtuHqSF7TqBfr71aeyZDVJ0HpmqB7FBM2qEigL0iPONSCZSO9pE9dZTAxANe5XHG9Uy0YMv8cg==}
+
   color-convert@2.0.1:
     resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
     engines: {node: '>=7.0.0'}
@@ -5951,6 +6024,10 @@ packages:
     resolution: {integrity: sha512-08+12qcOVEA0fS9g/VxKS27HaT94nRutUT77J2dr8zv/unzXopvhBuF8tNLWsoLQ5IgrQ6eptGeGqUYat82U1w==}
     engines: {node: '>=20'}
 
+  on-exit-leak-free@2.1.2:
+    resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==}
+    engines: {node: '>=14.0.0'}
+
   on-finished@2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
     engines: {node: '>= 0.8'}
@@ -6124,6 +6201,16 @@ packages:
     resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
     engines: {node: '>=12'}
 
+  pino-abstract-transport@3.0.0:
+    resolution: {integrity: sha512-wlfUczU+n7Hy/Ha5j9a/gZNy7We5+cXp8YL+X+PG8S0KXxw7n/JXA3c46Y0zQznIJ83URJiwy7Lh56WLokNuxg==}
+
+  pino-std-serializers@7.1.0:
+    resolution: {integrity: sha512-BndPH67/JxGExRgiX1dX0w1FvZck5Wa4aal9198SrRhZjH3GxKQUKIBnYJTdj2HDN3UQAS06HlfcSbQj2OHmaw==}
+
+  pino@10.3.1:
+    resolution: {integrity: sha512-r34yH/GlQpKZbU1BvFFqOjhISRo1MNx1tWYsYvmj6KIRHSPMT2+yHOEb1SG6NMvRoHRF0a07kCOox/9yakl1vg==}
+    hasBin: true
+
   pkg-types@1.3.1:
     resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
 
@@ -6348,6 +6435,11 @@ packages:
     engines: {node: '>=14'}
     hasBin: true
 
+  prettier@3.9.6:
+    resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==}
+    engines: {node: '>=14'}
+    hasBin: true
+
   pretty-bytes@7.1.0:
     resolution: {integrity: sha512-nODzvTiYVRGRqAOvE84Vk5JDPyyxsVk0/fbA/bq7RqlnhksGpset09XTxbpvLTIjoaF7K8Z8DG8yHtKGTPSYRw==}
     engines: {node: '>=20'}
@@ -6358,6 +6450,9 @@ packages:
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
+  process-warning@5.1.0:
+    resolution: {integrity: sha512-jQSaVHsPgtyw60e1rQ/A+/ArPEj/S8pS/vFnyGa/gYFXrKk/6RuDkoqVDQ5NI5MmS01698ltlAk0NoDBNLujRw==}
+
   process@0.11.10:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
@@ -6400,6 +6495,9 @@ packages:
   queue-microtask@1.2.3:
     resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
+  quick-format-unescaped@4.0.4:
+    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
+
   quote-js-string@0.1.0:
     resolution: {integrity: sha512-Y3NoRtprEEZQD8RfxMCfS0ZTqc4e+i18OrXEXAvpM6TfC/3y+0L5rNbZiSnbBBEkDfFzbpd8o+cE8q3/anjMGA==}
     engines: {node: '>=22'}
@@ -6428,6 +6526,13 @@ packages:
     resolution: {integrity: sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==}
     engines: {node: '>= 20.19.0'}
 
+  real-require@0.2.0:
+    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
+    engines: {node: '>= 12.13.0'}
+
+  real-require@1.0.0:
+    resolution: {integrity: sha512-P4nbQYQfePJxRSmY+v/KINxVucm4NF3p3s7pJveMTtom52FR4YGltUQLB8idDXwDDWW+eYrWDFbuzUnjoWHF7g==}
+
   redis-errors@1.2.0:
     resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
     engines: {node: '>=4'}
@@ -6571,6 +6676,10 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
+  safe-stable-stringify@2.5.0:
+    resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
+    engines: {node: '>=10'}
+
   sax@1.6.0:
     resolution: {integrity: sha512-6R3J5M4AcbtLUdZmRv2SygeVaM7IhrLXu9BmnOGmmACak8fiUtOsYNWUS4uK7upbmHIBbLBeFeI//477BKLBzA==}
     engines: {node: '>=11.0.0'}
@@ -6710,6 +6819,9 @@ packages:
     resolution: {integrity: sha512-KAkBqZl3c2GvNgNhcoyJae1aKldDW0LO279wF9bk1PnluRTETKBq0WyzRXxEhoQLk56yHaOY4JCBEKDuJIET5g==}
     engines: {node: '>=20.0.0'}
 
+  sonic-boom@4.2.1:
+    resolution: {integrity: sha512-w6AxtubXa2wTXAUsZMMWERrsIRAdrK0Sc+FUytWvYAhBJLyuI4llrMIC1DtlNSdI99EI86KZum2MMq3EAZlF9Q==}
+
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
@@ -6741,6 +6853,10 @@ packages:
   spdx-license-ids@3.0.23:
     resolution: {integrity: sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==}
 
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
@@ -6982,6 +7098,10 @@ packages:
   text-decoder@1.2.7:
     resolution: {integrity: sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==}
 
+  thread-stream@4.2.0:
+    resolution: {integrity: sha512-e2zZ96wSChazBsbENf/Pcm/4swHt2cEKQ92rhUjkL9GCKiTDJIaTBenjE/m9DXi0QBmTMDkFDdOomUy20A1tDQ==}
+    engines: {node: '>=20'}
+
   throttleit@2.1.0:
     resolution: {integrity: sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==}
     engines: {node: '>=18'}
@@ -7062,6 +7182,9 @@ packages:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
 
+  ts-morph@27.0.2:
+    resolution: {integrity: sha512-fhUhgeljcrdZ+9DZND1De1029PrE+cMkIP7ooqkLRTrRLTqcki2AstsyJm0vRNbTbVCNJ0idGlbBrfqc7/nA8w==}
+
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -7091,6 +7214,9 @@ packages:
   ufo@1.6.4:
     resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
 
+  uint8arrays@5.1.1:
+    resolution: {integrity: sha512-9muQwa4wZG4dKi9gMAIBtnk2Pw87SRpvWTH6lOGm19V2Uqxr4uomUf2PGqPnWc+qs06sN8owUU4jfcoWOcfwVQ==}
+
   ultrahtml@1.7.0:
     resolution: {integrity: sha512-2xRd0VHoAQE4M+vF/DvFFB7pUV0ZxTW1TLi7lHQWnF/Sb5TPeEUV/l+hxcNnGO00ZXGnR0voCMmYRKQf+rvJ2g==}
 
@@ -7370,6 +7496,9 @@ packages:
       typescript:
         optional: true
 
+  varint@6.0.0:
+    resolution: {integrity: sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==}
+
   verkit@0.3.1:
     resolution: {integrity: sha512-w2Eo8LSIIoW7qxNBzT7/17k+bh8plXo7G3dHjEIDqPlnluhzaxr9JX8F28VSYEtDvc1/a3WBDih6xNUZseebXg==}
     engines: {node: '>=18.12.0'}
@@ -7829,17 +7958,6 @@ snapshots:
 
   '@atproto-labs/simple-store@0.5.1': {}
 
-  '@atproto/api@0.20.38':
-    dependencies:
-      '@atproto/common-web': 0.5.9
-      '@atproto/lexicon': 0.7.11
-      '@atproto/syntax': 0.7.4
-      '@atproto/xrpc': 0.8.10
-      await-lock: 3.0.0
-      multiformats: 13.4.2
-      tlds: 1.261.0
-      zod: 3.25.76
-
   '@atproto/common-web@0.5.9':
     dependencies:
       '@atproto/lex-data': 0.1.7
@@ -7847,6 +7965,20 @@ snapshots:
       '@atproto/syntax': 0.7.4
       zod: 3.25.76
 
+  '@atproto/common@0.7.6':
+    dependencies:
+      '@atproto/common-web': 0.5.9
+      '@atproto/lex-cbor': 0.1.6
+      '@atproto/lex-data': 0.1.7
+      multiformats: 13.4.2
+      pino: 10.3.1
+
+  '@atproto/crypto@0.5.4':
+    dependencies:
+      '@noble/curves': 1.9.7
+      '@noble/hashes': 1.8.0
+      uint8arrays: 5.1.1
+
   '@atproto/did@0.5.4':
     dependencies:
       zod: 3.25.76
@@ -7867,17 +7999,91 @@ snapshots:
       multiformats: 13.4.2
       zod: 3.25.76
 
+  '@atproto/lex-builder@0.1.12':
+    dependencies:
+      '@atproto/lex-document': 0.1.9
+      '@atproto/lex-schema': 0.2.5
+      prettier: 3.9.6
+      ts-morph: 27.0.2
+      tslib: 2.8.1
+
+  '@atproto/lex-cbor@0.1.6':
+    dependencies:
+      '@atproto/lex-data': 0.1.7
+      cborg: 4.5.8
+      tslib: 2.8.1
+
+  '@atproto/lex-client@0.3.3':
+    dependencies:
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-json': 0.1.6
+      '@atproto/lex-schema': 0.2.5
+      tslib: 2.8.1
+
   '@atproto/lex-data@0.1.7':
     dependencies:
       multiformats: 13.4.2
       tslib: 2.8.1
       unicode-segmenter: 0.14.5
 
+  '@atproto/lex-document@0.1.9':
+    dependencies:
+      '@atproto/lex-schema': 0.2.5
+      core-js: 3.49.0
+      tslib: 2.8.1
+
+  '@atproto/lex-installer@0.1.14':
+    dependencies:
+      '@atproto/lex-builder': 0.1.12
+      '@atproto/lex-cbor': 0.1.6
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-document': 0.1.9
+      '@atproto/lex-resolver': 0.2.7
+      '@atproto/lex-schema': 0.2.5
+      '@atproto/syntax': 0.7.4
+      tslib: 2.8.1
+
   '@atproto/lex-json@0.1.6':
     dependencies:
       '@atproto/lex-data': 0.1.7
       tslib: 2.8.1
 
+  '@atproto/lex-password-session@0.2.0':
+    dependencies:
+      '@atproto/lex-client': 0.3.3
+      '@atproto/lex-schema': 0.2.5
+      tslib: 2.8.1
+
+  '@atproto/lex-resolver@0.2.7':
+    dependencies:
+      '@atproto-labs/did-resolver': 0.3.7
+      '@atproto/crypto': 0.5.4
+      '@atproto/lex-client': 0.3.3
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-document': 0.1.9
+      '@atproto/lex-schema': 0.2.5
+      '@atproto/repo': 0.10.10
+      '@atproto/syntax': 0.7.4
+      tslib: 2.8.1
+
+  '@atproto/lex-schema@0.2.5':
+    dependencies:
+      '@atproto/lex-data': 0.1.7
+      '@atproto/syntax': 0.7.4
+      '@standard-schema/spec': 1.1.0
+      tslib: 2.8.1
+
+  '@atproto/lex@0.3.5':
+    dependencies:
+      '@atproto/lex-builder': 0.1.12
+      '@atproto/lex-client': 0.3.3
+      '@atproto/lex-data': 0.1.7
+      '@atproto/lex-installer': 0.1.14
+      '@atproto/lex-json': 0.1.6
+      '@atproto/lex-schema': 0.2.5
+      tslib: 2.8.1
+      yargs: 18.0.0
+
   '@atproto/lexicon@0.7.11':
     dependencies:
       '@atproto/common-web': 0.5.9
@@ -7919,6 +8125,17 @@ snapshots:
       '@atproto/jwk': 0.7.4
       zod: 3.25.76
 
+  '@atproto/repo@0.10.10':
+    dependencies:
+      '@atproto/common': 0.7.6
+      '@atproto/common-web': 0.5.9
+      '@atproto/crypto': 0.5.4
+      '@atproto/lex-cbor': 0.1.6
+      '@atproto/lex-data': 0.1.7
+      '@atproto/syntax': 0.7.4
+      varint: 6.0.0
+      zod: 3.25.76
+
   '@atproto/syntax@0.7.4':
     dependencies:
       iso-datestring-validator: 2.2.2
@@ -8123,6 +8340,13 @@ snapshots:
       cac: 7.0.0
       citty: 0.2.2
 
+  '@bsky/sdk@1.0.0(@atproto/lex@0.3.5)':
+    dependencies:
+      '@atproto-labs/handle-resolver': 0.4.8
+      '@atproto/lex': 0.3.5
+      '@atproto/syntax': 0.7.4
+      tlds: 1.261.0
+
   '@cacheable/memory@2.2.0':
     dependencies:
       '@cacheable/utils': 2.5.0
@@ -9070,6 +9294,12 @@ snapshots:
       '@tybys/wasm-util': 0.10.3
     optional: true
 
+  '@noble/curves@1.9.7':
+    dependencies:
+      '@noble/hashes': 1.8.0
+
+  '@noble/hashes@1.8.0': {}
+
   '@noble/hashes@2.2.0': {}
 
   '@nodelib/fs.scandir@2.1.5':
@@ -10099,6 +10329,8 @@ snapshots:
       '@parcel/watcher-win32-ia32': 2.5.6
       '@parcel/watcher-win32-x64': 2.5.6
 
+  '@pinojs/redact@0.4.0': {}
+
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
@@ -10434,6 +10666,12 @@ snapshots:
 
   '@takumi-rs/helpers@2.6.1': {}
 
+  '@ts-morph/common@0.28.1':
+    dependencies:
+      minimatch: 10.2.5
+      path-browserify: 1.0.1
+      tinyglobby: 0.2.17
+
   '@tybys/wasm-util@0.10.3':
     dependencies:
       tslib: 2.8.1
@@ -11399,6 +11637,8 @@ snapshots:
 
   async@3.2.6: {}
 
+  atomic-sleep@1.0.0: {}
+
   autoprefixer@10.5.4(postcss@8.5.26):
     dependencies:
       browserslist: 4.28.7
@@ -11408,8 +11648,6 @@ snapshots:
       postcss: 8.5.26
       postcss-value-parser: 4.2.0
 
-  await-lock@3.0.0: {}
-
   b4a@1.8.0: {}
 
   bail@2.0.2: {}
@@ -11564,6 +11802,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  cborg@4.5.8: {}
+
   ccount@2.0.1: {}
 
   chai@6.2.2: {}
@@ -11617,6 +11857,8 @@ snapshots:
 
   cluster-key-slot@1.1.2: {}
 
+  code-block-writer@13.0.3: {}
+
   color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
@@ -14135,6 +14377,8 @@ snapshots:
 
   on-change@6.0.2: {}
 
+  on-exit-leak-free@2.1.2: {}
+
   on-finished@2.4.1:
     dependencies:
       ee-first: 1.1.1
@@ -14377,6 +14621,26 @@ snapshots:
 
   picomatch@4.0.5: {}
 
+  pino-abstract-transport@3.0.0:
+    dependencies:
+      split2: 4.2.0
+
+  pino-std-serializers@7.1.0: {}
+
+  pino@10.3.1:
+    dependencies:
+      '@pinojs/redact': 0.4.0
+      atomic-sleep: 1.0.0
+      on-exit-leak-free: 2.1.2
+      pino-abstract-transport: 3.0.0
+      pino-std-serializers: 7.1.0
+      process-warning: 5.1.0
+      quick-format-unescaped: 4.0.4
+      real-require: 0.2.0
+      safe-stable-stringify: 2.5.0
+      sonic-boom: 4.2.1
+      thread-stream: 4.2.0
+
   pkg-types@1.3.1:
     dependencies:
       confbox: 0.1.8
@@ -14587,12 +14851,16 @@ snapshots:
 
   prettier@3.8.2: {}
 
+  prettier@3.9.6: {}
+
   pretty-bytes@7.1.0: {}
 
   printable-characters@1.0.42: {}
 
   process-nextick-args@2.0.1: {}
 
+  process-warning@5.1.0: {}
+
   process@0.11.10: {}
 
   prompts@2.4.2:
@@ -14628,6 +14896,8 @@ snapshots:
 
   queue-microtask@1.2.3: {}
 
+  quick-format-unescaped@4.0.4: {}
+
   quote-js-string@0.1.0: {}
 
   radix3@1.1.2: {}
@@ -14663,6 +14933,10 @@ snapshots:
 
   readdirp@5.0.0: {}
 
+  real-require@0.2.0: {}
+
+  real-require@1.0.0: {}
+
   redis-errors@1.2.0: {}
 
   redis-parser@3.0.0:
@@ -14847,6 +15121,8 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
+  safe-stable-stringify@2.5.0: {}
+
   sax@1.6.0: {}
 
   schema-utils@4.3.3:
@@ -15066,6 +15342,10 @@ snapshots:
 
   smob@1.6.1: {}
 
+  sonic-boom@4.2.1:
+    dependencies:
+      atomic-sleep: 1.0.0
+
   source-map-js@1.2.1: {}
 
   source-map-support@0.5.21:
@@ -15090,6 +15370,8 @@ snapshots:
 
   spdx-license-ids@3.0.23: {}
 
+  split2@4.2.0: {}
+
   sprintf-js@1.0.3: {}
 
   srvx@0.12.5: {}
@@ -15347,6 +15629,10 @@ snapshots:
     transitivePeerDependencies:
       - react-native-b4a
 
+  thread-stream@4.2.0:
+    dependencies:
+      real-require: 1.0.0
+
   throttleit@2.1.0: {}
 
   time-span@5.1.0:
@@ -15401,6 +15687,11 @@ snapshots:
 
   ts-dedent@2.2.0: {}
 
+  ts-morph@27.0.2:
+    dependencies:
+      '@ts-morph/common': 0.28.1
+      code-block-writer: 13.0.3
+
   tslib@2.8.1: {}
 
   type-check@0.4.0:
@@ -15421,6 +15712,10 @@ snapshots:
 
   ufo@1.6.4: {}
 
+  uint8arrays@5.1.1:
+    dependencies:
+      multiformats: 13.4.2
+
   ultrahtml@1.7.0: {}
 
   unconfig-core@7.5.0:
@@ -15736,6 +16031,8 @@ snapshots:
     optionalDependencies:
       typescript: 6.0.3
 
+  varint@6.0.0: {}
+
   verkit@0.3.1: {}
 
   vfile-message@4.0.3:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index e253de6c..62ef522b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -10,6 +10,7 @@ minimumReleaseAgeExclude:
   - '@comark/nuxt@0.6.1'
   - '@comark/vue@0.6.1'
   - comark@0.6.1
+  - '@bsky/sdk@1.0.0'
 
 overrides:
   '@nuxt/cli': 'npm:@nuxt/cli-nightly@4.0.0-20260809-091242-57da795'
diff --git a/scripts/gen-lex.mjs b/scripts/gen-lex.mjs
deleted file mode 100644
index ecf07ecb..00000000
--- a/scripts/gen-lex.mjs
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env node
-/**
- * Regenerate TS types from the lexicon JSON files under `lexicons/`.
- *
- * The generated `shared/lex/index.ts` (full XRPC client surface) is removed
- * after generation because we drive the PDS via `AtpAgent` from
- * `@atproto/api` and only need the per-record types and the validator
- * registry. A hand-written barrel is restored from this script.
- */
-import { spawn } from 'node:child_process'
-import { readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { join, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
-
-const here = fileURLToPath(new URL('.', import.meta.url))
-const root = resolve(here, '..')
-const lexRoot = join(root, 'lexicons')
-const outDir = join(root, 'shared/lex')
-
-const lexiconFiles = []
-function walk (dir) {
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    const full = join(dir, entry.name)
-    if (entry.isDirectory()) walk(full)
-    else if (entry.isFile() && entry.name.endsWith('.json')) lexiconFiles.push(full)
-  }
-}
-walk(lexRoot)
-
-if (!lexiconFiles.length) {
-  console.error('No lexicon JSON files found under', lexRoot)
-  process.exit(1)
-}
-
-console.log(`Generating types for ${lexiconFiles.length} lexicons → ${outDir}`)
-
-/**
- * `@atproto/lex-cli gen-api` prompts to overwrite each generated file. We
- * pipe a stream of `y\n` into its stdin instead of shelling out to
- * `yes y | …`, so lexicon paths containing spaces or shell metacharacters
- * can't break (or be abused to alter) the command line.
- */
-await new Promise((resolvePromise, reject) => {
-  const child = spawn(
-    'pnpm',
-    ['dlx', '@atproto/lex-cli', 'gen-api', outDir, ...lexiconFiles],
-    { stdio: ['pipe', 'inherit', 'inherit'], cwd: root },
-  )
-  const writeY = () => {
-    while (child.stdin.writable && child.stdin.write('y\n')) {
-      // keep filling the buffer until the kernel says back off
-    }
-  }
-  child.stdin.on('drain', writeY)
-  child.stdin.on('error', () => {})
-  writeY()
-  child.on('error', reject)
-  child.on('exit', code => {
-    child.stdin.end()
-    if (code === 0) resolvePromise()
-    else reject(new Error(`lex-cli exited with code ${code}`))
-  })
-})
-
-/**
- * Rewrite the generated relative-imports from `.js` to `.ts` so Node’s native
- * type-stripping (`node script.ts`) can resolve them at runtime without a
- * loader. TypeScript is configured with `allowImportingTsExtensions` to
- * accept the same shape at type-check time.
- */
-function rewriteJsToTs (dir) {
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    const full = join(dir, entry.name)
-    if (entry.isDirectory()) {
-      rewriteJsToTs(full)
-      continue
-    }
-    if (!entry.isFile() || !entry.name.endsWith('.ts')) continue
-    const src = readFileSync(full, 'utf8')
-    const next = src.replace(/((?:from|import)\s+['"])((?:\.{1,2}\/)[^'"]+?)\.js(['"])/g, '$1$2.ts$3')
-    if (next !== src) writeFileSync(full, next)
-  }
-}
-rewriteJsToTs(outDir)
-
-const generatedClient = join(outDir, 'index.ts')
-rmSync(generatedClient, { force: true })
-
-/**
- * Build the namespace-export lines by scanning the generated `types/`
- * tree, so adding a new lexicon JSON doesn't need a matching edit to this
- * script.
- */
-function collectNamespaceExports (dir, prefix = '') {
-  const lines = []
-  for (const entry of readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
-    const full = join(dir, entry.name)
-    if (entry.isDirectory()) {
-      lines.push(...collectNamespaceExports(full, `${prefix}${capitalise(entry.name)}`))
-      continue
-    }
-    if (!entry.isFile() || !entry.name.endsWith('.ts')) continue
-    const base = entry.name.replace(/\.ts$/, '')
-    const namespace = `${prefix}${capitalise(base)}`
-    const relPath = `./types/${full.slice(typesRoot.length + 1).replace(/\\/g, '/')}`
-    lines.push(`export * as ${namespace} from '${relPath}'`)
-  }
-  return lines
-}
-function capitalise (s) {
-  return s.charAt(0).toUpperCase() + s.slice(1)
-}
-const typesRoot = join(outDir, 'types')
-const namespaceLines = collectNamespaceExports(typesRoot).join('\n')
-
-const barrel = `/**
- * Auto-generated barrel for the dev.roe lexicons. Re-run \`pnpm lex:gen\` to
- * refresh after adding or removing lexicon JSON files.
- *
- * The generated \`gen-api\` client surface was deleted because we drive the PDS
- * via the existing \`AtpAgent\` from \`@atproto/api\`; we only need the typed
- * record interfaces and the validator registry.
- */
-export { schemas, lexicons, validate, schemaDict } from './lexicons.ts'
-export type { $Typed, Un$Typed, OmitKey } from './util.ts'
-
-${namespaceLines}
-`
-writeFileSync(generatedClient, barrel)
-
-console.log('Done. Barrel written to', generatedClient)
diff --git a/scripts/publish-lex.ts b/scripts/publish-lex.ts
index 05a1b17c..6c388b75 100644
--- a/scripts/publish-lex.ts
+++ b/scripts/publish-lex.ts
@@ -28,7 +28,9 @@ import { join, resolve } from 'node:path'
 import process from 'node:process'
 import { fileURLToPath } from 'node:url'
 
-import { AtpAgent } from '@atproto/api'
+import { Client, asStringFormat } from '@atproto/lex'
+import type { LexMap } from '@atproto/lex'
+import { PasswordSession } from '@atproto/lex-password-session'
 import { defineCommand, runMain } from 'citty'
 
 const root = resolve(fileURLToPath(new URL('.', import.meta.url)), '..')
@@ -107,11 +109,11 @@ async function resolvePdsEndpoint (did: string): Promise<string> {
  */
 function toSchemaRecord (doc: Record<string, unknown>) {
   return {
-    $type: 'com.atproto.lexicon.schema',
+    $type: 'com.atproto.lexicon.schema' as const,
     lexicon: doc.lexicon,
     id: doc.id,
     defs: doc.defs,
-  }
+  } as LexMap & { $type: 'com.atproto.lexicon.schema' }
 }
 
 function isEqual (a: unknown, b: unknown): boolean {
@@ -150,24 +152,20 @@ const main = defineCommand({
     }
 
     const domain = authorityDomain(OWNED_AUTHORITIES[0]!)
-    const did = args.did || process.env.NUXT_ATPROTO_DID || await resolveDid(domain)
+    const did = asStringFormat(args.did || process.env.NUXT_ATPROTO_DID || await resolveDid(domain), 'did')
     const service = process.env.NUXT_PUBLIC_ATPROTO_SERVICE || await resolvePdsEndpoint(did)
     console.log(`${did} @ ${service}\n`)
 
-    const agent = new AtpAgent({ service })
-    await agent.login({ identifier: did, password })
+    const session = await PasswordSession.login({ service, identifier: did, password })
+    const client = new Client(session)
 
     for (const { nsid, doc } of lexicons.sort((a, b) => a.nsid.localeCompare(b.nsid))) {
       const record = toSchemaRecord(doc)
 
       let existing: unknown
       try {
-        const res = await agent.com.atproto.repo.getRecord({
-          repo: did,
-          collection: 'com.atproto.lexicon.schema',
-          rkey: nsid,
-        })
-        existing = res.data.value
+        const res = await client.getRecord('com.atproto.lexicon.schema', nsid, { repo: did })
+        existing = res.body.value
       }
       catch {
         existing = undefined
@@ -184,13 +182,7 @@ const main = defineCommand({
         continue
       }
 
-      await agent.com.atproto.repo.putRecord({
-        repo: did,
-        collection: 'com.atproto.lexicon.schema',
-        rkey: nsid,
-        record,
-        validate: false,
-      })
+      await client.putRecord(record, nsid, { repo: did, validate: false })
       console.log(`🟢 ${verb}d  ${nsid}`)
     }
 
diff --git a/server/api/admin/ama/[rkey].delete.ts b/server/api/admin/ama/[rkey].delete.ts
index 98c42b2e..6234ad52 100644
--- a/server/api/admin/ama/[rkey].delete.ts
+++ b/server/api/admin/ama/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.ama', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.ama.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/ama/[rkey].get.ts b/server/api/admin/ama/[rkey].get.ts
index 0b5bb921..914421c4 100644
--- a/server/api/admin/ama/[rkey].get.ts
+++ b/server/api/admin/ama/[rkey].get.ts
@@ -1,7 +1,8 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
 import { viewAma } from '../../../utils/admin/ama-record'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const r = await getAdminRecord(event, 'dev.roe.ama', getRouterParam(event, 'rkey'))
+  const r = await getAdminRecord(event, dev.roe.ama.main, getRouterParam(event, 'rkey'))
   return viewAma(r)
 })
diff --git a/server/api/admin/ama/index.get.ts b/server/api/admin/ama/index.get.ts
index 3c2c9681..3fa40e26 100644
--- a/server/api/admin/ama/index.get.ts
+++ b/server/api/admin/ama/index.get.ts
@@ -1,10 +1,10 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
 import { viewAma } from '../../../utils/admin/ama-record'
-import type { DevRoeAma } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const records = await listAdminRecords(event, 'dev.roe.ama', {
-    sortBy: r => -new Date((r.value as DevRoeAma.Record).createdAt).getTime(),
+  const records = await listAdminRecords(event, dev.roe.ama.main, {
+    sortBy: r => -new Date((r.value as dev.roe.ama.Main).createdAt).getTime(),
   })
   return records.map(viewAma)
 })
diff --git a/server/api/admin/auth/callback.get.ts b/server/api/admin/auth/callback.get.ts
index a918282e..57c4c782 100644
--- a/server/api/admin/auth/callback.get.ts
+++ b/server/api/admin/auth/callback.get.ts
@@ -1,4 +1,5 @@
-import { Agent } from '@atproto/api'
+import { Client } from '@atproto/lex'
+import { com } from '@bsky/sdk/lexicons'
 
 import {
   clearAdminSessionCookie,
@@ -20,8 +21,7 @@ export default defineEventHandler(async event => {
     throw createError({ statusCode: 401, statusMessage: 'OAuth callback failed.' })
   }
 
-  const profile = await new Agent(session).com.atproto.repo.describeRepo({ repo: session.did })
-  const handle = profile.data.handle
+  const { handle } = await new Client(session).call(com.atproto.repo.describeRepo, { repo: session.did })
 
   if (handle !== expectedHandle) {
     await client.revoke(session.did).catch(() => {})
diff --git a/server/api/admin/blobs.post.ts b/server/api/admin/blobs.post.ts
index bfa121d2..d84c1e24 100644
--- a/server/api/admin/blobs.post.ts
+++ b/server/api/admin/blobs.post.ts
@@ -1,4 +1,4 @@
-import { requireAdminAgent } from '../../utils/admin/agent'
+import { requireAdminClient } from '../../utils/admin/client'
 
 /**
  * Upload bytes to the PDS and return `{ blob, aspectRatio? }`. The server
@@ -20,13 +20,13 @@ export default defineEventHandler(async event => {
     ? new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength)
     : new Uint8Array(buf)
 
-  const { agent } = await requireAdminAgent(event)
+  const { client } = await requireAdminClient(event)
   const [res, aspectRatio] = await Promise.all([
-    agent.com.atproto.repo.uploadBlob(bytes, { encoding: contentType }),
+    client.uploadBlob(bytes, { encoding: contentType as `${string}/${string}` }),
     probeAspectRatio(bytes, contentType),
   ])
   return {
-    blob: res.data.blob,
+    blob: res.body.blob,
     ...(aspectRatio ? { aspectRatio } : {}),
   }
 })
diff --git a/server/api/admin/entities/[rkey].delete.ts b/server/api/admin/entities/[rkey].delete.ts
index 70104f69..adb704ec 100644
--- a/server/api/admin/entities/[rkey].delete.ts
+++ b/server/api/admin/entities/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.entity', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.entity.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/entities/[rkey].get.ts b/server/api/admin/entities/[rkey].get.ts
index 8f3f75ac..6ae1e106 100644
--- a/server/api/admin/entities/[rkey].get.ts
+++ b/server/api/admin/entities/[rkey].get.ts
@@ -1,5 +1,6 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return getAdminRecord(event, 'dev.roe.entity', getRouterParam(event, 'rkey'))
+  return getAdminRecord(event, dev.roe.entity.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/entities/[rkey].put.ts b/server/api/admin/entities/[rkey].put.ts
index 1d44ee88..39ca62fa 100644
--- a/server/api/admin/entities/[rkey].put.ts
+++ b/server/api/admin/entities/[rkey].put.ts
@@ -1,7 +1,7 @@
 import { updateAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeEntity } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeEntity.Record, '$type'>>(event)
-  return updateAdminRecord(event, 'dev.roe.entity', getRouterParam(event, 'rkey'), body)
+  const body = await readBody<Omit<dev.roe.entity.Main, '$type'>>(event)
+  return updateAdminRecord(event, dev.roe.entity.main, getRouterParam(event, 'rkey'), body)
 })
diff --git a/server/api/admin/entities/index.get.ts b/server/api/admin/entities/index.get.ts
index f4107e00..6bce5c30 100644
--- a/server/api/admin/entities/index.get.ts
+++ b/server/api/admin/entities/index.get.ts
@@ -1,7 +1,8 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return listAdminRecords(event, 'dev.roe.entity', {
+  return listAdminRecords(event, dev.roe.entity.main, {
     sortBy: r => r.value.name,
   })
 })
diff --git a/server/api/admin/entities/index.post.ts b/server/api/admin/entities/index.post.ts
index 7cc0d881..5e505a72 100644
--- a/server/api/admin/entities/index.post.ts
+++ b/server/api/admin/entities/index.post.ts
@@ -1,7 +1,7 @@
 import { createAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeEntity } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeEntity.Record, '$type' | 'createdAt'>>(event)
-  return createAdminRecord(event, 'dev.roe.entity', body)
+  const body = await readBody<Omit<dev.roe.entity.Main, '$type' | 'createdAt'>>(event)
+  return createAdminRecord(event, dev.roe.entity.main, body)
 })
diff --git a/server/api/admin/github-releases.get.ts b/server/api/admin/github-releases.get.ts
index de0b928e..aae928d8 100644
--- a/server/api/admin/github-releases.get.ts
+++ b/server/api/admin/github-releases.get.ts
@@ -1,7 +1,7 @@
 /**
  * List releases from danielroe/slides for the talk-editor slides datalist.
  */
-import { requireAdminAgent } from '../../utils/admin/agent'
+import { requireAdminClient } from '../../utils/admin/client'
 
 interface GitHubRelease {
   tag_name: string
@@ -11,7 +11,7 @@ interface GitHubRelease {
 }
 
 export default defineEventHandler(async event => {
-  await requireAdminAgent(event)
+  await requireAdminClient(event)
 
   const config = useRuntimeConfig(event)
   if (!config.github.token) {
diff --git a/server/api/admin/invites/[rkey].delete.ts b/server/api/admin/invites/[rkey].delete.ts
index 02277612..da33fa59 100644
--- a/server/api/admin/invites/[rkey].delete.ts
+++ b/server/api/admin/invites/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.invite', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.invite.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/invites/[rkey].get.ts b/server/api/admin/invites/[rkey].get.ts
index c1f88672..1fa33f83 100644
--- a/server/api/admin/invites/[rkey].get.ts
+++ b/server/api/admin/invites/[rkey].get.ts
@@ -1,7 +1,8 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
 import { decryptInvite } from '../../../utils/admin/invites'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const r = await getAdminRecord(event, 'dev.roe.invite', getRouterParam(event, 'rkey'))
+  const r = await getAdminRecord(event, dev.roe.invite.main, getRouterParam(event, 'rkey'))
   return decryptInvite(r)
 })
diff --git a/server/api/admin/invites/[rkey].put.ts b/server/api/admin/invites/[rkey].put.ts
index d9cdc442..c008ae43 100644
--- a/server/api/admin/invites/[rkey].put.ts
+++ b/server/api/admin/invites/[rkey].put.ts
@@ -1,5 +1,6 @@
 import { updateAdminRecord } from '../../../utils/admin/crud'
 import { encryptJSON } from '../../../utils/admin/encryption'
+import { dev } from '#shared/lex'
 
 interface Body {
   slug: string
@@ -13,7 +14,7 @@ export default defineEventHandler(async event => {
   if (!body.slug || !body.repo) {
     throw createError({ statusCode: 422, statusMessage: 'slug and repo are required.' })
   }
-  return updateAdminRecord(event, 'dev.roe.invite', getRouterParam(event, 'rkey'), {
+  return updateAdminRecord(event, dev.roe.invite.main, getRouterParam(event, 'rkey'), {
     encrypted: encryptJSON({ slug: body.slug, repo: body.repo }),
     isActive: Boolean(body.isActive),
     ...(body.createdAt ? { createdAt: body.createdAt } : {}),
diff --git a/server/api/admin/invites/index.get.ts b/server/api/admin/invites/index.get.ts
index 22b24c11..ca3bc68b 100644
--- a/server/api/admin/invites/index.get.ts
+++ b/server/api/admin/invites/index.get.ts
@@ -1,10 +1,10 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
 import { decryptInvite } from '../../../utils/admin/invites'
-import type { DevRoeInvite } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const records = await listAdminRecords(event, 'dev.roe.invite', {
-    sortBy: r => -new Date((r.value as DevRoeInvite.Record).createdAt).getTime(),
+  const records = await listAdminRecords(event, dev.roe.invite.main, {
+    sortBy: r => -new Date((r.value as dev.roe.invite.Main).createdAt).getTime(),
   })
   return records.map(decryptInvite)
 })
diff --git a/server/api/admin/invites/index.post.ts b/server/api/admin/invites/index.post.ts
index 20aca109..33ab95d2 100644
--- a/server/api/admin/invites/index.post.ts
+++ b/server/api/admin/invites/index.post.ts
@@ -1,5 +1,6 @@
 import { createAdminRecord } from '../../../utils/admin/crud'
 import { encryptJSON } from '../../../utils/admin/encryption'
+import { dev } from '#shared/lex'
 
 interface Body {
   slug: string
@@ -12,7 +13,7 @@ export default defineEventHandler(async event => {
   if (!body.slug || !body.repo) {
     throw createError({ statusCode: 422, statusMessage: 'slug and repo are required.' })
   }
-  return createAdminRecord(event, 'dev.roe.invite', {
+  return createAdminRecord(event, dev.roe.invite.main, {
     encrypted: encryptJSON({ slug: body.slug, repo: body.repo }),
     isActive: Boolean(body.isActive),
   })
diff --git a/server/api/admin/location.get.ts b/server/api/admin/location.get.ts
index bf08b69e..5cf1a526 100644
--- a/server/api/admin/location.get.ts
+++ b/server/api/admin/location.get.ts
@@ -1,8 +1,9 @@
 import { getAdminRecord } from '../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
   try {
-    return await getAdminRecord(event, 'dev.roe.location', 'self')
+    return await getAdminRecord(event, dev.roe.location.main, 'self')
   }
   catch (err) {
     if (err && typeof err === 'object' && 'statusCode' in err && (err as { statusCode: number }).statusCode === 404) {
diff --git a/server/api/admin/location.put.ts b/server/api/admin/location.put.ts
index a83d4aa3..a6ee7ed0 100644
--- a/server/api/admin/location.put.ts
+++ b/server/api/admin/location.put.ts
@@ -1,7 +1,7 @@
 import { createAdminRecord } from '../../utils/admin/crud'
-import type { DevRoeLocation } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeLocation.Record, '$type' | 'createdAt'>>(event)
-  return createAdminRecord(event, 'dev.roe.location', body, 'self')
+  const body = await readBody<Omit<dev.roe.location.Main, '$type' | 'createdAt'>>(event)
+  return createAdminRecord(event, dev.roe.location.main, body, 'self')
 })
diff --git a/server/api/admin/stats.get.ts b/server/api/admin/stats.get.ts
index a54e9cfa..925eb5bf 100644
--- a/server/api/admin/stats.get.ts
+++ b/server/api/admin/stats.get.ts
@@ -1,38 +1,28 @@
-import { requireAdminAgent } from '../../utils/admin/agent'
+import type { Client, RecordSchema } from '@atproto/lex'
+
+import { requireAdminClient } from '../../utils/admin/client'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const { agent, did } = await requireAdminAgent(event)
+  const { client, did } = await requireAdminClient(event)
 
-  const count = async (collection: string): Promise<number> => {
-    // Cheapest path: list with limit=1 and rely on cursor to know whether
-    // more exist. For accurate counts (small collections) we paginate.
+  const count = async (schema: RecordSchema): Promise<number> => {
     let total = 0
-    let cursor: string | undefined
-    while (true) {
-      const res = await agent.com.atproto.repo.listRecords({
-        repo: did,
-        collection,
-        limit: 100,
-        cursor,
-      })
-      total += res.data.records.length
-      if (!res.data.cursor || res.data.records.length < 100) break
-      cursor = res.data.cursor
-    }
+    for await (const _ of (client as Client).listAll(schema, { repo: did, limit: 100 })) total++
     return total
   }
 
   const [talks, talkGroups, usesCategories, usesItems] = await Promise.all([
-    count('dev.roe.talk'),
-    count('dev.roe.talkGroup'),
-    count('dev.roe.usesCategory'),
-    count('dev.roe.usesItem'),
+    count(dev.roe.talk.main),
+    count(dev.roe.talkGroup.main),
+    count(dev.roe.usesCategory.main),
+    count(dev.roe.usesItem.main),
   ])
 
   // Location is a singleton; check by attempting to fetch `self`.
   let hasLocation = false
   try {
-    await agent.com.atproto.repo.getRecord({ repo: did, collection: 'dev.roe.location', rkey: 'self' })
+    await client.getRecord('dev.roe.location', 'self', { repo: did })
     hasLocation = true
   }
   catch { /* missing record → false */ }
diff --git a/server/api/admin/talk-groups/[rkey].delete.ts b/server/api/admin/talk-groups/[rkey].delete.ts
index daa848d1..41d0ab0a 100644
--- a/server/api/admin/talk-groups/[rkey].delete.ts
+++ b/server/api/admin/talk-groups/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.talkGroup', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.talkGroup.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/talk-groups/[rkey].get.ts b/server/api/admin/talk-groups/[rkey].get.ts
index 6832808b..2192a57e 100644
--- a/server/api/admin/talk-groups/[rkey].get.ts
+++ b/server/api/admin/talk-groups/[rkey].get.ts
@@ -1,5 +1,6 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return getAdminRecord(event, 'dev.roe.talkGroup', getRouterParam(event, 'rkey'))
+  return getAdminRecord(event, dev.roe.talkGroup.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/talk-groups/[rkey].put.ts b/server/api/admin/talk-groups/[rkey].put.ts
index abfd9b9c..8d269b45 100644
--- a/server/api/admin/talk-groups/[rkey].put.ts
+++ b/server/api/admin/talk-groups/[rkey].put.ts
@@ -1,7 +1,7 @@
 import { updateAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeTalkGroup } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeTalkGroup.Record, '$type'>>(event)
-  return updateAdminRecord(event, 'dev.roe.talkGroup', getRouterParam(event, 'rkey'), body)
+  const body = await readBody<Omit<dev.roe.talkGroup.Main, '$type'>>(event)
+  return updateAdminRecord(event, dev.roe.talkGroup.main, getRouterParam(event, 'rkey'), body)
 })
diff --git a/server/api/admin/talk-groups/index.get.ts b/server/api/admin/talk-groups/index.get.ts
index ec88588d..0eeeadb1 100644
--- a/server/api/admin/talk-groups/index.get.ts
+++ b/server/api/admin/talk-groups/index.get.ts
@@ -1,7 +1,8 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return listAdminRecords(event, 'dev.roe.talkGroup', {
+  return listAdminRecords(event, dev.roe.talkGroup.main, {
     sortBy: r => r.value.title,
   })
 })
diff --git a/server/api/admin/talk-groups/index.post.ts b/server/api/admin/talk-groups/index.post.ts
index 9df5c409..0d71d095 100644
--- a/server/api/admin/talk-groups/index.post.ts
+++ b/server/api/admin/talk-groups/index.post.ts
@@ -1,7 +1,7 @@
 import { createAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeTalkGroup } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeTalkGroup.Record, '$type' | 'createdAt'>>(event)
-  return createAdminRecord(event, 'dev.roe.talkGroup', body)
+  const body = await readBody<Omit<dev.roe.talkGroup.Main, '$type' | 'createdAt'>>(event)
+  return createAdminRecord(event, dev.roe.talkGroup.main, body)
 })
diff --git a/server/api/admin/talks/[rkey].delete.ts b/server/api/admin/talks/[rkey].delete.ts
index 0be594f9..51363820 100644
--- a/server/api/admin/talks/[rkey].delete.ts
+++ b/server/api/admin/talks/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.talk', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.talk.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/talks/[rkey].get.ts b/server/api/admin/talks/[rkey].get.ts
index 203ce2b0..785b8104 100644
--- a/server/api/admin/talks/[rkey].get.ts
+++ b/server/api/admin/talks/[rkey].get.ts
@@ -1,5 +1,6 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return getAdminRecord(event, 'dev.roe.talk', getRouterParam(event, 'rkey'))
+  return getAdminRecord(event, dev.roe.talk.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/talks/[rkey].put.ts b/server/api/admin/talks/[rkey].put.ts
index 425aa567..83a85371 100644
--- a/server/api/admin/talks/[rkey].put.ts
+++ b/server/api/admin/talks/[rkey].put.ts
@@ -1,7 +1,7 @@
 import { updateAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeTalk } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeTalk.Record, '$type'>>(event)
-  return updateAdminRecord(event, 'dev.roe.talk', getRouterParam(event, 'rkey'), body)
+  const body = await readBody<Omit<dev.roe.talk.Main, '$type'>>(event)
+  return updateAdminRecord(event, dev.roe.talk.main, getRouterParam(event, 'rkey'), body)
 })
diff --git a/server/api/admin/talks/index.get.ts b/server/api/admin/talks/index.get.ts
index 3abd330f..6a63ed1a 100644
--- a/server/api/admin/talks/index.get.ts
+++ b/server/api/admin/talks/index.get.ts
@@ -1,7 +1,8 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return listAdminRecords(event, 'dev.roe.talk', {
+  return listAdminRecords(event, dev.roe.talk.main, {
     sortBy: r => r.value.date ?? '',
   }).then(rs => rs.reverse())
 })
diff --git a/server/api/admin/talks/index.post.ts b/server/api/admin/talks/index.post.ts
index 5186a04a..125653ae 100644
--- a/server/api/admin/talks/index.post.ts
+++ b/server/api/admin/talks/index.post.ts
@@ -1,7 +1,7 @@
 import { createAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeTalk } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeTalk.Record, '$type' | 'createdAt'>>(event)
-  return createAdminRecord(event, 'dev.roe.talk', body)
+  const body = await readBody<Omit<dev.roe.talk.Main, '$type' | 'createdAt'>>(event)
+  return createAdminRecord(event, dev.roe.talk.main, body)
 })
diff --git a/server/api/admin/uses-categories/[rkey].delete.ts b/server/api/admin/uses-categories/[rkey].delete.ts
index 1107b159..d8e2776c 100644
--- a/server/api/admin/uses-categories/[rkey].delete.ts
+++ b/server/api/admin/uses-categories/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.usesCategory', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.usesCategory.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/uses-categories/[rkey].get.ts b/server/api/admin/uses-categories/[rkey].get.ts
index 1d1a319f..980ddb5b 100644
--- a/server/api/admin/uses-categories/[rkey].get.ts
+++ b/server/api/admin/uses-categories/[rkey].get.ts
@@ -1,5 +1,6 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return getAdminRecord(event, 'dev.roe.usesCategory', getRouterParam(event, 'rkey'))
+  return getAdminRecord(event, dev.roe.usesCategory.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/uses-categories/[rkey].put.ts b/server/api/admin/uses-categories/[rkey].put.ts
index 06fd4f66..6593122c 100644
--- a/server/api/admin/uses-categories/[rkey].put.ts
+++ b/server/api/admin/uses-categories/[rkey].put.ts
@@ -1,7 +1,7 @@
 import { updateAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeUsesCategory } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeUsesCategory.Record, '$type'>>(event)
-  return updateAdminRecord(event, 'dev.roe.usesCategory', getRouterParam(event, 'rkey'), body)
+  const body = await readBody<Omit<dev.roe.usesCategory.Main, '$type'>>(event)
+  return updateAdminRecord(event, dev.roe.usesCategory.main, getRouterParam(event, 'rkey'), body)
 })
diff --git a/server/api/admin/uses-categories/index.get.ts b/server/api/admin/uses-categories/index.get.ts
index 832ba43e..24656970 100644
--- a/server/api/admin/uses-categories/index.get.ts
+++ b/server/api/admin/uses-categories/index.get.ts
@@ -1,7 +1,8 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return listAdminRecords(event, 'dev.roe.usesCategory', {
+  return listAdminRecords(event, dev.roe.usesCategory.main, {
     sortBy: r => r.value.order ?? 100,
   })
 })
diff --git a/server/api/admin/uses-categories/index.post.ts b/server/api/admin/uses-categories/index.post.ts
index 2df298c3..8dd29a47 100644
--- a/server/api/admin/uses-categories/index.post.ts
+++ b/server/api/admin/uses-categories/index.post.ts
@@ -1,7 +1,7 @@
 import { createAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeUsesCategory } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeUsesCategory.Record, '$type' | 'createdAt'>>(event)
-  return createAdminRecord(event, 'dev.roe.usesCategory', body)
+  const body = await readBody<Omit<dev.roe.usesCategory.Main, '$type' | 'createdAt'>>(event)
+  return createAdminRecord(event, dev.roe.usesCategory.main, body)
 })
diff --git a/server/api/admin/uses-items/[rkey].delete.ts b/server/api/admin/uses-items/[rkey].delete.ts
index 7a3a20bd..248a404e 100644
--- a/server/api/admin/uses-items/[rkey].delete.ts
+++ b/server/api/admin/uses-items/[rkey].delete.ts
@@ -1,5 +1,6 @@
 import { deleteAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return deleteAdminRecord(event, 'dev.roe.usesItem', getRouterParam(event, 'rkey'))
+  return deleteAdminRecord(event, dev.roe.usesItem.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/uses-items/[rkey].get.ts b/server/api/admin/uses-items/[rkey].get.ts
index 8e0a2008..0a909b0e 100644
--- a/server/api/admin/uses-items/[rkey].get.ts
+++ b/server/api/admin/uses-items/[rkey].get.ts
@@ -1,5 +1,6 @@
 import { getAdminRecord } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return getAdminRecord(event, 'dev.roe.usesItem', getRouterParam(event, 'rkey'))
+  return getAdminRecord(event, dev.roe.usesItem.main, getRouterParam(event, 'rkey'))
 })
diff --git a/server/api/admin/uses-items/[rkey].put.ts b/server/api/admin/uses-items/[rkey].put.ts
index 8dfc2701..164b5caf 100644
--- a/server/api/admin/uses-items/[rkey].put.ts
+++ b/server/api/admin/uses-items/[rkey].put.ts
@@ -1,7 +1,7 @@
 import { updateAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeUsesItem } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeUsesItem.Record, '$type'>>(event)
-  return updateAdminRecord(event, 'dev.roe.usesItem', getRouterParam(event, 'rkey'), body)
+  const body = await readBody<Omit<dev.roe.usesItem.Main, '$type'>>(event)
+  return updateAdminRecord(event, dev.roe.usesItem.main, getRouterParam(event, 'rkey'), body)
 })
diff --git a/server/api/admin/uses-items/index.get.ts b/server/api/admin/uses-items/index.get.ts
index 8fdc414f..c1215db5 100644
--- a/server/api/admin/uses-items/index.get.ts
+++ b/server/api/admin/uses-items/index.get.ts
@@ -1,7 +1,8 @@
 import { listAdminRecords } from '../../../utils/admin/crud'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(event => {
-  return listAdminRecords(event, 'dev.roe.usesItem', {
+  return listAdminRecords(event, dev.roe.usesItem.main, {
     sortBy: r => r.value.order ?? 100,
   })
 })
diff --git a/server/api/admin/uses-items/index.post.ts b/server/api/admin/uses-items/index.post.ts
index 3becf1c9..fdad3ba7 100644
--- a/server/api/admin/uses-items/index.post.ts
+++ b/server/api/admin/uses-items/index.post.ts
@@ -1,7 +1,7 @@
 import { createAdminRecord } from '../../../utils/admin/crud'
-import type { DevRoeUsesItem } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
-  const body = await readBody<Omit<DevRoeUsesItem.Record, '$type' | 'createdAt'>>(event)
-  return createAdminRecord(event, 'dev.roe.usesItem', body)
+  const body = await readBody<Omit<dev.roe.usesItem.Main, '$type' | 'createdAt'>>(event)
+  return createAdminRecord(event, dev.roe.usesItem.main, body)
 })
diff --git a/server/api/question.ts b/server/api/question.ts
index 93abb240..0c5f9676 100644
--- a/server/api/question.ts
+++ b/server/api/question.ts
@@ -1,10 +1,9 @@
-import { TID } from '@atproto/common-web'
-import { AtpAgent } from '@atproto/api'
+import { Client, currentDatetimeString } from '@atproto/lex'
+import { PasswordSession } from '@atproto/lex-password-session'
 
 import { sendPushoverNotification } from '../utils/pushover'
 import { encrypt } from '../utils/admin/encryption'
-import { lexicons } from '#shared/lex'
-import type { DevRoeAma } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export default defineEventHandler(async event => {
   if (event.method === 'OPTIONS') return null
@@ -34,21 +33,14 @@ export default defineEventHandler(async event => {
 })
 
 async function persistQuestion (question: string, config: ReturnType<typeof useRuntimeConfig>) {
-  const record: DevRoeAma.Record = {
-    $type: 'dev.roe.ama',
+  const session = await PasswordSession.login({
+    service: config.public.atproto.service,
+    identifier: config.atproto.handle,
+    password: config.atproto.password,
+  })
+  await new Client(session).create(dev.roe.ama.main, {
     status: 'unanswered',
     encryptedQuestion: encrypt(question),
-    createdAt: new Date().toISOString(),
-  }
-  const validation = lexicons.validate('dev.roe.ama', record)
-  if (!validation.success) throw new Error(validation.error.message)
-
-  const agent = new AtpAgent({ service: config.public.atproto.service })
-  await agent.login({ identifier: config.atproto.handle, password: config.atproto.password })
-  await agent.com.atproto.repo.putRecord({
-    repo: agent.session!.did,
-    collection: 'dev.roe.ama',
-    rkey: TID.nextStr(),
-    record: record as Record<string, unknown>,
-  })
+    createdAt: currentDatetimeString(),
+  }, { validateRequest: true })
 }
diff --git a/server/utils/admin/ama-mentions.ts b/server/utils/admin/ama-mentions.ts
index 18a9b58e..44be6fc5 100644
--- a/server/utils/admin/ama-mentions.ts
+++ b/server/utils/admin/ama-mentions.ts
@@ -17,15 +17,16 @@
  *   - Bluesky: keeps the label visible with a facet on the label range.
  *   - Mastodon / LinkedIn: `label (url)`.
  */
-import type { AppBskyRichtextFacet } from '@atproto/api'
+import type { DidString, UriString } from '@atproto/lex'
+import type { app } from '@bsky/sdk/lexicons'
 
-import type { DevRoeEntity } from '#shared/lex'
+import type { dev } from '#shared/lex'
 
 export type Platform = 'bluesky' | 'mastodon' | 'linkedin'
 
 export interface EntityLookup {
   /** Entity rkey → record value. */
-  byRkey: Map<string, DevRoeEntity.Record>
+  byRkey: Map<string, dev.roe.entity.Main>
 }
 
 const MENTION_RE = /@([a-z0-9]{13})\b/g
@@ -89,8 +90,8 @@ export function resolveForPlatform (
 export function resolveBluesky (
   text: string,
   entities: EntityLookup,
-): { text: string, facets: AppBskyRichtextFacet.Main[] } {
-  const facets: AppBskyRichtextFacet.Main[] = []
+): { text: string, facets: app.bsky.richtext.facet.Main[] } {
+  const facets: app.bsky.richtext.facet.Main[] = []
   const tokens = tokenise(text)
   let out = ''
   let cursor = 0
@@ -107,7 +108,9 @@ export function resolveBluesky (
         const byteEnd = Buffer.byteLength(out, 'utf8')
         facets.push({
           index: { byteStart, byteEnd },
-          features: [{ $type: 'app.bsky.richtext.facet#mention', did: handle }],
+          // Placeholder: `publishBlueskyThread` swaps the handle for a DID
+          // just before posting, since handles can change in between.
+          features: [{ $type: 'app.bsky.richtext.facet#mention', did: handle as DidString }],
         })
       }
     }
@@ -117,7 +120,7 @@ export function resolveBluesky (
       const byteEnd = Buffer.byteLength(out, 'utf8')
       facets.push({
         index: { byteStart, byteEnd },
-        features: [{ $type: 'app.bsky.richtext.facet#link', uri: t.url! }],
+        features: [{ $type: 'app.bsky.richtext.facet#link', uri: t.url! as UriString }],
       })
     }
     cursor = t.end
@@ -147,7 +150,7 @@ export function resolveBluesky (
     const uri = raw.startsWith('http') ? raw : `https://${raw}`
     facets.push({
       index: { byteStart, byteEnd },
-      features: [{ $type: 'app.bsky.richtext.facet#link', uri }],
+      features: [{ $type: 'app.bsky.richtext.facet#link', uri: uri as UriString }],
     })
   }
 
diff --git a/server/utils/admin/ama-publish.ts b/server/utils/admin/ama-publish.ts
index 603c3e2a..c79b9008 100644
--- a/server/utils/admin/ama-publish.ts
+++ b/server/utils/admin/ama-publish.ts
@@ -4,9 +4,12 @@
  * optional image and the original question as alt text.
  */
 import type { H3Event } from 'h3'
-import type { AppBskyEmbedImages, AppBskyFeedPost, AppBskyRichtextFacet } from '@atproto/api'
-import { AtpAgent } from '@atproto/api'
-import { BlobRef, jsonToLex } from '@atproto/lexicon'
+import { Client, asStringFormat, isBlobRef, jsonToLex } from '@atproto/lex'
+import type { $Typed, JsonValue } from '@atproto/lex'
+import { PasswordSession } from '@atproto/lex-password-session'
+import { post as createPost } from '@bsky/sdk'
+import type { app } from '@bsky/sdk/lexicons'
+import { com } from '@bsky/sdk/lexicons'
 import { createRestAPIClient } from 'masto'
 import { parseURL, withProtocol } from 'ufo'
 import { BLUESKY_IMAGE_MAX_BYTES } from '#shared/cms/blob'
@@ -30,7 +33,7 @@ export interface BlueskyImage {
 export interface ResolvedPost {
   text: string
   /** Bluesky-only: facets covering mentions, hashtags, URLs. */
-  facets?: AppBskyRichtextFacet.Main[]
+  facets?: app.bsky.richtext.facet.Main[]
 }
 
 // ---------- Bluesky ----------
@@ -59,15 +62,15 @@ export async function publishBlueskyThread (
   const password = config.bluesky.accessToken
 
   const pdsUrl = await resolveBlueskyPds(identifier)
-  const agent = new AtpAgent({ service: pdsUrl })
-  await agent.login({ identifier, password })
+  const session = await PasswordSession.login({ service: pdsUrl, identifier, password })
+  const client = new Client(session)
 
-  let replyTo: Required<AppBskyFeedPost.ReplyRef> | undefined
+  let replyTo: app.bsky.feed.post.ReplyRef | undefined
   const postUrls: string[] = []
 
   for (let i = 0; i < posts.length; i++) {
     const { text, facets = [] } = posts[i]!
-    let embed: AppBskyEmbedImages.Main | undefined
+    let embed: $Typed<app.bsky.embed.images.Main> | undefined
 
     if (i === 0 && image) {
       if (image.size != null && image.size > BLUESKY_IMAGE_MAX_BYTES) {
@@ -76,13 +79,13 @@ export async function publishBlueskyThread (
           statusMessage: `AMA image is ${image.size} bytes; Bluesky embeds must be under ${BLUESKY_IMAGE_MAX_BYTES}. Regenerate the image to compress it.`,
         })
       }
-      const blob = jsonToLex(image.blob as never)
-      if (!(blob instanceof BlobRef)) {
+      const blob = jsonToLex(image.blob as JsonValue)
+      if (!isBlobRef(blob)) {
         throw new Error('AMA image is not a valid blob ref; cannot embed.')
       }
 
       embed = {
-        $type: 'app.bsky.embed.images',
+        $type: 'app.bsky.embed.images' as const,
         images: [{
           alt: altText,
           image: blob,
@@ -97,28 +100,28 @@ export async function publishBlueskyThread (
 
     // Resolve handle→DID just before posting (handles can change between
     // author time and publish, and Bluesky stores the DID in the facet).
-    const resolvedFacets: AppBskyRichtextFacet.Main[] = await Promise.all(
+    const resolvedFacets: app.bsky.richtext.facet.Main[] = await Promise.all(
       facets.map(async facet => {
         const features = await Promise.all(facet.features.map(async f => {
           if (f.$type !== 'app.bsky.richtext.facet#mention') return f
           const mention = f as { $type: string, did: string }
           try {
             const handle = mention.did.replace(/^@/, '')
-            const res = await agent.resolveHandle({ handle })
-            return { ...f, did: res.data.did }
+            const { did } = await client.call(com.atproto.identity.resolveHandle, { handle: asStringFormat(handle, 'handle') })
+            return { ...f, did }
           }
           catch (err) {
             console.warn(`Failed to resolve handle ${mention.did}:`, err)
             return f
           }
         }))
-        return { ...facet, features: features as AppBskyRichtextFacet.Main['features'] }
+        return { ...facet, features: features as app.bsky.richtext.facet.Main['features'] }
       }),
     )
 
-    const post = await agent.post({
+    const post = await client.call(createPost, {
       text,
-      embed: embed as never,
+      embed,
       reply: replyTo,
       facets: resolvedFacets.length ? resolvedFacets : undefined,
     })
diff --git a/server/utils/admin/ama-record.ts b/server/utils/admin/ama-record.ts
index 8adeb279..0f493c16 100644
--- a/server/utils/admin/ama-record.ts
+++ b/server/utils/admin/ama-record.ts
@@ -1,10 +1,12 @@
 import type { H3Event } from 'h3'
 
-import { requireAdminAgent } from './agent'
-import type { DevRoeAma } from '#shared/lex'
-import { lexicons } from '#shared/lex'
-import { jsonToLex } from '@atproto/lexicon'
+import { jsonToLex } from '@atproto/lex'
+import type { JsonValue } from '@atproto/lex'
+
+import { requireAdminClient } from './client'
+import { dev } from '#shared/lex'
 import { blobSize, blobUrlFor, cidFromBlob } from '#shared/cms/blob'
+import type { Loose } from '#shared/cms/strict'
 import type { AdminRecord } from './crud'
 import { decrypt } from './encryption'
 
@@ -12,8 +14,8 @@ export type AmaPlatform = 'bluesky' | 'mastodon' | 'linkedin' | 'youtubeShorts'
 
 export interface AmaUpdate {
   question?: string
-  posts?: DevRoeAma.Post[] | null
-  platforms?: Partial<DevRoeAma.Platforms> | null
+  posts?: Loose<dev.roe.ama.Post>[] | null
+  platforms?: Partial<dev.roe.ama.Platforms> | null
   image?: unknown | null
   imageDimensions?: { width: number, height: number } | null
   backgroundStyle?: string | null
@@ -25,9 +27,9 @@ export interface AmaView {
   cid: string
   status: 'unanswered' | 'answered'
   question: string
-  posts: DevRoeAma.Post[]
-  platforms?: DevRoeAma.Platforms
-  publishedLinks?: DevRoeAma.PublishedLinks
+  posts: Loose<dev.roe.ama.Post>[]
+  platforms?: dev.roe.ama.Platforms
+  publishedLinks?: dev.roe.ama.PublishedLinks
   image?: unknown
   imageDimensions?: { width: number, height: number }
   backgroundStyle?: string
@@ -35,7 +37,7 @@ export interface AmaView {
   answeredAt?: string
 }
 
-const DEFAULT_PLATFORMS: DevRoeAma.Platforms = {
+const DEFAULT_PLATFORMS: dev.roe.ama.Platforms = {
   bluesky: true,
   mastodon: true,
   linkedin: true,
@@ -52,14 +54,14 @@ function isImageDimensions (value: unknown): value is { width: number, height: n
   return Number.isInteger(v.width) && Number.isInteger(v.height) && Number(v.width) > 0 && Number(v.height) > 0
 }
 
-function normalisePlatforms (platforms?: Partial<DevRoeAma.Platforms> | null): DevRoeAma.Platforms {
+function normalisePlatforms (platforms?: Partial<dev.roe.ama.Platforms> | null): dev.roe.ama.Platforms {
   return {
     ...DEFAULT_PLATFORMS,
     ...(platforms ?? {}),
   }
 }
 
-function cleanPosts (posts: DevRoeAma.Post[] | null | undefined): DevRoeAma.Post[] {
+function cleanPosts (posts: Loose<dev.roe.ama.Post>[] | null | undefined): Loose<dev.roe.ama.Post>[] {
   if (!Array.isArray(posts)) return []
   return posts
     .filter(post => typeof post?.text === 'string' && post.text.trim())
@@ -76,7 +78,7 @@ function cleanPosts (posts: DevRoeAma.Post[] | null | undefined): DevRoeAma.Post
     })
 }
 
-function imageFields (current: DevRoeAma.Record, update: AmaUpdate): Partial<DevRoeAma.Record> {
+function imageFields (current: dev.roe.ama.Main, update: AmaUpdate): Partial<Loose<dev.roe.ama.Main>> {
   const image = hasOwn(update, 'image') ? update.image : current.image
   if (!image) return {}
 
@@ -84,23 +86,23 @@ function imageFields (current: DevRoeAma.Record, update: AmaUpdate): Partial<Dev
   const backgroundStyle = hasOwn(update, 'backgroundStyle') ? update.backgroundStyle : current.backgroundStyle
 
   return {
-    image: image as DevRoeAma.Record['image'],
+    image: image as Loose<dev.roe.ama.Main>['image'],
     ...(isImageDimensions(dimensions) ? { imageDimensions: dimensions } : {}),
     ...(typeof backgroundStyle === 'string' && backgroundStyle ? { backgroundStyle } : {}),
   }
 }
 
-function hasPublishedLinks (links: DevRoeAma.PublishedLinks | undefined): links is DevRoeAma.PublishedLinks {
+function hasPublishedLinks (links: dev.roe.ama.PublishedLinks | undefined): links is dev.roe.ama.PublishedLinks {
   return Boolean(links && Object.values(links).some(Boolean))
 }
 
 function buildRecord (
-  current: DevRoeAma.Record,
+  current: dev.roe.ama.Main,
   update: AmaUpdate,
   published?: { platform: AmaPlatform, url: string },
-): DevRoeAma.Record {
+): Loose<dev.roe.ama.Main> {
   const status = published || current.status === 'answered' ? 'answered' : 'unanswered'
-  const posts = hasOwn(update, 'posts') ? cleanPosts(update.posts as DevRoeAma.Post[] | null | undefined) : cleanPosts(current.posts)
+  const posts = hasOwn(update, 'posts') ? cleanPosts(update.posts) : cleanPosts(current.posts)
   const platforms = hasOwn(update, 'platforms')
     ? (update.platforms ? normalisePlatforms(update.platforms) : undefined)
     : current.platforms
@@ -108,7 +110,7 @@ function buildRecord (
     ? { ...(current.publishedLinks ?? {}), [published.platform]: published.url }
     : current.publishedLinks
 
-  const next: DevRoeAma.Record = {
+  const next: Loose<dev.roe.ama.Main> = {
     $type: 'dev.roe.ama',
     status,
     ...(status === 'answered'
@@ -129,16 +131,19 @@ function buildRecord (
   return next
 }
 
-function toLexRecord (record: DevRoeAma.Record, action: string): DevRoeAma.Record {
-  const lexRecord = jsonToLex(record as never) as DevRoeAma.Record
-  const validation = lexicons.validate('dev.roe.ama', lexRecord)
-  if (!validation.success) {
+/**
+ * Blob refs round-trip through the admin UI in their JSON encoding, so the
+ * record has to be decoded back to lex before it can be validated or written.
+ */
+function toLexRecord (record: Loose<dev.roe.ama.Main>, action: string): dev.roe.ama.Main {
+  const result = dev.roe.ama.main.safeValidate(jsonToLex(record as unknown as JsonValue))
+  if (!result.success) {
     throw createError({
       statusCode: 422,
-      statusMessage: `Invalid AMA ${action}: ${validation.error.message}`,
+      statusMessage: `Invalid AMA ${action}: ${result.reason.message}`,
     })
   }
-  return lexRecord
+  return result.value
 }
 
 function looksLikeSwapMiss (err: unknown): boolean {
@@ -154,32 +159,24 @@ async function mutateAmaRecord (
   update: AmaUpdate,
   action: string,
   published?: { platform: AmaPlatform, url: string },
-): Promise<AdminRecord<'dev.roe.ama'>> {
-  const { agent, did } = await requireAdminAgent(event)
+): Promise<AdminRecord<typeof dev.roe.ama.main>> {
+  const { client, did } = await requireAdminClient(event)
   const MAX_ATTEMPTS = 5
 
   for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-    const existing = await agent.com.atproto.repo.getRecord({
-      repo: did,
-      collection: 'dev.roe.ama',
-      rkey,
-    })
-    const current = existing.data.value as DevRoeAma.Record
-    const currentCid = existing.data.cid
-    const lexRecord = toLexRecord(buildRecord(current, update, published), action)
+    const existing = await client.get(dev.roe.ama.main, { repo: did, rkey })
+    const lexRecord = toLexRecord(buildRecord(existing.value, update, published), action)
 
     try {
-      const res = await agent.com.atproto.repo.putRecord({
+      const res = await client.put(dev.roe.ama.main, lexRecord, {
         repo: did,
-        collection: 'dev.roe.ama',
         rkey,
-        record: lexRecord as Record<string, unknown>,
-        swapRecord: currentCid,
+        swapRecord: existing.cid,
       })
       return {
         rkey,
-        uri: res.data.uri,
-        cid: res.data.cid,
+        uri: res.uri,
+        cid: res.cid,
         value: lexRecord,
       }
     }
@@ -195,7 +192,7 @@ async function mutateAmaRecord (
   })
 }
 
-export function viewAma (r: AdminRecord<'dev.roe.ama'>): AmaView {
+export function viewAma (r: AdminRecord<typeof dev.roe.ama.main>): AmaView {
   const v = r.value
   let question = v.question ?? ''
   if (v.status === 'unanswered' && v.encryptedQuestion) {
@@ -248,13 +245,9 @@ export async function ensureNotAlreadyPublished (
   force: boolean,
 ): Promise<void> {
   if (force) return
-  const { agent, did } = await requireAdminAgent(event)
-  const res = await agent.com.atproto.repo.getRecord({
-    repo: did,
-    collection: 'dev.roe.ama',
-    rkey,
-  })
-  const existing = (res.data.value as DevRoeAma.Record).publishedLinks?.[platform]
+  const { client, did } = await requireAdminClient(event)
+  const res = await client.get(dev.roe.ama.main, { repo: did, rkey })
+  const existing = res.value.publishedLinks?.[platform]
   if (existing) {
     throw createError({
       statusCode: 409,
@@ -289,7 +282,7 @@ export async function prepareAmaImage (
     throw createError({ statusCode: 500, statusMessage: 'PDS service is not configured.' })
   }
 
-  const { did } = await requireAdminAgent(event)
+  const { did } = await requireAdminClient(event)
   await saveAmaDraft(event, rkey, body)
 
   const mimeType = (body.image as { mimeType?: string } | undefined)?.mimeType
diff --git a/server/utils/admin/ama-resolve.ts b/server/utils/admin/ama-resolve.ts
index b170fbb0..8b720a0d 100644
--- a/server/utils/admin/ama-resolve.ts
+++ b/server/utils/admin/ama-resolve.ts
@@ -9,7 +9,7 @@ import { listAdminRecords } from './crud'
 import { resolveForPlatform, resolveBluesky } from './ama-mentions'
 import type { EntityLookup } from './ama-mentions'
 import type { ResolvedPost } from './ama-publish'
-import type { DevRoeEntity } from '#shared/lex'
+import { dev } from '#shared/lex'
 
 export const FOOTER = '\n\nroe.dev/ama\n\n#ama'
 
@@ -19,8 +19,8 @@ export interface AmaPostInput {
 }
 
 export async function buildEntityLookup (event: H3Event): Promise<EntityLookup> {
-  const records = await listAdminRecords(event, 'dev.roe.entity')
-  const byRkey = new Map<string, DevRoeEntity.Record>()
+  const records = await listAdminRecords(event, dev.roe.entity.main)
+  const byRkey = new Map<string, dev.roe.entity.Main>()
   for (const r of records) byRkey.set(r.rkey, r.value)
   return { byRkey }
 }
diff --git a/server/utils/admin/agent.ts b/server/utils/admin/client.ts
similarity index 56%
rename from server/utils/admin/agent.ts
rename to server/utils/admin/client.ts
index e92bf426..4fe57941 100644
--- a/server/utils/admin/agent.ts
+++ b/server/utils/admin/client.ts
@@ -1,20 +1,21 @@
 import type { H3Event } from 'h3'
-import { Agent } from '@atproto/api'
+import { Client } from '@atproto/lex'
+import type { DidString } from '@atproto/lex'
 
 import { clearAdminSessionCookie, getAdminSessionCookie, getOauthClient } from './oauth'
 
-/** Restore the admin's OAuth session into an `@atproto/api` Agent. */
-export async function requireAdminAgent (event: H3Event): Promise<{ agent: Agent, did: string }> {
+/** Restore the admin's OAuth session into an `@atproto/lex` Client. */
+export async function requireAdminClient (event: H3Event): Promise<{ client: Client, did: DidString }> {
   const sess = await getAdminSessionCookie(event)
   const did = sess.data.did
   if (!did) {
     throw createError({ statusCode: 401, statusMessage: 'Not signed in.' })
   }
 
-  const client = getOauthClient(event)
+  const oauthClient = getOauthClient(event)
   try {
-    const oauthSession = await client.restore(did)
-    return { agent: new Agent(oauthSession), did }
+    const oauthSession = await oauthClient.restore(did)
+    return { client: new Client(oauthSession), did: oauthSession.did }
   }
   catch (err) {
     console.warn('[admin] OAuth restore failed:', err instanceof Error ? err.message : err)
diff --git a/server/utils/admin/crud.ts b/server/utils/admin/crud.ts
index dec1fa60..875d7991 100644
--- a/server/utils/admin/crud.ts
+++ b/server/utils/admin/crud.ts
@@ -1,19 +1,18 @@
 import type { H3Event } from 'h3'
-import { TID } from '@atproto/common-web'
-import { jsonToLex } from '@atproto/lexicon'
+import { LexValidationError, XrpcResponseError, jsonToLex } from '@atproto/lex'
+import type { AtUriString, CidString, CreateOptions, DeleteOptions, GetOptions, Infer, JsonValue, PutOptions, RecordSchema } from '@atproto/lex'
 
-import { requireAdminAgent } from './agent'
-import { lexicons } from '#shared/lex'
-import type { Collection, RecordTypes } from '../atproto'
+import { requireAdminClient } from './client'
+import type { Loose } from '#shared/cms/strict'
 
-export interface AdminRecord<C extends Collection> {
+export interface AdminRecord<T extends RecordSchema> {
   rkey: string
   uri: string
   cid: string
-  value: RecordTypes[C]
+  value: Infer<T>
 }
 
-interface PutResult { rkey: string, uri: string, cid: string }
+interface PutResult { rkey: string, uri: AtUriString, cid: CidString }
 
 function rkeyFromUri (uri: string): string {
   return uri.split('/').pop() ?? ''
@@ -25,31 +24,20 @@ function assertRkey (rkey: string | undefined): asserts rkey is string {
   }
 }
 
-export async function listAdminRecords<C extends Collection> (
+export async function listAdminRecords<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
-  options: { sortBy?: (r: AdminRecord<C>) => string | number } = {},
-): Promise<AdminRecord<C>[]> {
-  const { agent, did } = await requireAdminAgent(event)
-  const records: AdminRecord<C>[] = []
-  let cursor: string | undefined
-  while (true) {
-    const res = await agent.com.atproto.repo.listRecords({
-      repo: did,
-      collection,
-      limit: 100,
-      cursor,
+  schema: T,
+  options: { sortBy?: (r: AdminRecord<T>) => string | number } = {},
+): Promise<AdminRecord<T>[]> {
+  const { client, did } = await requireAdminClient(event)
+  const records: AdminRecord<T>[] = []
+  for await (const r of client.listAll(schema, { repo: did, limit: 100 })) {
+    records.push({
+      rkey: rkeyFromUri(r.uri),
+      uri: r.uri,
+      cid: r.cid,
+      value: r.value as Infer<T>,
     })
-    for (const r of res.data.records) {
-      records.push({
-        rkey: rkeyFromUri(r.uri),
-        uri: r.uri,
-        cid: r.cid,
-        value: r.value as RecordTypes[C],
-      })
-    }
-    if (!res.data.cursor || res.data.records.length < 100) break
-    cursor = res.data.cursor
   }
   if (options.sortBy) {
     const { sortBy } = options
@@ -64,90 +52,93 @@ export async function listAdminRecords<C extends Collection> (
   return records
 }
 
-export async function getAdminRecord<C extends Collection> (
+/**
+ * `rkey` is typed conditionally on the concrete schema's key type, which TS
+ * can't resolve while `T` is still generic; the casts on the option objects
+ * throughout this file are safe because every `dev.roe.*` record takes a plain
+ * string key.
+ */
+export async function getAdminRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
+  schema: T,
   rkey: string | undefined,
-): Promise<AdminRecord<C>> {
+): Promise<AdminRecord<T>> {
   assertRkey(rkey)
-  const { agent, did } = await requireAdminAgent(event)
+  const { client, did } = await requireAdminClient(event)
   try {
-    const res = await agent.com.atproto.repo.getRecord({ repo: did, collection, rkey })
-    return {
-      rkey,
-      uri: res.data.uri,
-      cid: res.data.cid ?? '',
-      value: res.data.value as RecordTypes[C],
-    }
+    const res = await client.get(schema, { repo: did, rkey } as unknown as GetOptions<T>)
+    return { rkey, uri: res.uri, cid: res.cid ?? '', value: res.value }
   }
   catch (err) {
-    if (err && typeof err === 'object' && 'status' in err && (err as { status: number }).status === 404) {
-      throw createError({ statusCode: 404, statusMessage: `${collection}/${rkey} not found.` })
+    if (err instanceof XrpcResponseError && err.status === 404) {
+      throw createError({ statusCode: 404, statusMessage: `${schema.$type}/${rkey} not found.` })
     }
     throw err
   }
 }
 
-async function putRecord<C extends Collection> (
+/**
+ * Blob refs arrive from the admin UI in their JSON encoding
+ * (`{ $type: 'blob', ref: { $link } }`); `jsonToLex` turns those back into
+ * the lex representation the record schema expects.
+ */
+async function writeRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
-  rkey: string,
-  record: RecordTypes[C],
+  schema: T,
+  rkey: string | undefined,
+  value: Loose<Omit<Infer<T>, '$type'>>,
 ): Promise<PutResult> {
-  const lexRecord = jsonToLex(record as unknown as Parameters<typeof jsonToLex>[0]) as RecordTypes[C]
-  const validation = lexicons.validate(collection, lexRecord)
-  if (!validation.success) {
-    throw createError({
-      statusCode: 422,
-      statusMessage: `Invalid ${collection}: ${validation.error.message}`,
-    })
+  const { client, did } = await requireAdminClient(event)
+  const input = jsonToLex(value as JsonValue) as Omit<Infer<T>, '$type'>
+
+  try {
+    const res = rkey === undefined
+      ? await client.create(schema, input, { repo: did, validateRequest: true } as unknown as CreateOptions<T>)
+      : await client.put(schema, input, { repo: did, rkey, validateRequest: true } as unknown as PutOptions<T>)
+    return { rkey: rkey ?? rkeyFromUri(res.uri), uri: res.uri, cid: res.cid }
+  }
+  catch (err) {
+    if (err instanceof LexValidationError) {
+      throw createError({ statusCode: 422, statusMessage: `Invalid ${schema.$type}: ${err.message}` })
+    }
+    throw err
   }
-  const { agent, did } = await requireAdminAgent(event)
-  const res = await agent.com.atproto.repo.putRecord({
-    repo: did,
-    collection,
-    rkey,
-    record: lexRecord as Record<string, unknown>,
-  })
-  return { rkey, uri: res.data.uri, cid: res.data.cid }
 }
 
-/** Create a record with a new TID rkey, or put one at a caller-supplied rkey (typically `self` for singletons). */
-export function createAdminRecord<C extends Collection> (
+/** Create a record with a server-generated TID rkey, or put one at a caller-supplied rkey (typically `self` for singletons). */
+export function createAdminRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
-  body: Omit<RecordTypes[C], '$type' | 'createdAt'>,
-  rkey: string = TID.nextStr(),
+  schema: T,
+  body: Loose<Omit<Infer<T>, '$type' | 'createdAt'>>,
+  rkey?: string,
 ): Promise<PutResult> {
-  return putRecord(event, collection, rkey, {
-    $type: collection,
-    ...body,
+  return writeRecord(event, schema, rkey, {
+    ...(body as Record<string, unknown>),
     createdAt: new Date().toISOString(),
-  } as RecordTypes[C])
+  } as unknown as Loose<Omit<Infer<T>, '$type'>>)
 }
 
 /** Overwrite an existing record. */
-export function updateAdminRecord<C extends Collection> (
+export function updateAdminRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
+  schema: T,
   rkey: string | undefined,
-  body: Omit<RecordTypes[C], '$type'>,
+  body: Loose<Omit<Infer<T>, '$type' | 'createdAt'>> & { createdAt?: string },
 ): Promise<PutResult> {
   assertRkey(rkey)
-  return putRecord(event, collection, rkey, {
-    $type: collection,
-    ...body,
+  return writeRecord(event, schema, rkey, {
+    ...(body as Record<string, unknown>),
     createdAt: body.createdAt ?? new Date().toISOString(),
-  } as RecordTypes[C])
+  } as unknown as Loose<Omit<Infer<T>, '$type'>>)
 }
 
-export async function deleteAdminRecord (
+export async function deleteAdminRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: Collection,
+  schema: T,
   rkey: string | undefined,
 ): Promise<{ rkey: string, deleted: true }> {
   assertRkey(rkey)
-  const { agent, did } = await requireAdminAgent(event)
-  await agent.com.atproto.repo.deleteRecord({ repo: did, collection, rkey })
+  const { client, did } = await requireAdminClient(event)
+  await client.delete(schema, { repo: did, rkey } as unknown as DeleteOptions<T>)
   return { rkey, deleted: true }
 }
diff --git a/server/utils/admin/invites.ts b/server/utils/admin/invites.ts
index ff4e97ce..10fff920 100644
--- a/server/utils/admin/invites.ts
+++ b/server/utils/admin/invites.ts
@@ -1,5 +1,6 @@
 import type { AdminRecord } from './crud'
 import { decryptJSON } from './encryption'
+import type { dev } from '#shared/lex'
 
 export interface InviteView {
   rkey: string
@@ -12,7 +13,7 @@ export interface InviteView {
 }
 
 /** Decrypt an invite record into the shape exposed to the editor. */
-export function decryptInvite (r: AdminRecord<'dev.roe.invite'>): InviteView {
+export function decryptInvite (r: AdminRecord<typeof dev.roe.invite.main>): InviteView {
   let slug = ''
   let repo = ''
   try {
diff --git a/server/utils/atproto.ts b/server/utils/atproto.ts
index f3421725..c3784f0b 100644
--- a/server/utils/atproto.ts
+++ b/server/utils/atproto.ts
@@ -1,40 +1,31 @@
 import type { H3Event } from 'h3'
-import { AtpAgent } from '@atproto/api'
+import { Client, XrpcResponseError } from '@atproto/lex'
+import type { AtUriString, CidString, DidString, GetOptions, Infer, PutOptions, RecordSchema } from '@atproto/lex'
+import { PasswordSession } from '@atproto/lex-password-session'
 
-import { lexicons } from '#shared/lex'
 import { blobUrlFor, cidFromBlob } from '#shared/cms/blob'
-import type {
-  DevRoeAma,
-  DevRoeEntity,
-  DevRoeInvite,
-  DevRoeLocation,
-  DevRoeSync,
-  DevRoeTalk,
-  DevRoeTalkGroup,
-  DevRoeUsesCategory,
-  DevRoeUsesItem,
-} from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 /**
  * Reads against our own PDS don't need auth - `com.atproto.repo.listRecords`
  * and `getRecord` are open against any public repo. We use an unauthed
- * agent for reads to dodge the PDS's per-account login rate limit, and only
- * `login()` on write paths.
+ * client for reads to dodge the PDS's per-account login rate limit, and only
+ * log in on write paths.
  *
- * Both agents are cached per Nitro process.
+ * Both clients are cached per Nitro process.
  */
-let readAgent: AtpAgent | null = null
-let authedAgent: { agent: AtpAgent, did: string } | null = null
+let readClient: Client | null = null
+let authedClient: { client: Client, did: DidString } | null = null
 
-function getReadAgent (event: H3Event): AtpAgent {
-  if (readAgent) return readAgent
+function getReadClient (event: H3Event): Client {
+  if (readClient) return readClient
   const config = useRuntimeConfig(event)
-  readAgent = new AtpAgent({ service: config.public.atproto.service })
-  return readAgent
+  readClient = new Client(config.public.atproto.service)
+  return readClient
 }
 
-async function getAuthedAgent (event: H3Event): Promise<{ agent: AtpAgent, did: string }> {
-  if (authedAgent) return authedAgent
+async function getAuthedClient (event: H3Event): Promise<{ client: Client, did: DidString }> {
+  if (authedClient) return authedClient
 
   const config = useRuntimeConfig(event)
   const service = config.public.atproto.service
@@ -47,26 +38,22 @@ async function getAuthedAgent (event: H3Event): Promise<{ agent: AtpAgent, did:
     })
   }
 
-  const agent = new AtpAgent({ service })
-  await agent.login({ identifier: handle, password })
+  const session = await PasswordSession.login({ service, identifier: handle, password })
+  const client = new Client(session)
 
-  if (!agent.session) {
-    throw createError({ statusCode: 500, statusMessage: 'atproto login did not return a session.' })
-  }
-
-  authedAgent = { agent, did: agent.session.did }
-  return authedAgent
+  authedClient = { client, did: client.assertDid }
+  return authedClient
 }
 
-let didPromise: Promise<string> | null = null
+let didPromise: Promise<DidString> | null = null
 
 /**
  * Resolve our PDS DID. The build-time `modules/atproto` module populates
  * `runtimeConfig.atproto.did` from the configured handle; if we've already
  * logged in we prefer the session DID. Cached for the lifetime of the process.
  */
-export async function resolveDid (event: H3Event): Promise<string> {
-  if (authedAgent) return authedAgent.did
+export async function resolveDid (event: H3Event): Promise<DidString> {
+  if (authedClient) return authedClient.did
   if (didPromise) return didPromise
 
   const config = useRuntimeConfig(event)
@@ -78,112 +65,70 @@ export async function resolveDid (event: H3Event): Promise<string> {
     })
   }
 
-  didPromise = Promise.resolve(config.atproto.did)
+  didPromise = Promise.resolve(config.atproto.did as DidString)
   return didPromise
 }
 
-/** Map from NSID to its record interface. Extend as new lexicons are added. */
-export interface RecordTypes {
-  'dev.roe.talk': DevRoeTalk.Record
-  'dev.roe.talkGroup': DevRoeTalkGroup.Record
-  'dev.roe.usesCategory': DevRoeUsesCategory.Record
-  'dev.roe.usesItem': DevRoeUsesItem.Record
-  'dev.roe.location': DevRoeLocation.Record
-  'dev.roe.entity': DevRoeEntity.Record
-  'dev.roe.invite': DevRoeInvite.Record
-  'dev.roe.ama': DevRoeAma.Record
-  'dev.roe.sync': DevRoeSync.Record
-}
-
-export type Collection = keyof RecordTypes
-
 /** A record as returned by listRecords, with strongly typed `value`. */
-export interface FetchedRecord<C extends Collection> {
-  uri: string
-  cid: string
-  value: RecordTypes[C]
+export interface FetchedRecord<T extends RecordSchema> {
+  uri: AtUriString
+  cid: CidString
+  value: Infer<T>
 }
 
 /**
- * Put (create or overwrite) a record at a known rkey. Validates against the
- * lexicon before sending, so we fail fast on schema drift in dev.
+ * Put (create or overwrite) a record at a known rkey. The client validates
+ * against the lexicon before sending, so we fail fast on schema drift in dev.
  */
-export async function putRecord<C extends Collection> (
+export async function putRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
+  schema: T,
   rkey: string,
-  value: Omit<RecordTypes[C], '$type'>,
-): Promise<{ uri: string, cid: string }> {
-  const { agent, did } = await getAuthedAgent(event)
-
-  const record = { $type: collection, ...value } as RecordTypes[C]
-  const result = lexicons.validate(collection, record)
-  if (!result.success) {
-    throw createError({
-      statusCode: 500,
-      statusMessage: `Record failed lexicon validation for ${collection}: ${result.error.message}`,
-    })
-  }
-
-  const res = await agent.com.atproto.repo.putRecord({
-    repo: did,
-    collection,
-    rkey,
-    record,
-  })
-  return { uri: res.data.uri, cid: res.data.cid }
+  value: Loose<Omit<Infer<T>, '$type'>>,
+): Promise<{ uri: AtUriString, cid: CidString }> {
+  const { client } = await getAuthedClient(event)
+  const res = await client.put(schema, value as Omit<Infer<T>, '$type'>, { rkey } as unknown as PutOptions<T>)
+  return { uri: res.uri, cid: res.cid }
 }
 
-/** Get a single record by rkey. Returns null if it doesn't exist. */
-export async function getRecord<C extends Collection> (
+/**
+ * Get a single record by rkey. Returns null if it doesn't exist.
+ *
+ * `rkey` is typed conditionally on the concrete schema's key type, which TS
+ * can't resolve while `T` is still generic; the casts on the option objects
+ * here and in `putRecord` are safe because every `dev.roe.*` record takes a
+ * plain string key.
+ */
+export async function getRecord<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
+  schema: T,
   rkey: string,
-): Promise<FetchedRecord<C> | null> {
+): Promise<FetchedRecord<T> | null> {
   const did = await resolveDid(event)
-  const agent = getReadAgent(event)
+  const client = getReadClient(event)
   try {
-    const res = await agent.com.atproto.repo.getRecord({ repo: did, collection, rkey })
-    return {
-      uri: res.data.uri,
-      cid: res.data.cid ?? '',
-      value: res.data.value as RecordTypes[C],
-    }
+    const res = await client.get(schema, { repo: did, rkey } as unknown as GetOptions<T>)
+    return { uri: res.uri, cid: res.cid ?? '' as CidString, value: res.value }
   }
   catch (err: unknown) {
-    if (err && typeof err === 'object' && 'status' in err && (err as { status: number }).status === 404) {
-      return null
-    }
+    if (err instanceof XrpcResponseError && err.status === 404) return null
     throw err
   }
 }
 
 /** List all records in a collection, paginating until exhausted. */
-export async function listRecords<C extends Collection> (
+export async function listRecords<T extends RecordSchema> (
   event: H3Event,
-  collection: C,
+  schema: T,
   options: { limit?: number, reverse?: boolean } = {},
-): Promise<FetchedRecord<C>[]> {
+): Promise<FetchedRecord<T>[]> {
   const did = await resolveDid(event)
-  const agent = getReadAgent(event)
-  const pageSize = 100
-  const records: FetchedRecord<C>[] = []
-  let cursor: string | undefined
-
-  while (true) {
-    const res = await agent.com.atproto.repo.listRecords({
-      repo: did,
-      collection,
-      limit: pageSize,
-      cursor,
-      reverse: options.reverse,
-    })
-    for (const r of res.data.records) {
-      records.push({ uri: r.uri, cid: r.cid, value: r.value as RecordTypes[C] })
-      if (options.limit && records.length >= options.limit) return records
-    }
-    if (!res.data.cursor || res.data.records.length < pageSize) break
-    cursor = res.data.cursor
+  const client = getReadClient(event)
+  const records: FetchedRecord<T>[] = []
+
+  for await (const r of client.listAll(schema, { repo: did, limit: 100, reverse: options.reverse })) {
+    records.push({ uri: r.uri, cid: r.cid, value: r.value as Infer<T> })
+    if (options.limit && records.length >= options.limit) break
   }
 
   return records
diff --git a/server/utils/cms/location.ts b/server/utils/cms/location.ts
index 3735056c..a8e71ee9 100644
--- a/server/utils/cms/location.ts
+++ b/server/utils/cms/location.ts
@@ -1,7 +1,8 @@
 import type { H3Event } from 'h3'
 
 import { getRecord, putRecord } from '../atproto'
-import type { DevRoeLocation } from '#shared/lex'
+import { dev } from '#shared/lex'
+import type { Loose } from '#shared/cms/strict'
 
 export interface Location {
   city: string
@@ -12,7 +13,7 @@ export interface Location {
 }
 
 export async function getCurrentLocation (event: H3Event): Promise<Location | null> {
-  const rec = await getRecord(event, 'dev.roe.location', 'self')
+  const rec = await getRecord(event, dev.roe.location.main, 'self')
   if (!rec) return null
   const v = rec.value
   return {
@@ -20,12 +21,12 @@ export async function getCurrentLocation (event: H3Event): Promise<Location | nu
     region: v.region,
     country: v.country,
     countryCode: v.countryCode,
-    meetupAvailable: v.meetupAvailable,
+    meetupAvailable: v.meetupAvailable ?? false,
   }
 }
 
 export async function setCurrentLocation (event: H3Event, loc: Location): Promise<void> {
-  const value: Omit<DevRoeLocation.Record, '$type'> = {
+  const value: Loose<Omit<dev.roe.location.Main, '$type'>> = {
     city: loc.city,
     ...(loc.region ? { region: loc.region } : {}),
     country: loc.country,
@@ -33,5 +34,5 @@ export async function setCurrentLocation (event: H3Event, loc: Location): Promis
     meetupAvailable: loc.meetupAvailable,
     createdAt: new Date().toISOString(),
   }
-  await putRecord(event, 'dev.roe.location', 'self', value)
+  await putRecord(event, dev.roe.location.main, 'self', value)
 }
diff --git a/server/utils/cms/talks.ts b/server/utils/cms/talks.ts
index 969e4d19..b916becc 100644
--- a/server/utils/cms/talks.ts
+++ b/server/utils/cms/talks.ts
@@ -2,14 +2,15 @@ import type { H3Event } from 'h3'
 
 import type { Talk } from '../md'
 import { listRecords, blobImage } from '../atproto'
+import { dev } from '#shared/lex'
 
 import { toTalk, rkeyFromUri } from '#shared/cms/talk-mapper'
 
 export async function getPastTalks (event: H3Event): Promise<Talk[]> {
   const now = new Date().toISOString()
   const [talks, groups] = await Promise.all([
-    listRecords(event, 'dev.roe.talk'),
-    listRecords(event, 'dev.roe.talkGroup'),
+    listRecords(event, dev.roe.talk.main),
+    listRecords(event, dev.roe.talkGroup.main),
   ])
 
   const groupByUri = new Map(groups.map(g => [g.uri, g]))
@@ -39,7 +40,7 @@ export interface UpcomingConference {
 
 export async function getUpcomingTalks (event: H3Event): Promise<UpcomingConference[]> {
   const now = new Date().toISOString()
-  const talks = await listRecords(event, 'dev.roe.talk')
+  const talks = await listRecords(event, dev.roe.talk.main)
 
   const upcoming = talks
     .filter(t => t.value.date >= now)
diff --git a/server/utils/cms/uses.ts b/server/utils/cms/uses.ts
index 4edc60d7..b94a13d2 100644
--- a/server/utils/cms/uses.ts
+++ b/server/utils/cms/uses.ts
@@ -1,6 +1,7 @@
 import type { H3Event } from 'h3'
 
 import { listRecords, blobImage } from '../atproto'
+import { dev } from '#shared/lex'
 import type { UsesCategory, UsesItem } from '#shared/cms/uses'
 
 export type { UsesCategory, UsesItem } from '#shared/cms/uses'
@@ -12,8 +13,8 @@ export type { UsesCategory, UsesItem } from '#shared/cms/uses'
  */
 export async function getUses (event: H3Event): Promise<UsesCategory[]> {
   const [categories, items] = await Promise.all([
-    listRecords(event, 'dev.roe.usesCategory'),
-    listRecords(event, 'dev.roe.usesItem'),
+    listRecords(event, dev.roe.usesCategory.main),
+    listRecords(event, dev.roe.usesItem.main),
   ])
 
   const itemsByCategoryUri = new Map<string, typeof items>()
diff --git a/shared/cms/strict.ts b/shared/cms/strict.ts
index f64c6cc4..dc2dd264 100644
--- a/shared/cms/strict.ts
+++ b/shared/cms/strict.ts
@@ -5,3 +5,13 @@
  * its declared properties.
  */
 export type Strict<T> = { [K in keyof T as string extends K ? never : K]: T[K] }
+
+/**
+ * Widens lexicon string-format brands (`DatetimeString`, `AtUriString`, …)
+ * back to plain `string`, leaving `$type` discriminants intact.
+ */
+export type Loose<T> = T extends (infer U)[]
+  ? Loose<U>[]
+  : T extends object
+    ? { [K in keyof T]: K extends '$type' ? T[K] : Loose<T[K]> }
+    : T extends string ? string : T
diff --git a/shared/cms/talk-mapper.ts b/shared/cms/talk-mapper.ts
index cd41c1f9..2a386b0d 100644
--- a/shared/cms/talk-mapper.ts
+++ b/shared/cms/talk-mapper.ts
@@ -1,4 +1,4 @@
-import type { DevRoeTalk, DevRoeTalkGroup } from '../lex/index.ts'
+import type { dev } from '../lex/index.ts'
 import type { Talk, TalkGroup } from './talks.ts'
 
 /** Extract the rkey from an `at://did/collection/rkey` URI. */
@@ -9,12 +9,12 @@ export function rkeyFromUri (uri: string): string {
 
 export interface PdsTalkInput {
   uri: string
-  value: DevRoeTalk.Record
+  value: dev.roe.talk.Main
 }
 
 export interface PdsTalkGroupInput {
   uri: string
-  value: DevRoeTalkGroup.Record
+  value: dev.roe.talkGroup.Main
 }
 
 export function toTalk (input: PdsTalkInput, group?: PdsTalkGroupInput): Talk {
diff --git a/shared/cms/talks.ts b/shared/cms/talks.ts
index 67f9b316..f07e9206 100644
--- a/shared/cms/talks.ts
+++ b/shared/cms/talks.ts
@@ -1,14 +1,14 @@
-import type { DevRoeTalk, DevRoeTalkGroup } from '../lex/index.ts'
+import type { dev } from '../lex/index.ts'
 import type { Strict } from './strict.ts'
 
 type DroppedHousekeeping = '$type' | 'createdAt'
 type UpcomingOnly = 'endDate' | 'location' | 'image'
 
-export type TalkGroup = Omit<Strict<DevRoeTalkGroup.Record>, DroppedHousekeeping> & {
+export type TalkGroup = Omit<Strict<dev.roe.talkGroup.Main>, DroppedHousekeeping> & {
   _id: string
 }
 
-export type Talk = Omit<Strict<DevRoeTalk.Record>, DroppedHousekeeping | UpcomingOnly | 'title' | 'group'> & {
+export type Talk = Omit<Strict<dev.roe.talk.Main>, DroppedHousekeeping | UpcomingOnly | 'title' | 'group'> & {
   _id: string
   title: string
   group?: TalkGroup
diff --git a/shared/cms/uses.ts b/shared/cms/uses.ts
index 90f898db..4ae787ff 100644
--- a/shared/cms/uses.ts
+++ b/shared/cms/uses.ts
@@ -1,7 +1,7 @@
-import type { DevRoeUsesCategory, DevRoeUsesItem } from '../lex/index.ts'
+import type { dev } from '../lex/index.ts'
 import type { Strict } from './strict.ts'
 
-export type UsesItem = Omit<Strict<DevRoeUsesItem.Record>, '$type' | 'category' | 'image' | 'createdAt'> & {
+export type UsesItem = Omit<Strict<dev.roe.usesItem.Main>, '$type' | 'category' | 'image' | 'createdAt'> & {
   image: {
     url: string
     width: number | null
@@ -9,7 +9,7 @@ export type UsesItem = Omit<Strict<DevRoeUsesItem.Record>, '$type' | 'category'
   } | null
 }
 
-export type UsesCategory = Omit<Strict<DevRoeUsesCategory.Record>, '$type' | 'createdAt'> & {
+export type UsesCategory = Omit<Strict<dev.roe.usesCategory.Main>, '$type' | 'createdAt'> & {
   _id: string
   items: UsesItem[]
 }
diff --git a/shared/lex/com.ts b/shared/lex/com.ts
new file mode 100644
index 00000000..66dc3607
--- /dev/null
+++ b/shared/lex/com.ts
@@ -0,0 +1,5 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * as atproto from './com/atproto.ts'
diff --git a/shared/lex/com/atproto.ts b/shared/lex/com/atproto.ts
new file mode 100644
index 00000000..b71218e1
--- /dev/null
+++ b/shared/lex/com/atproto.ts
@@ -0,0 +1,5 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * as repo from './atproto/repo.ts'
diff --git a/shared/lex/com/atproto/repo.ts b/shared/lex/com/atproto/repo.ts
new file mode 100644
index 00000000..b8b9f478
--- /dev/null
+++ b/shared/lex/com/atproto/repo.ts
@@ -0,0 +1,5 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * as strongRef from './repo/strongRef.ts'
diff --git a/shared/lex/com/atproto/repo/strongRef.defs.ts b/shared/lex/com/atproto/repo/strongRef.defs.ts
new file mode 100644
index 00000000..9b562274
--- /dev/null
+++ b/shared/lex/com/atproto/repo/strongRef.defs.ts
@@ -0,0 +1,48 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'com.atproto.repo.strongRef'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+type Main = {
+  $type?: 'com.atproto.repo.strongRef'
+  uri: l.AtUriString
+  cid: l.CidString
+}
+
+export type { Main }
+
+const main = /*#__PURE__*/ l.typedObject<Main>(
+  $nsid,
+  'main',
+  /*#__PURE__*/ l.object({
+    uri: /*#__PURE__*/ l.string({ format: 'at-uri' }),
+    cid: /*#__PURE__*/ l.string({ format: 'cid' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/com/atproto/repo/strongRef.ts b/shared/lex/com/atproto/repo/strongRef.ts
new file mode 100644
index 00000000..130bbb84
--- /dev/null
+++ b/shared/lex/com/atproto/repo/strongRef.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './strongRef.defs.ts'
+export { main as default } from './strongRef.defs.ts'
diff --git a/shared/lex/dev.ts b/shared/lex/dev.ts
new file mode 100644
index 00000000..d5ecbc02
--- /dev/null
+++ b/shared/lex/dev.ts
@@ -0,0 +1,5 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * as roe from './dev/roe.ts'
diff --git a/shared/lex/dev/roe.ts b/shared/lex/dev/roe.ts
new file mode 100644
index 00000000..388732b6
--- /dev/null
+++ b/shared/lex/dev/roe.ts
@@ -0,0 +1,14 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * as ama from './roe/ama.ts'
+export * as entity from './roe/entity.ts'
+export * as invite from './roe/invite.ts'
+export * as location from './roe/location.ts'
+export * as sync from './roe/sync.ts'
+export * as talk from './roe/talk.ts'
+export * as talkGroup from './roe/talkGroup.ts'
+export * as usesCategory from './roe/usesCategory.ts'
+export * as usesItem from './roe/usesItem.ts'
+export * as defs from './roe/defs.ts'
diff --git a/shared/lex/dev/roe/ama.defs.ts b/shared/lex/dev/roe/ama.defs.ts
new file mode 100644
index 00000000..8b372cb6
--- /dev/null
+++ b/shared/lex/dev/roe/ama.defs.ts
@@ -0,0 +1,220 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+import * as RoeDefs from './defs.defs.ts'
+import * as RepoStrongRef from '../../com/atproto/repo/strongRef.defs.ts'
+
+const $nsid = 'dev.roe.ama'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** An anonymous question, optionally with a published answer. While unanswered the question text is encrypted server-side (private to roe.dev). Once published, the question is rewritten in plaintext alongside the answer and per-platform URLs. */
+type Main = {
+  $type: 'dev.roe.ama'
+  status: 'unanswered' | 'answered' | l.UnknownString
+
+  /**
+   * AES-256-GCM envelope holding the raw question text. Present iff status=unanswered.
+   */
+  encryptedQuestion?: string
+
+  /**
+   * Plaintext question. Present iff status=answered; the editor decrypts encryptedQuestion at publish time and writes it here so the record is self-contained going forward.
+   */
+  question?: string
+
+  /**
+   * Thread of response posts. Each post is the body of one Bluesky-thread item (and one Mastodon status, one LinkedIn comment chain entry, etc).
+   */
+  posts?: Post[]
+
+  /**
+   * Which platforms the editor enabled when publishing.
+   */
+  platforms?: Platforms
+
+  /**
+   * Resolved per-platform URLs after publish.
+   */
+  publishedLinks?: PublishedLinks
+  image?: l.BlobRef
+
+  /**
+   * Pixel dimensions of `image`. Stored alongside because PDS blobs don't carry intrinsic dimensions and Bluesky's image embed needs `aspectRatio`.
+   */
+  imageDimensions?: RoeDefs.AspectRatio
+
+  /**
+   * ID of the background style used to render the image, either a preset name or a serialised custom emoji-and-gradient id. The set of styles is internal to roe.dev.
+   */
+  backgroundStyle?: string
+  createdAt: l.DatetimeString
+  answeredAt?: l.DatetimeString
+}
+
+export type { Main }
+
+/** An anonymous question, optionally with a published answer. While unanswered the question text is encrypted server-side (private to roe.dev). Once published, the question is rewritten in plaintext alongside the answer and per-platform URLs. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    status: /*#__PURE__*/ l.string<{
+      knownValues: ['unanswered', 'answered']
+    }>(),
+    encryptedQuestion: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 500000 }),
+    ),
+    question: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 500000, maxGraphemes: 50000 }),
+    ),
+    posts: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.array(/*#__PURE__*/ l.ref<Post>((() => post) as any), {
+        maxLength: 16,
+      }),
+    ),
+    platforms: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<Platforms>((() => platforms) as any),
+    ),
+    publishedLinks: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<PublishedLinks>((() => publishedLinks) as any),
+    ),
+    image: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.blob({ accept: ['image/*'], maxSize: 5000000 }),
+    ),
+    imageDimensions: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<RoeDefs.AspectRatio>(
+        (() => RoeDefs.aspectRatio) as any,
+      ),
+    ),
+    backgroundStyle: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 128 }),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+    answeredAt: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'datetime' }),
+    ),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
+
+/** One post in the response thread. Mentions reference dev.roe.entity records by AT URI so the publisher can rewrite per-platform handles at publish time. */
+type Post = {
+  $type?: 'dev.roe.ama#post'
+
+  /**
+   * Body text. Plain text with `@<entity-rkey>` placeholders for entity mentions (e.g. `Thanks @abc123def456 for the help`). The placeholder syntax is internal; the publisher swaps them for the right per-platform handle.
+   */
+  text: string
+
+  /**
+   * Strong-refs to dev.roe.entity records. The rkey of each referenced record is the placeholder token used in `text`.
+   */
+  mentions?: RepoStrongRef.Main[]
+}
+
+export type { Post }
+
+/** One post in the response thread. Mentions reference dev.roe.entity records by AT URI so the publisher can rewrite per-platform handles at publish time. */
+const post = /*#__PURE__*/ l.typedObject<Post>(
+  $nsid,
+  'post',
+  /*#__PURE__*/ l.object({
+    text: /*#__PURE__*/ l.string({ maxLength: 500000, maxGraphemes: 50000 }),
+    mentions: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.array(
+        /*#__PURE__*/ l.ref<RepoStrongRef.Main>(
+          (() => RepoStrongRef.main) as any,
+        ),
+        { maxLength: 32 },
+      ),
+    ),
+  }),
+)
+
+export { post }
+
+type Platforms = {
+  $type?: 'dev.roe.ama#platforms'
+  bluesky?: boolean
+  mastodon?: boolean
+  linkedin?: boolean
+  youtubeShorts?: boolean
+}
+
+export type { Platforms }
+
+const platforms = /*#__PURE__*/ l.typedObject<Platforms>(
+  $nsid,
+  'platforms',
+  /*#__PURE__*/ l.object({
+    bluesky: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.boolean(), true),
+    ),
+    mastodon: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.boolean(), true),
+    ),
+    linkedin: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.boolean(), true),
+    ),
+    youtubeShorts: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.boolean(), false),
+    ),
+  }),
+)
+
+export { platforms }
+
+type PublishedLinks = {
+  $type?: 'dev.roe.ama#publishedLinks'
+  bluesky?: l.UriString
+  mastodon?: l.UriString
+  linkedin?: l.UriString
+  youtubeShorts?: l.UriString
+}
+
+export type { PublishedLinks }
+
+const publishedLinks = /*#__PURE__*/ l.typedObject<PublishedLinks>(
+  $nsid,
+  'publishedLinks',
+  /*#__PURE__*/ l.object({
+    bluesky: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'uri' }),
+    ),
+    mastodon: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'uri' }),
+    ),
+    linkedin: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'uri' }),
+    ),
+    youtubeShorts: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'uri' }),
+    ),
+  }),
+)
+
+export { publishedLinks }
diff --git a/shared/lex/dev/roe/ama.ts b/shared/lex/dev/roe/ama.ts
new file mode 100644
index 00000000..edab4135
--- /dev/null
+++ b/shared/lex/dev/roe/ama.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './ama.defs.ts'
+export { main as default } from './ama.defs.ts'
diff --git a/shared/lex/dev/roe/defs.defs.ts b/shared/lex/dev/roe/defs.defs.ts
new file mode 100644
index 00000000..5de88fce
--- /dev/null
+++ b/shared/lex/dev/roe/defs.defs.ts
@@ -0,0 +1,32 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.defs'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** Intrinsic width:height of an image in pixels. Mirrors `app.bsky.embed.defs#aspectRatio`. */
+type AspectRatio = {
+  $type?: 'dev.roe.defs#aspectRatio'
+  width: number
+  height: number
+}
+
+export type { AspectRatio }
+
+/** Intrinsic width:height of an image in pixels. Mirrors `app.bsky.embed.defs#aspectRatio`. */
+const aspectRatio = /*#__PURE__*/ l.typedObject<AspectRatio>(
+  $nsid,
+  'aspectRatio',
+  /*#__PURE__*/ l.object({
+    width: /*#__PURE__*/ l.integer({ minimum: 1 }),
+    height: /*#__PURE__*/ l.integer({ minimum: 1 }),
+  }),
+)
+
+export { aspectRatio }
diff --git a/shared/lex/dev/roe/defs.ts b/shared/lex/dev/roe/defs.ts
new file mode 100644
index 00000000..f3af51b8
--- /dev/null
+++ b/shared/lex/dev/roe/defs.ts
@@ -0,0 +1,5 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './defs.defs.ts'
diff --git a/shared/lex/dev/roe/entity.defs.ts b/shared/lex/dev/roe/entity.defs.ts
new file mode 100644
index 00000000..6131fb9f
--- /dev/null
+++ b/shared/lex/dev/roe/entity.defs.ts
@@ -0,0 +1,97 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.entity'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** A person or organisation referenced by AMA responses via @-mentions. Holds the canonical name plus per-platform social handles so the publisher can rewrite mentions correctly for each platform. */
+type Main = {
+  $type: 'dev.roe.entity'
+  name: string
+  socialHandles?: SocialHandles
+  website?: l.UriString
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** A person or organisation referenced by AMA responses via @-mentions. Holds the canonical name plus per-platform social handles so the publisher can rewrite mentions correctly for each platform. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    name: /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    socialHandles: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<SocialHandles>((() => socialHandles) as any),
+    ),
+    website: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'uri' }),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
+
+type SocialHandles = {
+  $type?: 'dev.roe.entity#socialHandles'
+
+  /**
+   * Handle without leading @ (e.g. nuxt.bsky.social)
+   */
+  bluesky?: string
+
+  /**
+   * Company or person handle (e.g. nuxtjs)
+   */
+  linkedin?: string
+
+  /**
+   * Full handle including instance (e.g. nuxt@fosstodon.org)
+   */
+  mastodon?: string
+}
+
+export type { SocialHandles }
+
+const socialHandles = /*#__PURE__*/ l.typedObject<SocialHandles>(
+  $nsid,
+  'socialHandles',
+  /*#__PURE__*/ l.object({
+    bluesky: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 256 }),
+    ),
+    linkedin: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 256 }),
+    ),
+    mastodon: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 256 }),
+    ),
+  }),
+)
+
+export { socialHandles }
diff --git a/shared/lex/dev/roe/entity.ts b/shared/lex/dev/roe/entity.ts
new file mode 100644
index 00000000..6c612dc0
--- /dev/null
+++ b/shared/lex/dev/roe/entity.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './entity.defs.ts'
+export { main as default } from './entity.defs.ts'
diff --git a/shared/lex/dev/roe/invite.defs.ts b/shared/lex/dev/roe/invite.defs.ts
new file mode 100644
index 00000000..43dfa085
--- /dev/null
+++ b/shared/lex/dev/roe/invite.defs.ts
@@ -0,0 +1,60 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.invite'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** An invitation link that grants access to a private GitHub repository. Both the URL slug and the repo name are sensitive (knowing the slug equals being granted access), so the entire payload is encrypted server-side before being written to the PDS. */
+type Main = {
+  $type: 'dev.roe.invite'
+
+  /**
+   * AES-256-GCM envelope holding `{ slug, repo }` as JSON. Opaque to anyone without the server key.
+   */
+  encrypted: string
+
+  /**
+   * Whether this invite is currently honoured. Inactive invites stay around for audit but don't get wired up in the route table.
+   */
+  isActive: boolean
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** An invitation link that grants access to a private GitHub repository. Both the URL slug and the repo name are sensitive (knowing the slug equals being granted access), so the entire payload is encrypted server-side before being written to the PDS. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    encrypted: /*#__PURE__*/ l.string({ maxLength: 8192 }),
+    isActive: /*#__PURE__*/ l.boolean(),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/dev/roe/invite.ts b/shared/lex/dev/roe/invite.ts
new file mode 100644
index 00000000..60173154
--- /dev/null
+++ b/shared/lex/dev/roe/invite.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './invite.defs.ts'
+export { main as default } from './invite.defs.ts'
diff --git a/shared/lex/dev/roe/location.defs.ts b/shared/lex/dev/roe/location.defs.ts
new file mode 100644
index 00000000..e66a2d06
--- /dev/null
+++ b/shared/lex/dev/roe/location.defs.ts
@@ -0,0 +1,70 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.location'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** Current location (singleton; rkey is always 'self'). */
+type Main = {
+  $type: 'dev.roe.location'
+  city: string
+
+  /**
+   * Region/state. Used to special-case Scotland and US/UK subdivisions on the public site.
+   */
+  region?: string
+  country: string
+
+  /**
+   * ISO 3166-1 alpha-2 country code, uppercase. Used to compute a flag emoji.
+   */
+  countryCode: string
+  meetupAvailable?: boolean
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** Current location (singleton; rkey is always 'self'). */
+const main = /*#__PURE__*/ l.record<'literal:self', Main>(
+  'literal:self',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    city: /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    region: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    ),
+    country: /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    countryCode: /*#__PURE__*/ l.string({ minLength: 2, maxLength: 2 }),
+    meetupAvailable: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.boolean(), true),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/dev/roe/location.ts b/shared/lex/dev/roe/location.ts
new file mode 100644
index 00000000..d8a2ec1d
--- /dev/null
+++ b/shared/lex/dev/roe/location.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './location.defs.ts'
+export { main as default } from './location.defs.ts'
diff --git a/shared/lex/dev/roe/sync.defs.ts b/shared/lex/dev/roe/sync.defs.ts
new file mode 100644
index 00000000..a0a7e948
--- /dev/null
+++ b/shared/lex/dev/roe/sync.defs.ts
@@ -0,0 +1,56 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.sync'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** Dedupe marker for a syndication pipeline. One record per (provider, canonical URL) pair that has been submitted; presence of a record means we've already synced and shouldn't re-submit. */
+type Main = {
+  $type: 'dev.roe.sync'
+
+  /**
+   * Identifier of the syndication target (e.g. `gde-advocu`).
+   */
+  provider: string
+  canonicalUrl: l.UriString
+  syncedAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** Dedupe marker for a syndication pipeline. One record per (provider, canonical URL) pair that has been submitted; presence of a record means we've already synced and shouldn't re-submit. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    provider: /*#__PURE__*/ l.string({ maxLength: 64 }),
+    canonicalUrl: /*#__PURE__*/ l.string({ format: 'uri' }),
+    syncedAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/dev/roe/sync.ts b/shared/lex/dev/roe/sync.ts
new file mode 100644
index 00000000..0e2f6036
--- /dev/null
+++ b/shared/lex/dev/roe/sync.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './sync.defs.ts'
+export { main as default } from './sync.defs.ts'
diff --git a/shared/lex/dev/roe/talk.defs.ts b/shared/lex/dev/roe/talk.defs.ts
new file mode 100644
index 00000000..d44095de
--- /dev/null
+++ b/shared/lex/dev/roe/talk.defs.ts
@@ -0,0 +1,159 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+import * as RepoStrongRef from '../../com/atproto/repo/strongRef.defs.ts'
+import * as RoeDefs from './defs.defs.ts'
+
+const $nsid = 'dev.roe.talk'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** A talk, podcast appearance, workshop, stream, or similar event. */
+type Main = {
+  $type: 'dev.roe.talk'
+
+  /**
+   * Optional for upcoming events with no announced title. Required for past talks unless the talk is part of a group.
+   */
+  title?: string
+  description?: string
+
+  /**
+   * Start date of the talk/event. Date-only values are stored as midnight UTC.
+   */
+  date: l.DatetimeString
+
+  /**
+   * End date for multi-day events. Optional.
+   */
+  endDate?: l.DatetimeString
+
+  /**
+   * Conference name, meetup, podcast title, etc.
+   */
+  source: string
+
+  /**
+   * Free-form: city, country, or 'Online'.
+   */
+  location?: string
+  type:
+    | 'conference'
+    | 'meetup'
+    | 'podcast'
+    | 'workshop'
+    | 'stream'
+    | 'talk'
+    | l.UnknownString
+  tags?: string[]
+
+  /**
+   * Event page, podcast episode URL, etc.
+   */
+  link?: l.UriString
+  video?: l.UriString
+
+  /**
+   * Identifier for slides; historically a GitHub release tag from danielroe/slides.
+   */
+  slides?: string
+  demo?: l.UriString
+  repo?: l.UriString
+
+  /**
+   * Strong-ref to a dev.roe.talkGroup record.
+   */
+  group?: RepoStrongRef.Main
+  image?: l.BlobRef
+
+  /**
+   * Intrinsic pixel dimensions of `image`.
+   */
+  aspectRatio?: RoeDefs.AspectRatio
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** A talk, podcast appearance, workshop, stream, or similar event. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    title: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 5120, maxGraphemes: 512 }),
+    ),
+    description: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 50000, maxGraphemes: 5000 }),
+    ),
+    date: /*#__PURE__*/ l.string({ format: 'datetime' }),
+    endDate: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ format: 'datetime' }),
+    ),
+    source: /*#__PURE__*/ l.string({ maxLength: 5120, maxGraphemes: 512 }),
+    location: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 5120, maxGraphemes: 512 }),
+    ),
+    type: /*#__PURE__*/ l.string<{
+      knownValues: [
+        'conference',
+        'meetup',
+        'podcast',
+        'workshop',
+        'stream',
+        'talk',
+      ]
+    }>(),
+    tags: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.array(
+        /*#__PURE__*/ l.string({ maxLength: 640, maxGraphemes: 64 }),
+        { maxLength: 32 },
+      ),
+    ),
+    link: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string({ format: 'uri' })),
+    video: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string({ format: 'uri' })),
+    slides: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 512 }),
+    ),
+    demo: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string({ format: 'uri' })),
+    repo: /*#__PURE__*/ l.optional(/*#__PURE__*/ l.string({ format: 'uri' })),
+    group: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<RepoStrongRef.Main>(
+        (() => RepoStrongRef.main) as any,
+      ),
+    ),
+    image: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.blob({ accept: ['image/*'], maxSize: 5000000 }),
+    ),
+    aspectRatio: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<RoeDefs.AspectRatio>(
+        (() => RoeDefs.aspectRatio) as any,
+      ),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/dev/roe/talk.ts b/shared/lex/dev/roe/talk.ts
new file mode 100644
index 00000000..51dd7850
--- /dev/null
+++ b/shared/lex/dev/roe/talk.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './talk.defs.ts'
+export { main as default } from './talk.defs.ts'
diff --git a/shared/lex/dev/roe/talkGroup.defs.ts b/shared/lex/dev/roe/talkGroup.defs.ts
new file mode 100644
index 00000000..52f222ef
--- /dev/null
+++ b/shared/lex/dev/roe/talkGroup.defs.ts
@@ -0,0 +1,54 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.talkGroup'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** A talk given at one or more events. Holds the canonical title/description shared across performances; per-event details (date, source, video, etc.) live on dev.roe.talk records that strong-ref this group. */
+type Main = {
+  $type: 'dev.roe.talkGroup'
+  title: string
+  description?: string
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** A talk given at one or more events. Holds the canonical title/description shared across performances; per-event details (date, source, video, etc.) live on dev.roe.talk records that strong-ref this group. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    title: /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    description: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 25000, maxGraphemes: 2500 }),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/dev/roe/talkGroup.ts b/shared/lex/dev/roe/talkGroup.ts
new file mode 100644
index 00000000..87570408
--- /dev/null
+++ b/shared/lex/dev/roe/talkGroup.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './talkGroup.defs.ts'
+export { main as default } from './talkGroup.defs.ts'
diff --git a/shared/lex/dev/roe/usesCategory.defs.ts b/shared/lex/dev/roe/usesCategory.defs.ts
new file mode 100644
index 00000000..f874f4e2
--- /dev/null
+++ b/shared/lex/dev/roe/usesCategory.defs.ts
@@ -0,0 +1,62 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'dev.roe.usesCategory'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** A category on the /uses page. Items belong to a category via dev.roe.usesItem.category. */
+type Main = {
+  $type: 'dev.roe.usesCategory'
+  title: string
+
+  /**
+   * Lower values render first. Defaults to 100 in the editor.
+   */
+  order?: number
+  displayAsGrid?: boolean
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** A category on the /uses page. Items belong to a category via dev.roe.usesItem.category. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    title: /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    order: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.integer(), 100),
+    ),
+    displayAsGrid: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.boolean(), false),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
diff --git a/shared/lex/dev/roe/usesCategory.ts b/shared/lex/dev/roe/usesCategory.ts
new file mode 100644
index 00000000..ce094414
--- /dev/null
+++ b/shared/lex/dev/roe/usesCategory.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './usesCategory.defs.ts'
+export { main as default } from './usesCategory.defs.ts'
diff --git a/shared/lex/dev/roe/usesItem.defs.ts b/shared/lex/dev/roe/usesItem.defs.ts
new file mode 100644
index 00000000..72cdf2de
--- /dev/null
+++ b/shared/lex/dev/roe/usesItem.defs.ts
@@ -0,0 +1,113 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+import * as RepoStrongRef from '../../com/atproto/repo/strongRef.defs.ts'
+import * as RoeDefs from './defs.defs.ts'
+
+const $nsid = 'dev.roe.usesItem'
+
+type $nsid = typeof $nsid
+
+export { $nsid }
+
+/** A single item on the /uses page, belonging to a dev.roe.usesCategory. */
+type Main = {
+  $type: 'dev.roe.usesItem'
+
+  /**
+   * Strong-ref to the parent dev.roe.usesCategory record.
+   */
+  category: RepoStrongRef.Main
+  name: string
+  description?: string
+
+  /**
+   * Lower values render first within the category. Defaults to 100 in the editor.
+   */
+  order?: number
+  image?: l.BlobRef
+
+  /**
+   * Intrinsic pixel dimensions of `image`.
+   */
+  aspectRatio?: RoeDefs.AspectRatio
+  links?: Link[]
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** A single item on the /uses page, belonging to a dev.roe.usesCategory. */
+const main = /*#__PURE__*/ l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  /*#__PURE__*/ l.object({
+    category: /*#__PURE__*/ l.ref<RepoStrongRef.Main>(
+      (() => RepoStrongRef.main) as any,
+    ),
+    name: /*#__PURE__*/ l.string({ maxLength: 2560, maxGraphemes: 256 }),
+    description: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 25000, maxGraphemes: 2500 }),
+    ),
+    order: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.withDefault(/*#__PURE__*/ l.integer(), 100),
+    ),
+    image: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.blob({ accept: ['image/*'], maxSize: 5000000 }),
+    ),
+    aspectRatio: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.ref<RoeDefs.AspectRatio>(
+        (() => RoeDefs.aspectRatio) as any,
+      ),
+    ),
+    links: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.array(/*#__PURE__*/ l.ref<Link>((() => link) as any), {
+        maxLength: 32,
+      }),
+    ),
+    createdAt: /*#__PURE__*/ l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+const $type = $nsid
+
+type $type = typeof $type
+
+export { $type }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main)
+export const $build = /*#__PURE__*/ main.build.bind(main)
+export const $assert = /*#__PURE__*/ main.assert.bind(main)
+export const $check = /*#__PURE__*/ main.check.bind(main)
+export const $cast = /*#__PURE__*/ main.cast.bind(main)
+export const $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main)
+export const $matches = /*#__PURE__*/ main.matches.bind(main)
+export const $parse = /*#__PURE__*/ main.parse.bind(main)
+export const $safeParse = /*#__PURE__*/ main.safeParse.bind(main)
+export const $validate = /*#__PURE__*/ main.validate.bind(main)
+export const $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)
+
+type Link = {
+  $type?: 'dev.roe.usesItem#link'
+  url: l.UriString
+  label?: string
+}
+
+export type { Link }
+
+const link = /*#__PURE__*/ l.typedObject<Link>(
+  $nsid,
+  'link',
+  /*#__PURE__*/ l.object({
+    url: /*#__PURE__*/ l.string({ format: 'uri' }),
+    label: /*#__PURE__*/ l.optional(
+      /*#__PURE__*/ l.string({ maxLength: 640, maxGraphemes: 64 }),
+    ),
+  }),
+)
+
+export { link }
diff --git a/shared/lex/dev/roe/usesItem.ts b/shared/lex/dev/roe/usesItem.ts
new file mode 100644
index 00000000..069056c2
--- /dev/null
+++ b/shared/lex/dev/roe/usesItem.ts
@@ -0,0 +1,6 @@
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './usesItem.defs.ts'
+export { main as default } from './usesItem.defs.ts'
diff --git a/shared/lex/index.ts b/shared/lex/index.ts
index 4206143c..b889d2cd 100644
--- a/shared/lex/index.ts
+++ b/shared/lex/index.ts
@@ -1,22 +1,6 @@
-/**
- * Auto-generated barrel for the dev.roe lexicons. Re-run `pnpm lex:gen` to
- * refresh after adding or removing lexicon JSON files.
- *
- * The generated `gen-api` client surface was deleted because we drive the PDS
- * via the existing `AtpAgent` from `@atproto/api`; we only need the typed
- * record interfaces and the validator registry.
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
  */
-export { schemas, lexicons, validate, schemaDict } from './lexicons.ts'
-export type { $Typed, Un$Typed, OmitKey } from './util.ts'
 
-export * as ComAtprotoRepoStrongRef from './types/com/atproto/repo/strongRef.ts'
-export * as DevRoeAma from './types/dev/roe/ama.ts'
-export * as DevRoeDefs from './types/dev/roe/defs.ts'
-export * as DevRoeEntity from './types/dev/roe/entity.ts'
-export * as DevRoeInvite from './types/dev/roe/invite.ts'
-export * as DevRoeLocation from './types/dev/roe/location.ts'
-export * as DevRoeSync from './types/dev/roe/sync.ts'
-export * as DevRoeTalk from './types/dev/roe/talk.ts'
-export * as DevRoeTalkGroup from './types/dev/roe/talkGroup.ts'
-export * as DevRoeUsesCategory from './types/dev/roe/usesCategory.ts'
-export * as DevRoeUsesItem from './types/dev/roe/usesItem.ts'
+export * as com from './com.ts'
+export * as dev from './dev.ts'
diff --git a/shared/lex/lexicons.ts b/shared/lex/lexicons.ts
deleted file mode 100644
index d581efc2..00000000
--- a/shared/lex/lexicons.ts
+++ /dev/null
@@ -1,679 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import {
-  type LexiconDoc,
-  Lexicons,
-  ValidationError,
-  type ValidationResult,
-} from '@atproto/lexicon'
-import { type $Typed, is$typed, maybe$typed } from './util.ts'
-
-export const schemaDict = {
-  ComAtprotoRepoStrongRef: {
-    lexicon: 1,
-    id: 'com.atproto.repo.strongRef',
-    description: 'A URI with a content-hash fingerprint.',
-    defs: {
-      main: {
-        type: 'object',
-        required: ['uri', 'cid'],
-        properties: {
-          uri: {
-            type: 'string',
-            format: 'at-uri',
-          },
-          cid: {
-            type: 'string',
-            format: 'cid',
-          },
-        },
-      },
-    },
-  },
-  DevRoeAma: {
-    lexicon: 1,
-    id: 'dev.roe.ama',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'An anonymous question, optionally with a published answer. While unanswered the question text is encrypted server-side (private to roe.dev). Once published, the question is rewritten in plaintext alongside the answer and per-platform URLs.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['status', 'createdAt'],
-          properties: {
-            status: {
-              type: 'string',
-              knownValues: ['unanswered', 'answered'],
-            },
-            encryptedQuestion: {
-              type: 'string',
-              description:
-                'AES-256-GCM envelope holding the raw question text. Present iff status=unanswered.',
-              maxLength: 500000,
-            },
-            question: {
-              type: 'string',
-              description:
-                'Plaintext question. Present iff status=answered; the editor decrypts encryptedQuestion at publish time and writes it here so the record is self-contained going forward.',
-              maxLength: 500000,
-              maxGraphemes: 50000,
-            },
-            posts: {
-              type: 'array',
-              description:
-                'Thread of response posts. Each post is the body of one Bluesky-thread item (and one Mastodon status, one LinkedIn comment chain entry, etc).',
-              items: {
-                type: 'ref',
-                ref: 'lex:dev.roe.ama#post',
-              },
-              maxLength: 16,
-            },
-            platforms: {
-              type: 'ref',
-              ref: 'lex:dev.roe.ama#platforms',
-              description:
-                'Which platforms the editor enabled when publishing.',
-            },
-            publishedLinks: {
-              type: 'ref',
-              ref: 'lex:dev.roe.ama#publishedLinks',
-              description: 'Resolved per-platform URLs after publish.',
-            },
-            image: {
-              type: 'blob',
-              accept: ['image/*'],
-              maxSize: 5000000,
-            },
-            imageDimensions: {
-              type: 'ref',
-              ref: 'lex:dev.roe.defs#aspectRatio',
-              description:
-                "Pixel dimensions of `image`. Stored alongside because PDS blobs don't carry intrinsic dimensions and Bluesky's image embed needs `aspectRatio`.",
-            },
-            backgroundStyle: {
-              type: 'string',
-              description:
-                'ID of the background style used to render the image, either a preset name or a serialised custom emoji-and-gradient id. The set of styles is internal to roe.dev.',
-              maxLength: 128,
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-            answeredAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-      post: {
-        type: 'object',
-        description:
-          'One post in the response thread. Mentions reference dev.roe.entity records by AT URI so the publisher can rewrite per-platform handles at publish time.',
-        required: ['text'],
-        properties: {
-          text: {
-            type: 'string',
-            description:
-              'Body text. Plain text with `@<entity-rkey>` placeholders for entity mentions (e.g. `Thanks @abc123def456 for the help`). The placeholder syntax is internal; the publisher swaps them for the right per-platform handle.',
-            maxLength: 500000,
-            maxGraphemes: 50000,
-          },
-          mentions: {
-            type: 'array',
-            description:
-              'Strong-refs to dev.roe.entity records. The rkey of each referenced record is the placeholder token used in `text`.',
-            items: {
-              type: 'ref',
-              ref: 'lex:com.atproto.repo.strongRef',
-            },
-            maxLength: 32,
-          },
-        },
-      },
-      platforms: {
-        type: 'object',
-        properties: {
-          bluesky: {
-            type: 'boolean',
-            default: true,
-          },
-          mastodon: {
-            type: 'boolean',
-            default: true,
-          },
-          linkedin: {
-            type: 'boolean',
-            default: true,
-          },
-          youtubeShorts: {
-            type: 'boolean',
-            default: false,
-          },
-        },
-      },
-      publishedLinks: {
-        type: 'object',
-        properties: {
-          bluesky: {
-            type: 'string',
-            format: 'uri',
-          },
-          mastodon: {
-            type: 'string',
-            format: 'uri',
-          },
-          linkedin: {
-            type: 'string',
-            format: 'uri',
-          },
-          youtubeShorts: {
-            type: 'string',
-            format: 'uri',
-          },
-        },
-      },
-    },
-  },
-  DevRoeDefs: {
-    lexicon: 1,
-    id: 'dev.roe.defs',
-    defs: {
-      aspectRatio: {
-        type: 'object',
-        description:
-          'Intrinsic width:height of an image in pixels. Mirrors `app.bsky.embed.defs#aspectRatio`.',
-        required: ['width', 'height'],
-        properties: {
-          width: {
-            type: 'integer',
-            minimum: 1,
-          },
-          height: {
-            type: 'integer',
-            minimum: 1,
-          },
-        },
-      },
-    },
-  },
-  DevRoeEntity: {
-    lexicon: 1,
-    id: 'dev.roe.entity',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'A person or organisation referenced by AMA responses via @-mentions. Holds the canonical name plus per-platform social handles so the publisher can rewrite mentions correctly for each platform.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['name', 'createdAt'],
-          properties: {
-            name: {
-              type: 'string',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            socialHandles: {
-              type: 'ref',
-              ref: 'lex:dev.roe.entity#socialHandles',
-            },
-            website: {
-              type: 'string',
-              format: 'uri',
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-      socialHandles: {
-        type: 'object',
-        properties: {
-          bluesky: {
-            type: 'string',
-            description: 'Handle without leading @ (e.g. nuxt.bsky.social)',
-            maxLength: 256,
-          },
-          linkedin: {
-            type: 'string',
-            description: 'Company or person handle (e.g. nuxtjs)',
-            maxLength: 256,
-          },
-          mastodon: {
-            type: 'string',
-            description:
-              'Full handle including instance (e.g. nuxt@fosstodon.org)',
-            maxLength: 256,
-          },
-        },
-      },
-    },
-  },
-  DevRoeInvite: {
-    lexicon: 1,
-    id: 'dev.roe.invite',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'An invitation link that grants access to a private GitHub repository. Both the URL slug and the repo name are sensitive (knowing the slug equals being granted access), so the entire payload is encrypted server-side before being written to the PDS.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['encrypted', 'isActive', 'createdAt'],
-          properties: {
-            encrypted: {
-              type: 'string',
-              description:
-                'AES-256-GCM envelope holding `{ slug, repo }` as JSON. Opaque to anyone without the server key.',
-              maxLength: 8192,
-            },
-            isActive: {
-              type: 'boolean',
-              description:
-                "Whether this invite is currently honoured. Inactive invites stay around for audit but don't get wired up in the route table.",
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
-  DevRoeLocation: {
-    lexicon: 1,
-    id: 'dev.roe.location',
-    defs: {
-      main: {
-        type: 'record',
-        description: "Current location (singleton; rkey is always 'self').",
-        key: 'literal:self',
-        record: {
-          type: 'object',
-          required: ['city', 'country', 'countryCode', 'createdAt'],
-          properties: {
-            city: {
-              type: 'string',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            region: {
-              type: 'string',
-              description:
-                'Region/state. Used to special-case Scotland and US/UK subdivisions on the public site.',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            country: {
-              type: 'string',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            countryCode: {
-              type: 'string',
-              description:
-                'ISO 3166-1 alpha-2 country code, uppercase. Used to compute a flag emoji.',
-              minLength: 2,
-              maxLength: 2,
-            },
-            meetupAvailable: {
-              type: 'boolean',
-              default: true,
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
-  DevRoeSync: {
-    lexicon: 1,
-    id: 'dev.roe.sync',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          "Dedupe marker for a syndication pipeline. One record per (provider, canonical URL) pair that has been submitted; presence of a record means we've already synced and shouldn't re-submit.",
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['provider', 'canonicalUrl', 'syncedAt'],
-          properties: {
-            provider: {
-              type: 'string',
-              description:
-                'Identifier of the syndication target (e.g. `gde-advocu`).',
-              maxLength: 64,
-            },
-            canonicalUrl: {
-              type: 'string',
-              format: 'uri',
-            },
-            syncedAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
-  DevRoeTalk: {
-    lexicon: 1,
-    id: 'dev.roe.talk',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'A talk, podcast appearance, workshop, stream, or similar event.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['source', 'date', 'type', 'createdAt'],
-          properties: {
-            title: {
-              type: 'string',
-              description:
-                'Optional for upcoming events with no announced title. Required for past talks unless the talk is part of a group.',
-              maxLength: 5120,
-              maxGraphemes: 512,
-            },
-            description: {
-              type: 'string',
-              maxLength: 50000,
-              maxGraphemes: 5000,
-            },
-            date: {
-              type: 'string',
-              format: 'datetime',
-              description:
-                'Start date of the talk/event. Date-only values are stored as midnight UTC.',
-            },
-            endDate: {
-              type: 'string',
-              format: 'datetime',
-              description: 'End date for multi-day events. Optional.',
-            },
-            source: {
-              type: 'string',
-              description: 'Conference name, meetup, podcast title, etc.',
-              maxLength: 5120,
-              maxGraphemes: 512,
-            },
-            location: {
-              type: 'string',
-              description: "Free-form: city, country, or 'Online'.",
-              maxLength: 5120,
-              maxGraphemes: 512,
-            },
-            type: {
-              type: 'string',
-              knownValues: [
-                'conference',
-                'meetup',
-                'podcast',
-                'workshop',
-                'stream',
-                'talk',
-              ],
-            },
-            tags: {
-              type: 'array',
-              items: {
-                type: 'string',
-                maxLength: 640,
-                maxGraphemes: 64,
-              },
-              maxLength: 32,
-            },
-            link: {
-              type: 'string',
-              format: 'uri',
-              description: 'Event page, podcast episode URL, etc.',
-            },
-            video: {
-              type: 'string',
-              format: 'uri',
-            },
-            slides: {
-              type: 'string',
-              description:
-                'Identifier for slides; historically a GitHub release tag from danielroe/slides.',
-              maxLength: 512,
-            },
-            demo: {
-              type: 'string',
-              format: 'uri',
-            },
-            repo: {
-              type: 'string',
-              format: 'uri',
-            },
-            group: {
-              type: 'ref',
-              ref: 'lex:com.atproto.repo.strongRef',
-              description: 'Strong-ref to a dev.roe.talkGroup record.',
-            },
-            image: {
-              type: 'blob',
-              accept: ['image/*'],
-              maxSize: 5000000,
-            },
-            aspectRatio: {
-              type: 'ref',
-              ref: 'lex:dev.roe.defs#aspectRatio',
-              description: 'Intrinsic pixel dimensions of `image`.',
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
-  DevRoeTalkGroup: {
-    lexicon: 1,
-    id: 'dev.roe.talkGroup',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'A talk given at one or more events. Holds the canonical title/description shared across performances; per-event details (date, source, video, etc.) live on dev.roe.talk records that strong-ref this group.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['title', 'createdAt'],
-          properties: {
-            title: {
-              type: 'string',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            description: {
-              type: 'string',
-              maxLength: 25000,
-              maxGraphemes: 2500,
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
-  DevRoeUsesCategory: {
-    lexicon: 1,
-    id: 'dev.roe.usesCategory',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'A category on the /uses page. Items belong to a category via dev.roe.usesItem.category.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['title', 'createdAt'],
-          properties: {
-            title: {
-              type: 'string',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            order: {
-              type: 'integer',
-              description:
-                'Lower values render first. Defaults to 100 in the editor.',
-              default: 100,
-            },
-            displayAsGrid: {
-              type: 'boolean',
-              default: false,
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
-  DevRoeUsesItem: {
-    lexicon: 1,
-    id: 'dev.roe.usesItem',
-    defs: {
-      main: {
-        type: 'record',
-        description:
-          'A single item on the /uses page, belonging to a dev.roe.usesCategory.',
-        key: 'tid',
-        record: {
-          type: 'object',
-          required: ['category', 'name', 'createdAt'],
-          properties: {
-            category: {
-              type: 'ref',
-              ref: 'lex:com.atproto.repo.strongRef',
-              description:
-                'Strong-ref to the parent dev.roe.usesCategory record.',
-            },
-            name: {
-              type: 'string',
-              maxLength: 2560,
-              maxGraphemes: 256,
-            },
-            description: {
-              type: 'string',
-              maxLength: 25000,
-              maxGraphemes: 2500,
-            },
-            order: {
-              type: 'integer',
-              description:
-                'Lower values render first within the category. Defaults to 100 in the editor.',
-              default: 100,
-            },
-            image: {
-              type: 'blob',
-              accept: ['image/*'],
-              maxSize: 5000000,
-            },
-            aspectRatio: {
-              type: 'ref',
-              ref: 'lex:dev.roe.defs#aspectRatio',
-              description: 'Intrinsic pixel dimensions of `image`.',
-            },
-            links: {
-              type: 'array',
-              items: {
-                type: 'ref',
-                ref: 'lex:dev.roe.usesItem#link',
-              },
-              maxLength: 32,
-            },
-            createdAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-      link: {
-        type: 'object',
-        required: ['url'],
-        properties: {
-          url: {
-            type: 'string',
-            format: 'uri',
-          },
-          label: {
-            type: 'string',
-            maxLength: 640,
-            maxGraphemes: 64,
-          },
-        },
-      },
-    },
-  },
-} as const satisfies Record<string, LexiconDoc>
-export const schemas = Object.values(schemaDict) satisfies LexiconDoc[]
-export const lexicons: Lexicons = new Lexicons(schemas)
-
-export function validate<T extends { $type: string }>(
-  v: unknown,
-  id: string,
-  hash: string,
-  requiredType: true,
-): ValidationResult<T>
-export function validate<T extends { $type?: string }>(
-  v: unknown,
-  id: string,
-  hash: string,
-  requiredType?: false,
-): ValidationResult<T>
-export function validate(
-  v: unknown,
-  id: string,
-  hash: string,
-  requiredType?: boolean,
-): ValidationResult {
-  return (requiredType ? is$typed : maybe$typed)(v, id, hash)
-    ? lexicons.validate(`${id}#${hash}`, v)
-    : {
-        success: false,
-        error: new ValidationError(
-          `Must be an object with "${hash === 'main' ? id : `${id}#${hash}`}" $type property`,
-        ),
-      }
-}
-
-export const ids = {
-  ComAtprotoRepoStrongRef: 'com.atproto.repo.strongRef',
-  DevRoeAma: 'dev.roe.ama',
-  DevRoeDefs: 'dev.roe.defs',
-  DevRoeEntity: 'dev.roe.entity',
-  DevRoeInvite: 'dev.roe.invite',
-  DevRoeLocation: 'dev.roe.location',
-  DevRoeSync: 'dev.roe.sync',
-  DevRoeTalk: 'dev.roe.talk',
-  DevRoeTalkGroup: 'dev.roe.talkGroup',
-  DevRoeUsesCategory: 'dev.roe.usesCategory',
-  DevRoeUsesItem: 'dev.roe.usesItem',
-} as const
diff --git a/shared/lex/types/com/atproto/repo/strongRef.ts b/shared/lex/types/com/atproto/repo/strongRef.ts
deleted file mode 100644
index d5ed8f21..00000000
--- a/shared/lex/types/com/atproto/repo/strongRef.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'com.atproto.repo.strongRef'
-
-export interface Main {
-  $type?: 'com.atproto.repo.strongRef'
-  uri: string
-  cid: string
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain)
-}
diff --git a/shared/lex/types/dev/roe/ama.ts b/shared/lex/types/dev/roe/ama.ts
deleted file mode 100644
index 84e93412..00000000
--- a/shared/lex/types/dev/roe/ama.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-import type * as DevRoeDefs from './defs.ts'
-import type * as ComAtprotoRepoStrongRef from '../../com/atproto/repo/strongRef.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.ama'
-
-export interface Main {
-  $type: 'dev.roe.ama'
-  status: 'unanswered' | 'answered' | (string & {})
-  /** AES-256-GCM envelope holding the raw question text. Present iff status=unanswered. */
-  encryptedQuestion?: string
-  /** Plaintext question. Present iff status=answered; the editor decrypts encryptedQuestion at publish time and writes it here so the record is self-contained going forward. */
-  question?: string
-  /** Thread of response posts. Each post is the body of one Bluesky-thread item (and one Mastodon status, one LinkedIn comment chain entry, etc). */
-  posts?: Post[]
-  platforms?: Platforms
-  publishedLinks?: PublishedLinks
-  image?: BlobRef
-  imageDimensions?: DevRoeDefs.AspectRatio
-  /** ID of the background style used to render the image, either a preset name or a serialised custom emoji-and-gradient id. The set of styles is internal to roe.dev. */
-  backgroundStyle?: string
-  createdAt: string
-  answeredAt?: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
-
-/** One post in the response thread. Mentions reference dev.roe.entity records by AT URI so the publisher can rewrite per-platform handles at publish time. */
-export interface Post {
-  $type?: 'dev.roe.ama#post'
-  /** Body text. Plain text with `@<entity-rkey>` placeholders for entity mentions (e.g. `Thanks @abc123def456 for the help`). The placeholder syntax is internal; the publisher swaps them for the right per-platform handle. */
-  text: string
-  /** Strong-refs to dev.roe.entity records. The rkey of each referenced record is the placeholder token used in `text`. */
-  mentions?: ComAtprotoRepoStrongRef.Main[]
-}
-
-const hashPost = 'post'
-
-export function isPost<V>(v: V) {
-  return is$typed(v, id, hashPost)
-}
-
-export function validatePost<V>(v: V) {
-  return validate<Post & V>(v, id, hashPost)
-}
-
-export interface Platforms {
-  $type?: 'dev.roe.ama#platforms'
-  bluesky: boolean
-  mastodon: boolean
-  linkedin: boolean
-  youtubeShorts: boolean
-}
-
-const hashPlatforms = 'platforms'
-
-export function isPlatforms<V>(v: V) {
-  return is$typed(v, id, hashPlatforms)
-}
-
-export function validatePlatforms<V>(v: V) {
-  return validate<Platforms & V>(v, id, hashPlatforms)
-}
-
-export interface PublishedLinks {
-  $type?: 'dev.roe.ama#publishedLinks'
-  bluesky?: string
-  mastodon?: string
-  linkedin?: string
-  youtubeShorts?: string
-}
-
-const hashPublishedLinks = 'publishedLinks'
-
-export function isPublishedLinks<V>(v: V) {
-  return is$typed(v, id, hashPublishedLinks)
-}
-
-export function validatePublishedLinks<V>(v: V) {
-  return validate<PublishedLinks & V>(v, id, hashPublishedLinks)
-}
diff --git a/shared/lex/types/dev/roe/defs.ts b/shared/lex/types/dev/roe/defs.ts
deleted file mode 100644
index 573f252a..00000000
--- a/shared/lex/types/dev/roe/defs.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.defs'
-
-/** Intrinsic width:height of an image in pixels. Mirrors `app.bsky.embed.defs#aspectRatio`. */
-export interface AspectRatio {
-  $type?: 'dev.roe.defs#aspectRatio'
-  width: number
-  height: number
-}
-
-const hashAspectRatio = 'aspectRatio'
-
-export function isAspectRatio<V>(v: V) {
-  return is$typed(v, id, hashAspectRatio)
-}
-
-export function validateAspectRatio<V>(v: V) {
-  return validate<AspectRatio & V>(v, id, hashAspectRatio)
-}
diff --git a/shared/lex/types/dev/roe/entity.ts b/shared/lex/types/dev/roe/entity.ts
deleted file mode 100644
index ed7037e9..00000000
--- a/shared/lex/types/dev/roe/entity.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.entity'
-
-export interface Main {
-  $type: 'dev.roe.entity'
-  name: string
-  socialHandles?: SocialHandles
-  website?: string
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
-
-export interface SocialHandles {
-  $type?: 'dev.roe.entity#socialHandles'
-  /** Handle without leading @ (e.g. nuxt.bsky.social) */
-  bluesky?: string
-  /** Company or person handle (e.g. nuxtjs) */
-  linkedin?: string
-  /** Full handle including instance (e.g. nuxt@fosstodon.org) */
-  mastodon?: string
-}
-
-const hashSocialHandles = 'socialHandles'
-
-export function isSocialHandles<V>(v: V) {
-  return is$typed(v, id, hashSocialHandles)
-}
-
-export function validateSocialHandles<V>(v: V) {
-  return validate<SocialHandles & V>(v, id, hashSocialHandles)
-}
diff --git a/shared/lex/types/dev/roe/invite.ts b/shared/lex/types/dev/roe/invite.ts
deleted file mode 100644
index 8d88cd84..00000000
--- a/shared/lex/types/dev/roe/invite.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.invite'
-
-export interface Main {
-  $type: 'dev.roe.invite'
-  /** AES-256-GCM envelope holding `{ slug, repo }` as JSON. Opaque to anyone without the server key. */
-  encrypted: string
-  /** Whether this invite is currently honoured. Inactive invites stay around for audit but don't get wired up in the route table. */
-  isActive: boolean
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
diff --git a/shared/lex/types/dev/roe/location.ts b/shared/lex/types/dev/roe/location.ts
deleted file mode 100644
index c240c3e7..00000000
--- a/shared/lex/types/dev/roe/location.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.location'
-
-export interface Main {
-  $type: 'dev.roe.location'
-  city: string
-  /** Region/state. Used to special-case Scotland and US/UK subdivisions on the public site. */
-  region?: string
-  country: string
-  /** ISO 3166-1 alpha-2 country code, uppercase. Used to compute a flag emoji. */
-  countryCode: string
-  meetupAvailable: boolean
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
diff --git a/shared/lex/types/dev/roe/sync.ts b/shared/lex/types/dev/roe/sync.ts
deleted file mode 100644
index 280b6c92..00000000
--- a/shared/lex/types/dev/roe/sync.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.sync'
-
-export interface Main {
-  $type: 'dev.roe.sync'
-  /** Identifier of the syndication target (e.g. `gde-advocu`). */
-  provider: string
-  canonicalUrl: string
-  syncedAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
diff --git a/shared/lex/types/dev/roe/talk.ts b/shared/lex/types/dev/roe/talk.ts
deleted file mode 100644
index 5316d0c1..00000000
--- a/shared/lex/types/dev/roe/talk.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-import type * as ComAtprotoRepoStrongRef from '../../com/atproto/repo/strongRef.ts'
-import type * as DevRoeDefs from './defs.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.talk'
-
-export interface Main {
-  $type: 'dev.roe.talk'
-  /** Optional for upcoming events with no announced title. Required for past talks unless the talk is part of a group. */
-  title?: string
-  description?: string
-  /** Start date of the talk/event. Date-only values are stored as midnight UTC. */
-  date: string
-  /** End date for multi-day events. Optional. */
-  endDate?: string
-  /** Conference name, meetup, podcast title, etc. */
-  source: string
-  /** Free-form: city, country, or 'Online'. */
-  location?: string
-  type:
-    | 'conference'
-    | 'meetup'
-    | 'podcast'
-    | 'workshop'
-    | 'stream'
-    | 'talk'
-    | (string & {})
-  tags?: string[]
-  /** Event page, podcast episode URL, etc. */
-  link?: string
-  video?: string
-  /** Identifier for slides; historically a GitHub release tag from danielroe/slides. */
-  slides?: string
-  demo?: string
-  repo?: string
-  group?: ComAtprotoRepoStrongRef.Main
-  image?: BlobRef
-  aspectRatio?: DevRoeDefs.AspectRatio
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
diff --git a/shared/lex/types/dev/roe/talkGroup.ts b/shared/lex/types/dev/roe/talkGroup.ts
deleted file mode 100644
index 855bfdff..00000000
--- a/shared/lex/types/dev/roe/talkGroup.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.talkGroup'
-
-export interface Main {
-  $type: 'dev.roe.talkGroup'
-  title: string
-  description?: string
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
diff --git a/shared/lex/types/dev/roe/usesCategory.ts b/shared/lex/types/dev/roe/usesCategory.ts
deleted file mode 100644
index 7a0a62ad..00000000
--- a/shared/lex/types/dev/roe/usesCategory.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.usesCategory'
-
-export interface Main {
-  $type: 'dev.roe.usesCategory'
-  title: string
-  /** Lower values render first. Defaults to 100 in the editor. */
-  order: number
-  displayAsGrid: boolean
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
diff --git a/shared/lex/types/dev/roe/usesItem.ts b/shared/lex/types/dev/roe/usesItem.ts
deleted file mode 100644
index fad1782a..00000000
--- a/shared/lex/types/dev/roe/usesItem.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { type ValidationResult, BlobRef } from '@atproto/lexicon'
-import { CID } from 'multiformats/cid'
-import { validate as _validate } from '../../../lexicons.ts'
-import {
-  type $Typed,
-  is$typed as _is$typed,
-  type OmitKey,
-} from '../../../util.ts'
-import type * as ComAtprotoRepoStrongRef from '../../com/atproto/repo/strongRef.ts'
-import type * as DevRoeDefs from './defs.ts'
-
-const is$typed = _is$typed,
-  validate = _validate
-const id = 'dev.roe.usesItem'
-
-export interface Main {
-  $type: 'dev.roe.usesItem'
-  category: ComAtprotoRepoStrongRef.Main
-  name: string
-  description?: string
-  /** Lower values render first within the category. Defaults to 100 in the editor. */
-  order: number
-  image?: BlobRef
-  aspectRatio?: DevRoeDefs.AspectRatio
-  links?: Link[]
-  createdAt: string
-  [k: string]: unknown
-}
-
-const hashMain = 'main'
-
-export function isMain<V>(v: V) {
-  return is$typed(v, id, hashMain)
-}
-
-export function validateMain<V>(v: V) {
-  return validate<Main & V>(v, id, hashMain, true)
-}
-
-export {
-  type Main as Record,
-  isMain as isRecord,
-  validateMain as validateRecord,
-}
-
-export interface Link {
-  $type?: 'dev.roe.usesItem#link'
-  url: string
-  label?: string
-}
-
-const hashLink = 'link'
-
-export function isLink<V>(v: V) {
-  return is$typed(v, id, hashLink)
-}
-
-export function validateLink<V>(v: V) {
-  return validate<Link & V>(v, id, hashLink)
-}
diff --git a/shared/lex/util.ts b/shared/lex/util.ts
deleted file mode 100644
index 816ca10c..00000000
--- a/shared/lex/util.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-
-import { type ValidationResult } from '@atproto/lexicon'
-
-export type OmitKey<T, K extends keyof T> = {
-  [K2 in keyof T as K2 extends K ? never : K2]: T[K2]
-}
-
-export type $Typed<V, T extends string = string> = V & { $type: T }
-export type Un$Typed<V extends { $type?: string }> = OmitKey<V, '$type'>
-
-export type $Type<Id extends string, Hash extends string> = Hash extends 'main'
-  ? Id
-  : `${Id}#${Hash}`
-
-function isObject<V>(v: V): v is V & object {
-  return v != null && typeof v === 'object'
-}
-
-function is$type<Id extends string, Hash extends string>(
-  $type: unknown,
-  id: Id,
-  hash: Hash,
-): $type is $Type<Id, Hash> {
-  return hash === 'main'
-    ? $type === id
-    : // $type === `${id}#${hash}`
-      typeof $type === 'string' &&
-        $type.length === id.length + 1 + hash.length &&
-        $type.charCodeAt(id.length) === 35 /* '#' */ &&
-        $type.startsWith(id) &&
-        $type.endsWith(hash)
-}
-
-export type $TypedObject<
-  V,
-  Id extends string,
-  Hash extends string,
-> = V extends {
-  $type: $Type<Id, Hash>
-}
-  ? V
-  : V extends { $type?: string }
-    ? V extends { $type?: infer T extends $Type<Id, Hash> }
-      ? V & { $type: T }
-      : never
-    : V & { $type: $Type<Id, Hash> }
-
-export function is$typed<V, Id extends string, Hash extends string>(
-  v: V,
-  id: Id,
-  hash: Hash,
-): v is $TypedObject<V, Id, Hash> {
-  return isObject(v) && '$type' in v && is$type(v.$type, id, hash)
-}
-
-export function maybe$typed<V, Id extends string, Hash extends string>(
-  v: V,
-  id: Id,
-  hash: Hash,
-): v is V & object & { $type?: $Type<Id, Hash> } {
-  return (
-    isObject(v) &&
-    ('$type' in v ? v.$type === undefined || is$type(v.$type, id, hash) : true)
-  )
-}
-
-export type Validator<R = unknown> = (v: unknown) => ValidationResult<R>
-export type ValidatorParam<V extends Validator> =
-  V extends Validator<infer R> ? R : never
-
-/**
- * Utility function that allows to convert a "validate*" utility function into a
- * type predicate.
- */
-export function asPredicate<V extends Validator>(validate: V) {
-  return function <T>(v: T): v is T & ValidatorParam<V> {
-    return validate(v).success
-  }
-}
diff --git a/test/unit/bundle.spec.ts b/test/unit/bundle.spec.ts
index 154bd9b4..148cfc65 100644
--- a/test/unit/bundle.spec.ts
+++ b/test/unit/bundle.spec.ts
@@ -76,7 +76,7 @@ describe('project sizes', () => {
     stats.server = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir)
     expect
       .soft(roundToKilobytes(stats.server.totalBytes, 10))
-      .toMatchInlineSnapshot(`"1890k"`)
+      .toMatchInlineSnapshot(`"1880k"`)
 
     const modules = await analyzeSizes('node_modules/**/*', serverDir)
     const portableModules = await analyzeSizes(
@@ -85,7 +85,7 @@ describe('project sizes', () => {
     )
     expect
       .soft(roundToKilobytes(portableModules.totalBytes, 10))
-      .toMatchInlineSnapshot(`"14810k"`)
+      .toMatchInlineSnapshot(`"13770k"`)
 
     const packages = modules.files
       .filter(m => m.endsWith('package.json') && !NATIVE_BINARY_RE.test(m))
@@ -106,21 +106,22 @@ describe('project sizes', () => {
         "@atproto-labs/simple-store-memory",
         "@atproto-labs/simple-store-memory/node_modules/lru-cache",
         "@atproto-labs/simple-store-memory/node_modules/lru-cache/dist/esm",
-        "@atproto/api",
-        "@atproto/common-web",
         "@atproto/did",
         "@atproto/jwk",
         "@atproto/jwk-jose",
         "@atproto/jwk-webcrypto",
+        "@atproto/lex",
+        "@atproto/lex-client",
         "@atproto/lex-data",
         "@atproto/lex-json",
-        "@atproto/lexicon",
+        "@atproto/lex-password-session",
+        "@atproto/lex-schema",
         "@atproto/oauth-client",
         "@atproto/oauth-client-node",
         "@atproto/oauth-types",
         "@atproto/syntax",
-        "@atproto/xrpc",
         "@babel/parser",
+        "@bsky/sdk",
         "@formkit/drag-and-drop",
         "@img/colour",
         "@takumi-rs/core",
@@ -135,7 +136,6 @@ describe('project sizes', () => {
         "@vue/runtime-dom",
         "@vue/server-renderer",
         "@vue/shared",
-        "await-lock",
         "comark",
         "comark/node_modules/entities",
         "consola",
@@ -172,7 +172,6 @@ describe('project sizes', () => {
         "sharp",
         "source-map-js",
         "srvx",
-        "tlds",
         "ts-custom-error",
         "ufo",
         "ultrahtml",
-- 
2.51.2